upgrade echarts to v3.8.5.

server/www/teleport/static/js/dashboard/dashboard.js

@@ -39,6 +39,8 @@ $app.init_sys_status_info = function (data) {
         type: 'time',
         boundaryGap: false,
         splitNumber: 10,
+        minInterval: 1000 * 60,
+        maxInterval: 1000 * 60,
         axisLine: {show: false},
         axisTick: {show: false},
         axisLabel: {
@@ -117,7 +119,7 @@ $app.init_sys_status_info = function (data) {
         tooltip: {
             trigger: 'axis',
             formatter: function (params) {
-                return params[0].name + '<br/>' + params[1].seriesName + ': ' + params[1].value[1] + '%<br/>' + params[0].seriesName + ': ' + params[0].value[1] + '%';
+                return params[0].name + '<br/>' + params[0].seriesName + ': ' + params[0].value[1] + '%<br/>' + params[1].seriesName + ': ' + params[1].value[1] + '%';
             },
             axisPointer: {
                 animation: false
@@ -348,7 +350,8 @@ $app.init_sys_status_info = function (data) {
         tooltip: {
             trigger: 'axis',
             formatter: function (params) {
-                return params[0].name + '<br/>' + params[1].seriesName + ': ' + tp_size2str(params[1].value[1], 2) + '<br/>' + params[0].seriesName + ': ' + tp_size2str(params[0].value[1], 2);
+                return params[0].name + '<br/>' + params[0].seriesName + ': ' + tp_size2str(params[0].value[1], 1) + '<br/>' + params[1].seriesName + ': ' + tp_size2str(params[1].value[1], 1);
+                //return params[0].name + '<br/>' + params[0].seriesName + ': ' + params[0].value[1] + '<br/>' + params[1].seriesName + ': ' + params[1].value[1];
             },
             axisPointer: {
                 animation: false
@@ -362,7 +365,36 @@ $app.init_sys_status_info = function (data) {
             ]
         },
         xAxis: axis_time_cfg,
-        yAxis: axis_size_cfg,
+        yAxis: {
+            type: 'value',
+            axisLine: {show: false},
+            axisTick: {show: false},
+            splitNumber: 5,
+            boundaryGap: [0, '20%'],
+            max: function (val) {
+                var t= Math.floor(val.max / 1000 + 0.9) * 1000;
+                console.log('max:', val.max, t);
+                return t;
+                //var t = tp_echarts_size(val.max).s;
+                //console.log(val, t);
+                //return t;
+
+            },
+            axisLabel: {
+                margin: 3,
+                fontSize: 11,
+                fontFamily: 'monospace',
+                formatter: function (value, index) {
+                    if (index === 0)
+                        return '';
+                    // return tp_size2str(value, 1);
+                    console.log('lab:', value);
+                    // return tp_size2str(value, 1);
+                    var t = tp_echarts_size(value);
+                    return ''+t.s+t.k;
+                }
+            }
+        },
         series: [
             {
                 name: '读取',

server/www/teleport/static/js/tp-utils.js

@@ -94,6 +94,39 @@ function tp_size2str(size, precision) {
     return '' + s + ' ' + k;
 }
 
+function tp_echarts_size(size) {
+    var s = 0;
+    var k = '';
+    if (size < KB) {
+        s = size;
+        k = 'B';
+    }
+    else if (size < MB) {
+        s = Math.floor(size / KB);
+        k = 'KB'
+    }
+    else if (size < GB) {
+        s = Math.floor(size / MB);
+        k = 'MB'
+    }
+    else if (size < TB) {
+        s = Math.floor(size / GB);
+        k = 'GB'
+    }
+    else if (size < PB) {
+        s = Math.floor(size / TB);
+        k = 'TB'
+    }
+    else {
+        s = Math.floor(size / PB);
+        k = 'PB'
+    }
+
+    //s = Math.floor((s+999)/1000*1000);
+
+    return {s: s, k: k};
+}
+
 function tp_second2str(sec) {
     var _ret = '';
     if (sec >= SECONDS_PER_DAY) {

server/www/teleport/webroot/app/base/db.py

@@ -194,7 +194,7 @@ class TPDatabase:
             return None
 
     def query(self, sql, args=()):
-        log.d('[db] {}, {}\n'.format(sql, args))
+        # log.d('[db] {}, {}\n'.format(sql, args))
         # _start = datetime.datetime.utcnow().timestamp()
         ret = self._conn_pool.query(sql, args)
         # _end = datetime.datetime.utcnow().timestamp()
@@ -203,7 +203,7 @@ class TPDatabase:
 
     def exec(self, sql, args=()):
         # log.d('[db] {}\n'.format(sql, args))
-        print('[db]', sql, args)
+        # print('[db]', sql, args)
         # _start = datetime.datetime.utcnow().timestamp()
         ret = self._conn_pool.exec(sql, args)
         # _end = datetime.datetime.utcnow().timestamp()
@@ -211,9 +211,9 @@ class TPDatabase:
         return ret
 
     def transaction(self, sql_list):
-        log.d('[db] transaction\n')
-        for sql in sql_list:
-            log.d('[db]  * {}\n'.format(sql))
+        # log.d('[db] transaction\n')
+        # for sql in sql_list:
+        #     log.d('[db]  * {}\n'.format(sql))
 
         # _start = datetime.datetime.utcnow().timestamp()
         ret = self._conn_pool.transaction(sql_list)

server/www/teleport/webroot/app/base/stats.py

@@ -41,7 +41,7 @@ class TPStats(object):
             val = {
                 't': t,
                 'cpu': {'u': 0, 's': 0},
-                'mem': {'u': 1, 't': 100},
+                'mem': {'u': 0, 't': 100},
                 'disk': {'r': 0, 'w': 0},
                 'net': {'r': 0, 's': 0}
             }