From 929cf4c7be11bfd1e134d0cb0d7cbbe94772ebdf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 07 九月 2020 15:35:14 +0800
Subject: [PATCH] 摄像机树增加导入功能
---
src/components/subComponents/SystemInfo.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/components/subComponents/SystemInfo.vue b/src/components/subComponents/SystemInfo.vue
index 5dd0915..0c1c821 100644
--- a/src/components/subComponents/SystemInfo.vue
+++ b/src/components/subComponents/SystemInfo.vue
@@ -75,7 +75,7 @@
</li>
</ul>
</div>-->
- <div class="eCharts-box" :style="`width:${liquidWidth}`">
+ <div class="eCharts-box" v-if="PollData.barCharts.length>0">
<eChartsBar ref="cpuMeneryCharts" :xAxisData="PollData.barCharts"></eChartsBar>
</div>
</div>
@@ -114,7 +114,7 @@
},
borderWidth: {
type: String,
- default: '70%'
+ default: '64%'
},
liquidWidth: {
type: String,
@@ -126,6 +126,9 @@
this.$forceUpdate();
}
},
+ mounted(){
+ console.log('PollData.RealTimeValidCount',this.PollData.RealTimeValidCount)
+ }
}
</script>
<style lang="scss">
@@ -133,6 +136,7 @@
height: 100%;
.card-box {
width: 50%;
+ float: left;
@media screen and (min-width: 1280px) and (max-width: 1440px) {
width: 65%;
}
@@ -172,17 +176,22 @@
font-weight: 700;
}
}
+ ul{
+ padding-left: 0;
+ }
}
.eCharts-box {
- width: 50%;
+ width: 28%;
+ float: left;
+ box-sizing: border-box;
height: 100%;
- margin-left: 5px;
- @media screen and (min-width: 1280px) and (max-width: 1440px) {
- width: 35%;
- }
- @media screen and (max-width: 1279px) {
- width: 30%;
- }
+ margin-left: 30px;
+ // @media screen and (min-width: 1280px) and (max-width: 1440px) {
+ // width: 35%;
+ // }
+ // @media screen and (max-width: 1279px) {
+ // width: 30%;
+ // }
}
.chart-box {
float: left;
--
Gitblit v1.8.0