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 @@
安全报警({{ listData.warnEventWarnNumber }}) + style="margin-left: 5px; vertical-align: bottom">({{ listData.warnEventWarnMumber }})
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) }} -
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 @@ >
- {{ bimModel == 1 ? "地上空域车位" : "塔楼人数占比" }} + {{ bimModel == 1 ? "地上空余车位" : "塔楼人数占比" }}
@@ -166,7 +166,7 @@ >
- {{ bimModel == 1 ? "地下空域车位" : "辅楼人数占比" }} + {{ bimModel == 1 ? "地下空余车位" : "辅楼人数占比" }}
@@ -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",