From eae4dd3e71b552eab2b4e1d1b83ac04d32288c0d Mon Sep 17 00:00:00 2001 From: chenpingsen Date: Thu, 15 Aug 2024 09:07:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?add:=E6=9B=BF=E6=8D=A2=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=B4=A0=E6=9D=90=20/=20=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20/=20=E5=A2=9E=E5=8A=A0=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/api/ventilatingSystem.ts | 34 +++++++++++ .../image/liftState/speed-hight.svg | 4 ++ .../equipmentControl/image/liftState/speed-low.svg | 4 ++ .../image/liftState/speed-middle.svg | 4 ++ .../image/liftState/speed-shut.svg | 4 ++ .../equipmentControl/image/liftState/wind-cold.svg | 11 ++++ .../equipmentControl/image/liftState/wind-hot.svg | 11 ++++ .../src/view/equipmentControl/style/color.less | 8 ++- .../ventilationSystem/devicePosition.ts | 69 ++++++++++++++++++++++ 9 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 hx-ai-intelligent/src/api/ventilatingSystem.ts create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-low.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-middle.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-shut.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-hot.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/devicePosition.ts diff --git a/hx-ai-intelligent/src/api/ventilatingSystem.ts b/hx-ai-intelligent/src/api/ventilatingSystem.ts new file mode 100644 index 0000000..3aa0b30 --- /dev/null +++ b/hx-ai-intelligent/src/api/ventilatingSystem.ts @@ -0,0 +1,34 @@ +// 前缀 +const prefix = '/carbon-smart'; +// 通风系统相关接口 +export enum ventilating { + // 排风扇相关 ============================================= + // 获得排风扇系统的树形结构 + getTree1 = prefix + '/ventilatingFanCtrl/getCtrlPanelTree', + // 获得排风扇的 场景/禁用 修改数据 + getChangeList1 = prefix + '/ventilatingFanCtrl/getSceneChangeInfo', + // 提交排风扇的修改内容 + sendChangeList1 = prefix + '/ventilatingFanCtrl/changeToSceneMode', + // 获得排风扇的设备状态 + getDevice1 = prefix + '/ventilatingFanCtrl/getDeviceState', + + // 风幕机相关 ============================================= + // 获得风幕机的树形结构 + getTree2 = prefix + '/airCurtainMachineCtrl/getCtrlPanelTree', + // 获得风幕机的 场景/禁用 修改数据 + getChangeList2 = prefix + '/airCurtainMachineCtrl/getSceneChangeInfo', + // 提交风幕机的修改内容 + sendChangeList2 = prefix + '/airCurtainMachineCtrl/changeToSceneMode', + // 获得风幕机的设备状态 + getDevice2 = prefix + '/airCurtainMachineCtrl/getDeviceState', + + // 电动窗相关 ============================================= + // 获得电动窗的树形结构 + getTree3 = prefix + '/eleOperatedWindowCtrl/getCtrlPanelTree', + // 获得电动窗的 场景/禁用 修改数据 + getChangeList3 = prefix + '/eleOperatedWindowCtrl/getSceneChangeInfo', + // 提交电动窗的修改内容 + sendChangeList3 = prefix + '/eleOperatedWindowCtrl/changeToSceneMode', + // 获得电动窗的设备状态 + getDevice3 = prefix + '/eleOperatedWindowCtrl/getDeviceState', +} diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg new file mode 100644 index 0000000..974f491 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-low.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-low.svg new file mode 100644 index 0000000..c3bc927 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-low.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-middle.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-middle.svg new file mode 100644 index 0000000..20db447 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-middle.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-shut.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-shut.svg new file mode 100644 index 0000000..85efc49 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-shut.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg new file mode 100644 index 0000000..1b02fcf --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-hot.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-hot.svg new file mode 100644 index 0000000..ec110f3 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-hot.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/style/color.less b/hx-ai-intelligent/src/view/equipmentControl/style/color.less index f3ac58c..2b10bdf 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/style/color.less +++ b/hx-ai-intelligent/src/view/equipmentControl/style/color.less @@ -12,8 +12,6 @@ --off: #bfcde2; // 暂停 - 维修 --pause: #ffbc46; - // 热风 - --hot: #fcf770; // 告警 - 急停 --stop: #f36163; // 故障 @@ -30,4 +28,10 @@ --middle: #0090FF; // 高速 --high: #5757FF; + + // 冷热风 + // 热风 + --hot: #fcf770; + // 冷风 + --cold: #55D1FF; } \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/devicePosition.ts b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/devicePosition.ts new file mode 100644 index 0000000..08c08d5 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/devicePosition.ts @@ -0,0 +1,69 @@ +// 排风扇 +export const devicePosition1 = [ + { + lineType: '1', + textObject: { left: '43.2%', bottom: '77.8%' }, + }, + { + lineType: '2', + textObject: { left: '50%', bottom: '77.8%' }, + }, + { + lineType: '1', + textObject: { left: '41.2%', bottom: '27.8%' }, + }, + { + lineType: '2', + textObject: { left: '51.2%', bottom: '27.8%' }, + }, +]; +// 风幕机 +export const devicePosition2 = [ + { + lineType: '1', + textObject: { left: '38%', bottom: '57.8%' }, + }, + { + lineType: '1', + textObject: { left: '58.5%', bottom: '57.3%' }, + }, + { + lineType: '1', + textObject: { left: '64.2%', bottom: '22.8%' }, + }, +]; +// 电动窗 +export const devicePosition3 = [ + { + lineType: '1', + textObject: { left: '32%', bottom: '28%' }, + }, + { + lineType: '1', + textObject: { left: '33.5%', bottom: '42.8%' }, + }, + { + lineType: '1', + textObject: { left: '35%', bottom: '57.8%' }, + }, + { + lineType: '1', + textObject: { left: '36.5%', bottom: '72.8%' }, + }, + { + lineType: '1', + textObject: { left: '66%', bottom: '28%' }, + }, + { + lineType: '1', + textObject: { left: '64%', bottom: '42.8%' }, + }, + { + lineType: '1', + textObject: { left: '62%', bottom: '57.8%' }, + }, + { + lineType: '1', + textObject: { left: '60%', bottom: '72.8%' }, + }, +]; From 0b37b30c401bfb9e57a7707d6f1a64fe813d6712 Mon Sep 17 00:00:00 2001 From: chenpingsen Date: Thu, 15 Aug 2024 09:41:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?add:=E9=80=9A=E9=A3=8E=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=95=E5=85=A5/=E7=B4=A0=E6=9D=90?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9/=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../image/liftState/speed-high.svg | 4 + .../image/liftState/speed-hight.svg | 4 - .../equipmentControl/image/liftState/wind-cold.svg | 2 +- .../ventilationSystem/components/boxModel.vue | 183 +++-- .../ventilationSystem/components/fanControl.vue | 880 +++++++++++++++++---- .../ventilationSystem/components/fanPlant.vue | 182 +++-- .../equipmentControl/ventilationSystem/index.vue | 366 ++++++--- 7 files changed, 1208 insertions(+), 413 deletions(-) create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-high.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-high.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-high.svg new file mode 100644 index 0000000..974f491 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-high.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg deleted file mode 100644 index 974f491..0000000 --- a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/speed-hight.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg index 1b02fcf..ade5809 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg +++ b/hx-ai-intelligent/src/view/equipmentControl/image/liftState/wind-cold.svg @@ -1,5 +1,5 @@ - + diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue index a3fbfcf..451ba2e 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue @@ -1,86 +1,106 @@
- {{ dataSource.title }} -
-
+ {{ dataSource.deviceGroupName ? dataSource.deviceGroupName : '--' }}
-
- + +
+
+ + + + +
- - - 正常 - + {{ runStatus.label }} + {{ runStatus.label }} + {{ runStatus.label }} + {{ runStatus.label }}
-
- + +
+
+ + + + +
- - - 高速启动 + {{ runMode.label }} + {{ runMode.label }} + {{ runMode.label }} + {{ runMode.label }}
-
- + +
+
+ + +
- - - 开启 + {{ + switchStatus.label + }} + {{ + switchStatus.label + }}
-
- +
+ +
+ + + +
- - 热风 - + {{ + runMode.label + }} + {{ + runMode.label + }} + {{ runMode.label }}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue index dad0fa7..fdfa2a8 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue @@ -1,201 +1,767 @@ + diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue index 05bb3c6..45e736f 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue @@ -1,6 +1,18 @@