diff --git a/cloud-central-control/src/main/resources/templates/client/get-client-info.html b/cloud-central-control/src/main/resources/templates/client/get-client-info.html index bac04f7..4fbc857 100644 --- a/cloud-central-control/src/main/resources/templates/client/get-client-info.html +++ b/cloud-central-control/src/main/resources/templates/client/get-client-info.html @@ -38,16 +38,25 @@
+
+ CPU使用情况(%) +
+
+ 内存使用情况(GB) +
+
+ JVM使用情况(MB) +
@@ -67,6 +76,7 @@ }).use(['index', 'laydate'], function(){ var $ = layui.$; var clientId = top.restAjax.params(window.location.href).clientId; + var firstLoading = true; new Vue({ el: '#app', @@ -97,7 +107,7 @@ }, series: [ { - name: '磁盘占用', + name: '磁盘占用情况', type: 'gauge', radius: '85%', axisLine: { @@ -111,7 +121,7 @@ min: 0, max: disk.total, detail: {formatter: '{value}GB'}, - data: [{value: (parseFloat(disk.total) - parseFloat(disk.usable)).toFixed(2), name: '磁盘使用'}] + data: [{value: (parseFloat(disk.total) - parseFloat(disk.usable)).toFixed(2), name: '磁盘占用'}] } ] }); @@ -133,9 +143,6 @@ } var echart = echarts.init(document.getElementById('cpu')); echart.setOption({ - title: { - text: 'CPU使用情况(%)' - }, tooltip: { trigger: 'axis', formatter: function(params, ticket, callback) { @@ -218,9 +225,6 @@ } var echart = echarts.init(document.getElementById('memory')); echart.setOption({ - title: { - text: '内存使用情况(GB)' - }, tooltip: { trigger: 'axis', formatter: function(params, ticket, callback) { @@ -298,9 +302,6 @@ } var echart = echarts.init(document.getElementById('jvm')); echart.setOption({ - title: { - text: 'JVM使用情况(MB)' - }, tooltip: { trigger: 'axis', formatter: function(params, ticket, callback) { @@ -366,6 +367,7 @@ }, initClientInfo: function() { var self = this; + var loadLayerIndex; top.restAjax.get(top.restAjax.path('api/client/getclientinfobyclientid/{clientId}', [clientId]), {}, null, function(code, data) { self.system = data.data.system; self.diskList = data.data.diskList; @@ -386,7 +388,14 @@ }) }, function(code, data) { top.dialog.msg(data.msg); - }) + }, function() { + if(firstLoading) { + loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); + firstLoading = false; + } + }, function() { + top.dialog.close(loadLayerIndex); + }); } }, mounted: function() {