diff --git a/hx-ai-intelligent/src/api/planManage.ts b/hx-ai-intelligent/src/api/planManage.ts index beb8075..e453fbe 100644 --- a/hx-ai-intelligent/src/api/planManage.ts +++ b/hx-ai-intelligent/src/api/planManage.ts @@ -2,7 +2,7 @@ const prefix = '/carbon-smart/api'; // 照明系统及相关接口 export enum planManage { /** - * @param deviceType 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + * @param deviceType 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) */ // 获得未激活的计划 getTransData = prefix + '/deviceCtrlPlan/getDeActivatedPlanList', diff --git a/hx-ai-intelligent/src/api/waterSystem.ts b/hx-ai-intelligent/src/api/waterSystem.ts new file mode 100644 index 0000000..e8c282c --- /dev/null +++ b/hx-ai-intelligent/src/api/waterSystem.ts @@ -0,0 +1,13 @@ +// 前缀 +const prefix = '/carbon-smart/api'; +// 通风系统相关接口 +export enum waterSys { + // 获得污水池状态 + getPool1 = prefix + '/waterSysCtrl/getSewagePoolState', + // 获得阀门状态 + getValve = prefix + '/waterSysCtrl/getValveState', + // 获得集水池状态 + getPool2 = prefix + '/waterSysCtrl/getCollectPoolState', + // 获得水泵状态 + getPump = prefix + '/waterSysCtrl/getPumpState', +} diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue index fccad2a..0fb7d5d 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue @@ -161,7 +161,7 @@ .get(planManage.getTableData, { projectId: state.projectId, siteId: state.siteId, - // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) ctrlType: 2, }) .then((res) => { @@ -235,7 +235,7 @@ .get(planManage.getTransData, { projectId: state.projectId, siteId: state.siteId, - // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) ctrlType: 2, }) .then((res) => { diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue index 2c3a7e3..d09713b 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue @@ -162,7 +162,7 @@ .get(planManage.getTableData, { projectId: state.projectId, siteId: state.siteId, - // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) ctrlType: 1, }) .then((res) => { @@ -236,7 +236,7 @@ .get(planManage.getTransData, { projectId: state.projectId, siteId: state.siteId, - // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) ctrlType: 1, }) .then((res) => { 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 da7fa3e..dfc2138 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue @@ -176,7 +176,7 @@ .get(planManage.getTableData, { projectId: state.projectId, siteId: state.siteId, - // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) ctrlType: props.type, }) .then((res) => { @@ -249,7 +249,7 @@ .get(planManage.getTransData, { projectId: state.projectId, siteId: state.siteId, - // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵) + // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水) ctrlType: props.type, }) .then((res) => { diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm1.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm1.png new file mode 100644 index 0000000..306285a Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm1.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm2.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm2.png new file mode 100644 index 0000000..67f0378 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm2.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.gif b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.gif new file mode 100644 index 0000000..14d82f9 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.gif differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.png new file mode 100644 index 0000000..2a1a98d Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device1.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device1.png new file mode 100644 index 0000000..1fbe341 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device1.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device2.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device2.png new file mode 100644 index 0000000..60209f6 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device2.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/edit.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/edit.png new file mode 100644 index 0000000..54f9788 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/edit.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type1off.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type1off.png new file mode 100644 index 0000000..7e2d810 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type1off.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type2off.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type2off.png new file mode 100644 index 0000000..d5c2082 Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type2off.png differ diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type3off.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type3off.png new file mode 100644 index 0000000..6eb3afd Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type3off.png differ