From c5a508ae17799a8f6687f2aea82536fa57f435b9 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 14 十月 2020 10:27:18 +0800
Subject: [PATCH] 修复轮询周期计算
---
src/pages/analysisPower/index/App.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index f802df9..688f357 100644
--- a/src/pages/analysisPower/index/App.vue
+++ b/src/pages/analysisPower/index/App.vue
@@ -228,7 +228,13 @@
}
})
- return sumPollingCamera * this.PollData.Config.poll_period
+ // 鎵�鏈夎疆璇㈢殑鎽勫儚鏈烘�绘暟 * 杞鏃堕棿 / 杞绠楀姏 - 1
+ let ret = (sumPollingCamera * this.PollData.Config.poll_period) / this.PollData.PollValidCount - 1
+ if (String(ret).indexOf(".") > 0) {
+ ret = ret.toFixed(1)
+ }
+
+ return ret
}
},
data() {
@@ -484,8 +490,8 @@
}
// console.log("this.formData.polling:"+this.formData.polling)
},
- cellStyle(obj){
- if(obj.column.label=='鎽勫儚鏈哄悕绉�'||obj.column.label=='鎽勫儚鏈哄湴鍧�'){
+ cellStyle(obj) {
+ if (obj.column.label == '鎽勫儚鏈哄悕绉�' || obj.column.label == '鎽勫儚鏈哄湴鍧�') {
return 'text-align:left;padding-left:8px;'
}
}
@@ -504,7 +510,7 @@
height: 190px;
min-width: 1609px;
display: flex;
- .sysinfo-box .eCharts-box{
+ .sysinfo-box .eCharts-box {
width: 36%;
}
.progressBar {
@@ -516,7 +522,6 @@
//float: left;
padding-left: 30px;
box-sizing: border-box;
-
}
.barGraph {
width: 16%;
@@ -578,12 +583,12 @@
// margin-top: 150px;
font-family: PingFangSC-Medium;
font-size: 14px;
- &:focus{
+ &:focus {
outline: none;
}
- .el-dialog__close{
- &:focus{
- outline: none!important;
+ .el-dialog__close {
+ &:focus {
+ outline: none !important;
}
}
.dawer_details {
@@ -604,16 +609,16 @@
margin-left: 20px;
}
}
-
+
.el-drawer__header {
border-bottom: 2px solid #eee;
padding-bottom: 10px;
font-size: 16px;
margin-bottom: 0px;
- span{
- border: none!important;
- border-image-width: 0!important;
- &:focus{
+ span {
+ border: none !important;
+ border-image-width: 0 !important;
+ &:focus {
outline: none;
}
}
--
Gitblit v1.8.0