From 933e4b26a866398e9c06f70cb0a2a78e7e4136e7 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Wed, 21 Aug 2024 14:47:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=9A=E9=A3=8E=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hx-ai-intelligent/src/api/ventilatingSystem.ts | 2 +
.../airConditioningSystem/index.vue | 4 +-
.../components/doubleSingleModel.vue | 4 +-
.../equipmentControl/components/singleModel.vue | 2 +-
.../image/airConditioningSystem/sunBlue.png | Bin 2767 -> 0 bytes
.../image/airConditioningSystem/sunGreen.png | Bin 0 -> 2767 bytes
.../ventilationSystem/devicePosition.ts | 8 ++
.../equipmentControl/ventilationSystem/index.vue | 160 +++++++++++----------
8 files changed, 101 insertions(+), 79 deletions(-)
delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/sunBlue.png
create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/sunGreen.png
diff --git a/hx-ai-intelligent/src/api/ventilatingSystem.ts b/hx-ai-intelligent/src/api/ventilatingSystem.ts
index a99c07e..153c0fb 100644
--- a/hx-ai-intelligent/src/api/ventilatingSystem.ts
+++ b/hx-ai-intelligent/src/api/ventilatingSystem.ts
@@ -2,6 +2,8 @@
const prefix = '/carbon-smart/api';
// 通风系统相关接口
export enum ventilating {
+ //传感器获取数据
+ getSensorData = prefix + '/multiFuncSensorCtrl/getDeviceState',
// 排风扇相关 =============================================
// 获得排风扇系统的树形结构
getTree1 = prefix + '/ventilatingFanCtrl/getCtrlPanelTree',
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
index f66f48a..b83a527 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
@@ -177,7 +177,7 @@
// 温泉颜色
import sunRed from '../image/airConditioningSystem/sunRed.png';
import sunYellow from '../image/airConditioningSystem/sunYellow.png';
- import sunBlue from '../image/airConditioningSystem/sunBlue.png';
+ import sunGreen from '../image/airConditioningSystem/sunGreen.png';
import singleModel from '../components/singleModel.vue';
import doubleSingleModel from '../components/doubleSingleModel.vue';
@@ -230,7 +230,7 @@
type: '温度',
unit: '℃',
number: 20,
- url: sunBlue,
+ url: sunGreen,
},
{
title: 'D区多功能传感器',
diff --git a/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue b/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
index 6653f59..da218f8 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
@@ -57,7 +57,7 @@