From 2b9774083d7c2ad8024dc4825884795774077e22 Mon Sep 17 00:00:00 2001 From: xt12321 <1499410095@qq.com> Date: Tue, 27 Apr 2021 00:58:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG(=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9B=91=E6=8E=A7):=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=8E=87=E7=99=BE=E5=88=86=E6=AF=94=E4=B8=A2=E5=A4=B1=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/vadmin/monitor/server/components/InstrumentBoard.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue b/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue index 9b8d182..88b885f 100644 --- a/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue +++ b/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue @@ -77,7 +77,8 @@ export default { // 使用率 ringRate() { let ringRate = this.currentInstrumentBoardData.rate - return ringRate < 1 ? ringRate * 100 : ringRate + ringRate = ringRate < 1 ? ringRate * 100 : ringRate + return parseFloat(ringRate.toFixed(4)) }, // 仪表盘id ringGraphId() { From c12221a57bb16de5d0a80218ebe557e3d14cdaf8 Mon Sep 17 00:00:00 2001 From: xt12321 <1499410095@qq.com> Date: Tue, 27 Apr 2021 01:03:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG(=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9B=91=E6=8E=A7):=20=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8D=E7=A7=B0=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=BD=BF=E7=94=A8ip=E4=BD=9C=E4=B8=BAname?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-ui/src/views/vadmin/monitor/server/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue index e103444..b513266 100755 --- a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue +++ b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue @@ -74,7 +74,7 @@ @@ -288,7 +288,7 @@ export default { this.allServerInfo = response.data if (this.allServerInfo.length > 0) { this.currentServer = this.allServerInfo[serverIndex || this.currentServerIndex] - this.currentServerName = this.currentServer.name + this.currentServerName = this.currentServer.name || this.currentServer.ip } this.loading.close() }) @@ -368,7 +368,7 @@ export default { chooseServerInfo(index) { this.currentServerIndex = index this.currentServer = this.allServerInfo[index] - this.currentServerName = this.currentServer.name + this.currentServerName = this.currentServer.name || this.currentServer.ip }, // 更改更新频率（周期）数值 handleIntervalChange: debounce(function(value) { From 8d296b4096a1fb95f6795ca803ba4d70951c69b4 Mon Sep 17 00:00:00 2001 From: xt12321 <1499410095@qq.com> Date: Tue, 27 Apr 2021 01:13:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG(=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9B=91=E6=8E=A7):=20=E9=99=90=E5=88=B6=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=8E=87=E7=9A=84=E5=AE=BD=E5=BA=A6=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E4=B8=80=E8=A1=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-ui/src/views/vadmin/monitor/server/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue index b513266..5e375c1 100755 --- a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue +++ b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue @@ -421,9 +421,10 @@ export default { } .information-instrument-panel { + width: 20%; display: inline-block; min-height: 300px; - min-width: 400px; + min-width: 300px; margin: 0 10px; }