1.概况模式报警信息跳转监控，设备类型不一致导致跳转页面错误修正

2.监控模式 - 照明告警事件切换未显示修正；电子围界点击构件标签接口更换

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,

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>

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">

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) {

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",