From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/visual/index/home.vue | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/pages/visual/index/home.vue b/src/pages/visual/index/home.vue
index 1538cf7..8394bf6 100644
--- a/src/pages/visual/index/home.vue
+++ b/src/pages/visual/index/home.vue
@@ -48,18 +48,14 @@
</div>
</div>
<div v-if="radioType === '1'" id="category" class="category-parent">
- <category
- v-if="CategoryData.isShow"
- :xAxisData="CategoryData.xAxisArray"
- :seriesData="CategoryData.seriesArray"
- ></category>
+ <category :xAxisData="CategoryData.xAxisArray" :seriesData="CategoryData.seriesArray"></category>
</div>
<div v-if="radioType === '2'" class="div-realTime">
<realTimeList></realTimeList>
</div>
</div>
<div v-if="radioType === '1'" id="category" class="category-parent">
- <category v-if="CategoryData.isShow"></category>
+ <category></category>
</div>
<div v-if="radioType === '2'" class="div-realTime">
<realTimeList></realTimeList>
@@ -106,7 +102,7 @@
</div>
<div class="div-text">
<p class="s-1">褰撳墠棰勮</p>
- <span class="s-2">{{CategoryData.warnCount}}</span>
+ <span class="s-2">{{CategoryData.warnInfo.alarmTotal}}</span>
<span class="s-3">浜�</span>
</div>
</div>
@@ -116,7 +112,7 @@
</div>
<div class="div-text">
<p class="s-1">鍓╀綑杞︿綅</p>
- <span class="s-2">0192</span>
+ <span class="s-2">{{CategoryData.warnInfo.spaceLeft}}</span>
<span class="s-3">涓�</span>
</div>
</div>
@@ -142,7 +138,7 @@
</div>
</div>
<div class="div-pie">
- <mutPie v-if="CategoryData.isShow"></mutPie>
+ <mutPie></mutPie>
</div>
<div class="bottom-title">
<span class="s-1">鎽勫儚鏈�</span>
@@ -159,7 +155,6 @@
<div class="div-pie" v-if="CategoryData.dataStatus==='default'">
<span>棰勮浜嬩欢</span>
<pie
- v-if="CategoryData.isShow"
:seriesName="CategoryData.pieName"
:radiusType="radiusType"
:seriesData="CategoryData.pieData"
@@ -240,12 +235,8 @@
// 鐩戝惉绐楀彛
document.addEventListener("visibilitychange", this.visibilitychange, false);
window.addEventListener('resize', this.windowSizeChange)
- this.CategoryData.isShow = false;
- this.$nextTick(() => {
- // let height = document.getElementById('category').clientHeight
- // console.log(height,'category鐨勯珮搴�')
- this.CategoryData.isShow = true;
- })
+
+ this.VideoPhotoData.capture();
this.timer = setInterval(() => {
this.VideoPhotoData.capture()
this.CategoryData.realTimeCapture();
@@ -407,7 +398,7 @@
}
}
.monitor {
- height: calc(62% - 20px);
+ height: calc(62% - 27px);
.monitoring-video {
height: 100%;
width: 100%;
@@ -430,7 +421,7 @@
}
}
.entry-exit {
- height: calc(38% - 20px);
+ height: calc(38% - 23px);
.category-parent {
width: 100%;
height: 80%;
@@ -546,7 +537,7 @@
@media screen and (min-width: 1600px) {
width: 50%;
}
- height: 100%;
+ height: calc(100% - 10px);
float: left;
color: #fff;
.col {
--
Gitblit v1.8.0