From b743fe5918d1acc4d15c294ec93f5364ef6e7f7b Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 13 Apr 2023 14:15:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A6=82=E5=86=B5=E6=A8=A1=E5=BC=8F=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E8=B7=B3=E8=BD=AC=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E5=AF=BC=E8=87=B4=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3=202.=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20-=20=E7=85=A7=E6=98=8E=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=87=E6=8D=A2=E6=9C=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9B=E7=94=B5=E5=AD=90=E5=9B=B4=E7=95=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9E=84=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/garden/monitoring.js           |  2 +-
 src/components/monitoring/door.vue     |  2 +-
 src/components/monitoring/light.vue    |  2 +-
 src/views/garden/generalizePattern.vue | 12 +++++++-----
 vue.config.js                          |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/garden/monitoring.js b/src/api/garden/monitoring.js
index ff0bf7c..4bb5f8f 100644
--- a/src/api/garden/monitoring.js
+++ b/src/api/garden/monitoring.js
@@ -631,7 +631,7 @@ export const getWallLists = (area) => {
 // 电子围界 报警记录
 export const getWallRecords = (code, current, size) => {
   return request({
-    url: "/api/blade-desk/garden/fence/detail",
+    url: "/api/blade-desk/garden/fence/get-by-code",
     method: "get",
     params: {
       code,
diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue
index 0b047bb..f464749 100644
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@@ -77,7 +77,7 @@
         </div>
         <div class="tab_one tab_two" @click="clickAlarm(2)" :style="{ color: activeTab == 2 ? '#07E6ED' : '#fff' }">
           <el-badge :is-dot="isSafe" class="item">安全报警</el-badge><span
-            style="margin-left: 5px; vertical-align: bottom">({{ listData.warnEventWarnNumber }})</span>
+            style="margin-left: 5px; vertical-align: bottom">({{ listData.warnEventWarnMumber }})</span>
         </div>
         <!-- <div class="tab_one tab_two" @click="clickAlarm(2)" :style="{color: isSafe ? 'red' :'#fff'}"><el-badge :is-dot='isSafe' class="item">安全报警</el-badge><span style="margin-left:5px;vertical-align: bottom;">({{safeTotal}})</span></div> -->
       </div>
diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue
index e753355..aea6649 100644
--- a/src/components/monitoring/light.vue
+++ b/src/components/monitoring/light.vue
@@ -114,7 +114,7 @@
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
-        <div class="item flex-center" v-for="(item, index) in listData.warnEventList" :key="'warnEvent' + index" v-else
+        <div class="item flex-center" v-for="(item, index) in listData.warnEventList" :key="'warnEvent' + index" v-if="activeTab == 2"
           @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
diff --git a/src/views/garden/generalizePattern.vue b/src/views/garden/generalizePattern.vue
index 9a30497..d5e301e 100644
--- a/src/views/garden/generalizePattern.vue
+++ b/src/views/garden/generalizePattern.vue
@@ -114,7 +114,7 @@
                 >
               </div>
               <div class="intro_name">
-                {{ bimModel == 1 ? "地上空域车位" : "塔楼人数占比" }}
+                {{ bimModel == 1 ? "地上空余车位" : "塔楼人数占比" }}
               </div>
             </div>
           </div>
@@ -166,7 +166,7 @@
                 >
               </div>
               <div class="intro_name">
-                {{ bimModel == 1 ? "地下空域车位" : "辅楼人数占比" }}
+                {{ bimModel == 1 ? "地下空余车位" : "辅楼人数占比" }}
               </div>
             </div>
           </div>
@@ -1198,13 +1198,15 @@ export default {
         },
         legend: {
           top: "85%",
+          left: '-10',
+          padding: [5,0],
           itemHeight: 0,
           formatter: function (name) {
             return name == "监控"
               ? `{iconMark1|}  ${name}`
               : name == "消防"
               ? `{iconMark2|}  ${name}`
-              : name == "门禁"
+              : name == "电子门禁"
               ? `{iconMark3|}  ${name}`
               : `{iconMark4|}  ${name}`;
           },
@@ -1250,7 +1252,7 @@ export default {
               name: "消防",
             },
             {
-              name: "门禁",
+              name: "电子门禁",
             },
             {
               name: "电子围界",
@@ -1412,7 +1414,7 @@ export default {
     goMonitoringFunByCode(clasCode) {
       if (clasCode) {
         let name = this.getNameByClassCode(clasCode);
-        this.goMonitoringFun(name);
+        this.goMonitoringFun(name.indexOf('照明') > -1 ? '照明' : name.indexOf('电梯') > -1 ? '电梯' : name);
       }
     },
     goMonitoringFun(name) {
diff --git a/vue.config.js b/vue.config.js
index 086fc5e..21b45d8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,7 +27,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/bimfaceApi": {
-        target: 'http://192.168.1.3:8088',
+        target: 'http://192.168.1.3:8001',
         ws: true,
         pathRewrite: {
           "^/bimfaceApi": "/bimface",