You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/08/10 07:50:24 UTC
[servicecomb-pack] 19/36: SCB-1411 Number Abbreviation
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 9daa1939d44cc38b8f3211ac5da9b278fdab8d52
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Fri Aug 9 10:12:50 2019 +0800
SCB-1411 Number Abbreviation
---
.../main/resources/static/js/alpha-dashboard.js | 29 ++++++++++++----------
.../src/main/resources/templates/index.html | 21 ++++++++++++++++
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/alpha/alpha-ui/src/main/resources/static/js/alpha-dashboard.js b/alpha/alpha-ui/src/main/resources/static/js/alpha-dashboard.js
index 8ede713..483ff79 100644
--- a/alpha/alpha-ui/src/main/resources/static/js/alpha-dashboard.js
+++ b/alpha/alpha-ui/src/main/resources/static/js/alpha-dashboard.js
@@ -18,10 +18,14 @@
$(document).ready(function () {
$.ajax('/ui/transaction/statistics', {
success: function (data) {
- $('#statistics-total').text(digitUnit(data.total,0));
- $('#statistics-successful').text(digitUnit(data.successful,0));
- $('#statistics-compensated').text(digitUnit(data.compensated,0));
- $('#statistics-failed').text(digitUnit(data.failed,0));
+ $('#statistics-total').text(digitUnit(data.total,2));
+ $('#statistics-successful').text(digitUnit(data.successful,2));
+ $('#statistics-compensated').text(digitUnit(data.compensated,2));
+ $('#statistics-failed').text(digitUnit(data.failed,2));
+ $('#statistics-total-tip').text(data.total);
+ $('#statistics-successful-tip').text(data.successful);
+ $('#statistics-compensated-tip').text(data.compensated);
+ $('#statistics-failed-tip').text(data.failed);
},
error: function (state) {
// TODO show message
@@ -100,17 +104,16 @@ $(document).ready(function () {
$('#metrics-committed').text(digitUnit(data.metrics.committed,2));
$('#metrics-compensated').text(digitUnit(data.metrics.compensated,2));
$('#metrics-suspended').text(digitUnit(data.metrics.suspended,2));
+ $('#metrics-committed-tip').text(data.metrics.committed);
+ $('#metrics-compensated-tip').text(data.metrics.compensated);
+ $('#metrics-suspended-tip').text(data.metrics.suspended);
}
function digitUnit(n, d) {
- if (n >= 1000) {
- var x = ('' + parseInt(n, 10)).length;
- var d = Math.pow(10, x+1)
- var arr = " kMGTPE";
- x -= x % 3;
- return Math.round(n * d / Math.pow(10, x)) / d + arr[x / 3].trim();
- } else {
- return n;
- }
+ x = ('' + n).length, p = Math.pow, d = p(10, d);
+ x -= x % 3;
+ more = Math.round(n * d / p(10, x)) % d;
+ y = Math.round(n * d / p(10, x)) / d + " kMGTPE"[x / 3];
+ return more==0?y:y+'+';
}
});
\ No newline at end of file
diff --git a/alpha/alpha-ui/src/main/resources/templates/index.html b/alpha/alpha-ui/src/main/resources/templates/index.html
index 98d801e..2f27837 100644
--- a/alpha/alpha-ui/src/main/resources/templates/index.html
+++ b/alpha/alpha-ui/src/main/resources/templates/index.html
@@ -44,6 +44,9 @@
<i class="fas fa-clipboard-list fa-2x text-gray-300"></i>
</div>
</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="statistics-total-tip">0</div>
+ </div>
</div>
</div>
</div>
@@ -63,6 +66,9 @@
<i class="fas fa-clipboard-list fa-2x text-gray-300"></i>
</div>
</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="statistics-successful-tip">0</div>
+ </div>
</div>
</div>
</div>
@@ -83,6 +89,9 @@
<i class="fas fa-clipboard-list fa-2x text-gray-300"></i>
</div>
</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="statistics-compensated-tip">0</div>
+ </div>
</div>
</div>
</div>
@@ -102,6 +111,9 @@
<i class="fas fa-clipboard-list fa-2x text-gray-300"></i>
</div>
</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="statistics-failed-tip">0</div>
+ </div>
</div>
</div>
</div>
@@ -122,14 +134,23 @@
<div class="col-xl-4 col-md-4 mb-4">
<div class="text-xs font-weight-bold text-primary text-uppercase mb-1">COMMITTED</div>
<div class="h5 mb-0 font-weight-bold text-gray-800" id="metrics-committed">0</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="metrics-committed-tip">0</div>
+ </div>
</div>
<div class="col-xl-4 col-md-4 mb-4">
<div class="text-xs font-weight-bold text-primary text-uppercase mb-1">COMPENSATED</div>
<div class="h5 mb-0 font-weight-bold text-gray-800" id="metrics-compensated">0</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="metrics-compensated-tip">0</div>
+ </div>
</div>
<div class="col-xl-4 col-md-4 mb-4">
<div class="text-xs font-weight-bold text-primary text-uppercase mb-1">SUSPENDED</div>
<div class="h5 mb-0 font-weight-bold text-gray-800" id="metrics-suspended">0</div>
+ <div class="row no-gutters align-items-center">
+ <div class="small" id="metrics-suspended-tip">0</div>
+ </div>
</div>
</div>
<hr/>