From 49010d1437da7b05416f722065b696b6250b5067 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Thu, 22 Aug 2024 16:27:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E9=A3=8E=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/api/airConditioningSystem.ts | 2 +- .../components/floorHeatingModel.vue | 4 +- .../airConditioningSystem/devicePosition.ts | 45 +++++++++++++++++++--- .../airConditioningSystem/index.vue | 23 +++++++++-- 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/hx-ai-intelligent/src/api/airConditioningSystem.ts b/hx-ai-intelligent/src/api/airConditioningSystem.ts index b644428..2cd6a00 100644 --- a/hx-ai-intelligent/src/api/airConditioningSystem.ts +++ b/hx-ai-intelligent/src/api/airConditioningSystem.ts @@ -3,5 +3,5 @@ import { BASE_URL } from './index'; export enum airConditioningSystemApi { getVentHostCtrlList = `${BASE_URL}/api/ventHostCtrl/getDeviceState`, // 查询新风主机最新状态 getAcBoxCtrlList = `${BASE_URL}/api/acBoxCtrl/getDeviceState`, // 查询空调箱最新状态 - getTempSysCtrlList = `${BASE_URL}/tempSysCtrl/getFloorHeatingState`, // 查询地暖最新状态 + getTempSysCtrlList = `${BASE_URL}/api/tempSysCtrl/getFloorHeatingState`, // 查询地暖最新状态 } diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue index 9e34657..7bc156f 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue @@ -16,7 +16,9 @@
温度
- {{ item.temp }}{{ item.tempUnit }} + {{ item.currentTemp }}{{ item.currentTempUnit }}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts index 7a0fb99..9147c24 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts @@ -28,10 +28,45 @@ export const airConditioningPosition = [ ]; //地暖 export const floorHeatingPosition = [ - { styleText: { left: '13%', bottom: '44%' }, lineType: '' }, - { styleText: { left: '22%', bottom: '48%' }, lineType: 1 }, - { styleText: { left: '34%', bottom: '53%' }, lineType: 1 }, - { styleText: { left: '49%', bottom: '59%' }, lineType: 1 }, + { + styleText: { + left: '13%', + bottom: '44%', + width: '150px', + height: '255px', + lineLeft: '220px', + lineBottom: '110px', + color: 'rgba(209, 191, 162,0.5)', + }, + lineType: '', + }, + { + styleText: { + left: '21%', + bottom: '48%', + width: '130px', + height: '325px', + lineLeft: '370px', + lineBottom: '110px', + color: 'rgba(214, 224, 153,0.5)', + transform: 'rotateX(43deg) rotateZ(-19deg) skew(12deg) rotateY(-1deg)', + }, + lineType: 1, + }, + { + styleText: { + left: '34.5%', + bottom: '53.5%', + width: '350px', + height: '300px', + lineLeft: '492px', + lineBottom: '190px', + color: 'rgba(196, 180, 228,0.5)', + transform: 'rotateX(44deg) rotateZ(-20deg) skew(12deg) rotateY(0deg)', + }, + lineType: 1, + }, + { styleText: { left: '47.5%', bottom: '60.3%' }, lineType: 1 }, { styleText: { left: '60.5%', bottom: '65.5%' }, lineType: 1 }, - { styleText: { left: '72%', bottom: '72%' }, lineType: 1 }, + { styleText: { left: '73%', bottom: '72%' }, lineType: 1 }, ]; diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue index 6863593..4fa2b50 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue @@ -149,6 +149,17 @@ style="width: 42px; height: 42px; position: absolute; z-index: 1" :style="{ left: item.styleText.left, bottom: item.styleText.bottom }" src="../image/airConditioningSystem/floorHeatingIcon.png" /> +
+
@@ -511,7 +522,6 @@ siteId: state.siteId, }) .then((res) => { - console.log(res, '地暖'); if (res.msg === 'success') { res.data.forEach((item: any, index: number) => { floorHeatingData.value.push({ @@ -538,12 +548,12 @@ getTempSysCtrlList(); }; //实时获取数据 暂定一分钟 - const intervalId = setInterval(fetchData, 60000); + // const intervalId = setInterval(fetchData, 60000); onMounted(() => { fetchData(); }); onUnmounted(() => { - clearInterval(intervalId); + // clearInterval(intervalId); });