From 6f35a449c8ca08d068c2eaef18ef4807b81d597c Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 15 Dec 2022 12:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/garden/generalizePatternNew.vue | 2 +-
src/views/garden/index.vue | 76 ++++++++++++++---------
2 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/src/views/garden/generalizePatternNew.vue b/src/views/garden/generalizePatternNew.vue
index 6b1c550..74d1424 100644
--- a/src/views/garden/generalizePatternNew.vue
+++ b/src/views/garden/generalizePatternNew.vue
@@ -19,7 +19,7 @@
:style="{ top: '0.47rem' }">
{{ isHolidays ? '节假日' : '工作日' }}
- 运行状态:{{ (reportFangyi.status == 2 ? '分区域运行' : reportFangyi.status == 2 ? '封闭运行' :
+ 运行状态:{{ (reportFangyi.status == 2 ? '分区域运行' : reportFangyi.status == 1 ? '封闭运行' :
'正常')
}}
diff --git a/src/views/garden/index.vue b/src/views/garden/index.vue
index 4c55218..1910103 100644
--- a/src/views/garden/index.vue
+++ b/src/views/garden/index.vue
@@ -4,34 +4,37 @@
-
-
-
-

-

-
概况模式
-
-
+
+
+
+

+

+
概况模式
+
+
+
+

+

+
监控模式
+
+
+
@@ -41,15 +44,15 @@
-
+
-
+
-
+
-
+

@@ -59,11 +62,11 @@
塔台
-->
-
@@ -161,6 +164,16 @@ export default {
}
}
+ },
+ "$store.state.bfHelperState.bfState": {
+ immediate: true,
+ handler(newval, olval) {
+ if (newval) {
+ document.querySelector(".bf-house").style.zIndex = "100";
+ document.querySelector(".bf-menu").style.zIndex = "100";
+ // this.$refs.monitoringPattern.clickMenu(1, '电', true);
+ }
+ },
}
},
created() {
@@ -377,12 +390,13 @@ export default {
// height: 3.575rem;
// background: url(../../../public/img/top_navBg.png);
background-size: 100% 100%;
+ padding: 0 32px;
.topNav1 {
display: flex;
align-items: center;
justify-content: space-between;
- width: 90%;
+ width: 100%;
height: 3rem;
}