diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts
index 54d21d3..ce85f33 100644
--- a/hx-ai-intelligent/src/router/equipmentControl.ts
+++ b/hx-ai-intelligent/src/router/equipmentControl.ts
@@ -103,7 +103,7 @@ const equipmentControl = {
{
path: 'airConditionControlSystem',
name: 'airConditionControlSystem',
- meta: { title: '空调系统群控', hideChildren: true, icon: 'shebeiqunkong' },
+ meta: { title: '空调系统', hideChildren: true, icon: 'shebeiqunkong' },
component: Base,
redirect: { name: 'airConditionControlSystemIndex' },
children: [
@@ -112,7 +112,26 @@ const equipmentControl = {
name: 'airConditionControlSystemIndex',
component: () => import('/@/view/equipmentControl/airConditionControlSystem/index.vue'),
meta: {
- title: '空调系统群控',
+ title: '空调系统',
+ keepAlive: false,
+ // backApi: [],
+ },
+ },
+ ],
+ },
+ {
+ path: 'waterSystem',
+ name: 'waterSystem',
+ meta: { title: '给排水系统', hideChildren: true, icon: 'shebeiqunkong' },
+ component: Base,
+ redirect: { name: 'waternControlSystemIndex' },
+ children: [
+ {
+ path: 'index',
+ name: 'waternControlSystemIndex',
+ component: () => import('/@/view/equipmentControl/waterSystem/index.vue'),
+ meta: {
+ title: '给排水系统',
keepAlive: false,
// backApi: [],
},
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
index 00d4f0c..fec786d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
@@ -104,7 +104,7 @@
-
+
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
index 832c97f..302a44f 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanLog.vue
@@ -62,13 +62,22 @@
}}
-
-
亮度
+
+
运行模式
-
-
{{ item.brightnessBefore != null ? item.brightnessBefore : '--' }}
+
{{
+ item.runModeBefore.label != null ? item.runModeBefore.label : '--'
+ }}
-
{{ item.brightnessAfter != null ? item.brightnessAfter : '--' }}
+
{{ item.runModeAfter.label != null ? item.runModeAfter.label : '--' }}
+
+
+
+
开窗幅度
+
+
{{ item.openPercentBefore != null ? item.openPercentBefore : '--' }}
+
+
{{ item.openPercentAfter != null ? item.openPercentAfter : '--' }}
@@ -80,12 +89,14 @@
-
色温
+
开启状态
-
{{ item.colorBefore != null ? item.colorBefore : '--' }}
+
{{
+ item.switchStatusBefore.label != null ? item.switchStatusBefore.label : '--'
+ }}
- {{ item.colorAfter != null ? item.colorAfter : '--' }}
+ {{ item.switchStatusAfter.label != null ? item.switchStatusAfter.label : '--' }}