From 73c7dab47f7370f946d239c436b7a1c0ce6f8c0f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 08 十一月 2022 20:04:30 +0800
Subject: [PATCH] Merge pull request #660 from shawn-tangsc/wvp-28181-2.0
---
web_src/src/components/console/ConsoleResource.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/web_src/src/components/console/ConsoleResource.vue b/web_src/src/components/console/ConsoleResource.vue
index 64c1c49..bc307b9 100644
--- a/web_src/src/components/console/ConsoleResource.vue
+++ b/web_src/src/components/console/ConsoleResource.vue
@@ -1,32 +1,28 @@
<template >
<div id="consoleResource" style="width: 100%; height: 100%; background: #FFFFFF; text-align: center">
<div style="width: 50%;height: 50%; float:left; ">
- <el-progress :width="100" :stroke-width="8" type="circle" v-if="deviceInfo.total === 0" :percentage="0" style="margin-top: 20px; font-size: 18px"></el-progress>
- <el-progress :width="100" :stroke-width="8" type="circle" v-if="deviceInfo.total > 0" :percentage="(deviceInfo.online/deviceInfo.total*100).toFixed(2)" style="margin-top: 20px; font-size: 18px"></el-progress>
+ <el-progress :width="100" :stroke-width="8" type="circle" :percentage="Math.floor(deviceInfo.online/deviceInfo.total*100)" style="margin-top: 20px; font-size: 18px"></el-progress>
<div class="resourceInfo">
璁惧鎬绘暟:{{deviceInfo.total}}<br/>
鍦ㄧ嚎鏁�:{{deviceInfo.online}}
</div>
</div>
<div style="width: 50%;height: 50%; float:left; ">
- <el-progress :width="100" :stroke-width="10" type="circle" v-if="channelInfo.total === 0" :percentage="0" style="margin-top: 20px"></el-progress>
- <el-progress :width="100" :stroke-width="10" type="circle" v-if="channelInfo.total > 0" :percentage="(channelInfo.online/channelInfo.total*100).toFixed(2)" style="margin-top: 20px"></el-progress>
+ <el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(channelInfo.online/channelInfo.total*100)" style="margin-top: 20px"></el-progress>
<div class="resourceInfo">
閫氶亾鎬绘暟:{{channelInfo.total}}<br/>
鍦ㄧ嚎鏁�:{{channelInfo.online}}
</div>
</div>
<div style="width: 50%;height: 50%; float:left; ">
- <el-progress :width="100" :stroke-width="10" type="circle" v-if="pushInfo.total === 0" :percentage="0" style="margin-top: 20px"></el-progress>
- <el-progress :width="100" :stroke-width="10" type="circle" v-if="pushInfo.total > 0" :percentage="(pushInfo.online/pushInfo.total*100).toFixed(2)" style="margin-top: 20px"></el-progress>
+ <el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(pushInfo.online/pushInfo.total*100)" style="margin-top: 20px"></el-progress>
<div class="resourceInfo">
鎺ㄦ祦鎬绘暟:{{pushInfo.total}}<br/>
鍦ㄧ嚎鏁�:{{pushInfo.online}}
</div>
</div>
<div style="width: 50%;height: 50%; float:left; ">
- <el-progress :width="100" :stroke-width="10" type="circle" v-if="proxyInfo.total === 0" :percentage="0" style="margin-top: 20px"></el-progress>
- <el-progress :width="100" :stroke-width="10" type="circle" v-if="proxyInfo.total > 0" :percentage="(proxyInfo.online/proxyInfo.total*100).toFixed(2)" style="margin-top: 20px"></el-progress>
+ <el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(proxyInfo.online/proxyInfo.total*100)" style="margin-top: 20px"></el-progress>
<div class="resourceInfo">
鎷夋祦浠ｇ悊鎬绘暟:{{proxyInfo.total}}<br/>
鍦ㄧ嚎鏁�:{{proxyInfo.online}}
--
Gitblit v1.8.0