From 98a6297b10a4b97c3022f84d3ba7908c178d9ee0 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 20 十月 2020 10:30:10 +0800
Subject: [PATCH] 应用中心安装提示bug修复
---
src/pages/analysisPower/index/App.vue | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index 8c4d0de..8a8bb49 100644
--- a/src/pages/analysisPower/index/App.vue
+++ b/src/pages/analysisPower/index/App.vue
@@ -50,7 +50,13 @@
</div>
<span :class="stretchStyle" @click="strethTable = !strethTable"></span>
- <el-button size="small" type="primary" style="float:right" @click="openDrawer">璁剧疆</el-button>
+ <el-button
+ size="small"
+ type="primary"
+ style="float:right"
+ @click="openDrawer"
+ v-if="showSetting"
+ >璁剧疆</el-button>
</div>
<el-table
@@ -60,7 +66,7 @@
border
:cell-style="cellStyle"
>
- <el-table-column label="搴忓彿" type="index" align="center" width="100px"></el-table-column>
+ <el-table-column label="搴忓彿" type="index" align="center" width="60px"></el-table-column>
<el-table-column label="鎽勫儚鏈哄悕绉�" align="center" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span
@@ -70,7 +76,7 @@
</el-table-column>
<el-table-column label="鎽勫儚鏈哄湴鍧�" prop="addr" align="center" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="鎽勫儚鏈篒P" prop="ip" align="center" width="130px" sortable></el-table-column>
- <el-table-column label="鎽勫儚鏈虹被鍨�" align="center" width="110px" sortable>
+ <el-table-column label="鎽勫儚鏈虹被鍨�" align="center" width="120px" sortable>
<template slot-scope="scope">
<span>{{scope.row.run_type | cameraType}}</span>
</template>
@@ -118,7 +124,7 @@
title="绠楀姏璁剧疆"
:visible.sync="drawer"
direction="rtl"
- size="350px"
+ size="450px"
custom-class="e-drawer"
:before-close="closeDrawer"
>
@@ -228,7 +234,27 @@
}
})
- 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 < 0 ? 0 : ret
+ },
+ isAdmin() {
+ if (
+ sessionStorage.getItem("userInfo") &&
+ sessionStorage.getItem("userInfo") !== ""
+ ) {
+ let loginName = JSON.parse(sessionStorage.getItem("userInfo")).username;
+ return loginName === "superadmin" || loginName === "basic";
+ }
+
+ return false;
+ },
+ showSetting() {
+ return this.isAdmin || this.buttonAuthority.indexOf("analysisPower:set") > -1
}
},
data() {
@@ -243,7 +269,8 @@
showSysInfo: false,
drawer: false,
formData: {},
- strethTable: false
+ strethTable: false,
+ buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [],
};
},
mounted() {
@@ -267,7 +294,8 @@
initFormData() {
this.formData = {
totalChanle: this.PollData.channelTotal,
- realTime: this.PollData.RealTimeSum,
+ //realTime: this.PollData.RealTimeSum,
+ realTime: this.PollData.RealTimeValidCount,
pollEnable: this.PollData.Enabled,
pollPeriod: this.PollData.Config.poll_period,
polling: this.PollData.PollChannelTotal,
@@ -483,8 +511,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;'
}
}
@@ -503,7 +531,9 @@
height: 190px;
min-width: 1609px;
display: flex;
-
+ .sysinfo-box .eCharts-box {
+ width: 36%;
+ }
.progressBar {
width: 26%;
}
@@ -513,7 +543,6 @@
//float: left;
padding-left: 30px;
box-sizing: border-box;
-
}
.barGraph {
width: 16%;
@@ -573,9 +602,16 @@
.e-drawer {
// margin-top: 150px;
-
font-family: PingFangSC-Medium;
font-size: 14px;
+ &:focus {
+ outline: none;
+ }
+ .el-dialog__close {
+ &:focus {
+ outline: none !important;
+ }
+ }
.dawer_details {
text-align: left;
margin-left: 70px;
@@ -596,7 +632,17 @@
}
.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 {
+ outline: none;
+ }
+ }
}
}
</style>
--
Gitblit v1.8.0