From 16f3865dbd2b9df8e4344f03df3aebcb25eb3c08 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Tue, 6 Aug 2024 15:44:21 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=BE=A4=E6=8E=A7=E7=94=B5=E6=A2=AF?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/router/equipmentControl.ts | 4 +- .../alarmManagement/alarmSettings/index.vue | 1 - .../equipmentControl/electricDoor/index.vue | 4 +- .../image/liftState/escalator.png | Bin 0 -> 2322 bytes .../image/liftState/lift-suspend.svg | 4 + .../image/liftState/lift-unknown.svg | 4 + .../image/liftState/state-alarm.svg | 8 + .../image/liftState/state-fault.svg | 8 + .../image/liftState/state-normal.svg | 8 + .../image/liftState/state-repair.svg | 8 + .../image/liftState/straightLadder.png | Bin 0 -> 2315 bytes .../equipmentControl/liftSystem/index.vue | 143 ++++++++- .../equipmentControl/liftSystem/liftInfo.vue | 86 +++++- .../equipmentControl/liftSystem/liftPage.vue | 279 ++++++++++++++++++ 14 files changed, 523 insertions(+), 34 deletions(-) create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/escalator.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift-suspend.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift-unknown.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/state-alarm.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/state-fault.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/state-normal.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/state-repair.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/straightLadder.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts index ffc3285..e6a13b3 100644 --- a/hx-ai-intelligent/src/router/equipmentControl.ts +++ b/hx-ai-intelligent/src/router/equipmentControl.ts @@ -29,11 +29,11 @@ const equipmentControl = { name: 'liftSystem', meta: { title: '电梯系统', hideChildren: true, icon: 'shebeiqunkong' }, component: Base, - redirect: { name: 'liftSystem' }, + redirect: { name: 'liftSystemIndex' }, children: [ { path: 'index', - name: 'liftSystem', + name: 'liftSystemIndex', component: () => import('/@/view/equipmentControl/liftSystem/index.vue'), meta: { title: '电梯系统', diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue index ab3910d..9e4ca70 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue @@ -346,4 +346,3 @@ background-color: grey !important; } -../../../api/alarmManagement/alarmSettings/deviceAlarms../../../api/alarmManagement/alarmSettings/energyAlarm../../../api/alarmManagement/alarmSettings/notificationManagements diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue index 0431122..8cae1c6 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue @@ -1,7 +1,7 @@ diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue index ff7a321..e14bf23 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue @@ -26,26 +26,73 @@ +
- +
-
开启
+
{{ { '0': '正常', '1': '维修', '2': '故障', '3': '告警' }[3] }}
+
- +
-
开启
+
{{ + { + '0': '上行', //上行 + '1': '下行', //下行 + '2': '暂停', //暂停 + '3': '急停', //急停 + '4': '未知', //未知 + }[2] + }}
@@ -56,6 +103,15 @@ +