From 270e7443a1e4b8993918347f8094e38cc15cc861 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期日, 06 九月 2020 19:03:45 +0800
Subject: [PATCH] 修复内存信息展示,实时监控视频区域展示测试
---
src/components/subComponents/SystemInfo.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/components/subComponents/SystemInfo.vue b/src/components/subComponents/SystemInfo.vue
index 5dd0915..e9786ed 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,
@@ -125,7 +125,8 @@
initCpuCharts() {
this.$forceUpdate();
}
- },
+ }
+
}
</script>
<style lang="scss">
@@ -133,6 +134,7 @@
height: 100%;
.card-box {
width: 50%;
+ float: left;
@media screen and (min-width: 1280px) and (max-width: 1440px) {
width: 65%;
}
@@ -172,17 +174,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