From 2524367eb535affc849f451671ef9bd74b1f989b Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Mon, 26 Aug 2024 15:12:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E9=A3=8E=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/conditioningModel.vue          |  2 +
 .../airConditioningSystem/devicePosition.ts   | 71 +++++++++++++++----
 .../airConditioningSystem/index.vue           | 23 +++---
 3 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue
index 85ed84f..d84c549 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue
@@ -11,6 +11,7 @@
               class="box-center-button"
               :style="{
                 backgroundColor: item.title === selectConditioning.title ? '#a7e5ff' : '#b5cdd9',
+                color: item.title === selectConditioning.title ? 'rgb(0, 61, 90)' : '#fff',
               }"
               @click="selectConditioningData(item, index)">
               {{ item.title }}
@@ -28,6 +29,7 @@
               class="box-center-button"
               :style="{
                 backgroundColor: item.title === selectConditioning.title ? '#a7e5ff' : '#b5cdd9',
+                color: item.title === selectConditioning.title ? 'rgb(0, 61, 90)' : '#fff',
               }"
               @click="selectConditioningData(item, index)">
               {{ item.title }}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts
index b74337e..9b28cd8 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts
@@ -19,7 +19,13 @@ export const newTrendPosition = [
 //空调箱
 export const airConditioningPosition = [
   {
-    styleText: { left: '13%', bottom: '30%', width: '120px', color: 'rgba(165, 209, 123, 0.5)' },
+    styleText: {
+      left: '13%',
+      bottom: '30%',
+      width: '120px',
+      color: 'rgba(96, 241, 125, 0.2)',
+      border: '1px solid rgba(96, 241, 125, 1)',
+    },
     lineType: 1,
   },
   {
@@ -28,7 +34,8 @@ export const airConditioningPosition = [
       bottom: '38%',
       mLeft: '120px',
       width: '100px',
-      color: 'rgba(217, 223, 179, 0.5)',
+      color: 'rgba(249, 214, 76, 0.2)',
+      border: '1px solid rgba(249, 214, 76, 1)',
     },
     lineType: 1,
   },
@@ -37,17 +44,44 @@ export const airConditioningPosition = [
       left: '41%',
       bottom: '55.5%',
       width: '300px',
-      height: '150px',
-      color: 'rgba(168, 226, 233, 0.5)',
+      height: '160px',
+      color: 'rgba(38, 255, 255, 0.2)',
+      border: '1px solid rgba(38, 255, 255, 1)',
+    },
+    lineType: 1,
+  },
+  {
+    styleText: {
+      left: '60%',
+      bottom: '63%',
+      width: '315px',
+      height: '180px',
+      color: 'rgba(255, 118, 54, 0.2)',
+      border: '1px solid rgba(255, 118, 54, 1)',
+    },
+    lineType: 1,
+  },
+  {
+    styleText: {
+      left: '76%',
+      bottom: '63%',
+      width: '90px',
+      color: 'rgba(92, 77, 245, 0.2)',
+      border: '1px solid rgba(92, 77, 245, 1)',
     },
     lineType: 1,
   },
-  { styleText: { left: '60%', bottom: '63%' }, lineType: 1 },
-  { styleText: { left: '76%', bottom: '63%' }, lineType: 1 },
   {
     styleText: {
       left: '71%',
       bottom: '48%',
+      width: '315px',
+      height: '120px',
+      color: 'rgba(103, 255, 0, 0.2)',
+      border: '1px solid rgba(103, 255, 0, 1)',
+      position: 'absolute',
+      top: '185px',
+      abLeft: '650px',
     },
     lineType: '',
   },
@@ -57,8 +91,11 @@ export const airConditioningPosition = [
       bottom: '32%',
       width: '300px',
       height: '150px',
-      mTop: '150px',
-      color: 'rgba(168, 226, 233, 0.5)',
+      color: 'rgba(220, 67, 46, 0.2)',
+      border: '1px solid rgba(220, 67, 46, 1)',
+      position: 'absolute',
+      top: '163px',
+      abLeft: '343px',
     },
     lineType: '',
   },
@@ -70,7 +107,8 @@ export const floorHeatingPosition = [
       left: '13.4%',
       bottom: '44%',
       width: '120px',
-      color: 'rgba(242, 209, 156, 0.5)',
+      color: 'rgba(242, 209, 156, 0.2)',
+      border: '1px solid rgba(242, 209, 156, 1)',
     },
     lineType: '',
   },
@@ -79,7 +117,8 @@ export const floorHeatingPosition = [
       left: '21%',
       bottom: '48%',
       width: '115px',
-      color: 'rgba(224, 244, 102,0.5)',
+      color: 'rgba(224, 244, 102, 0.2)',
+      border: '1px solid rgba(224, 244, 102, 1)',
     },
     lineType: 1,
   },
@@ -88,7 +127,8 @@ export const floorHeatingPosition = [
       left: '34.5%',
       bottom: '53.5%',
       width: '355px',
-      color: 'rgba(167, 128, 244, 0.5)',
+      color: 'rgba(167, 128, 244, 0.2)',
+      border: '1px solid rgba(167, 128, 244, 1)',
     },
     lineType: 1,
   },
@@ -97,7 +137,8 @@ export const floorHeatingPosition = [
       left: '47.5%',
       bottom: '60.3%',
       width: '90px',
-      color: 'rgba(155, 216, 224, 0.5)',
+      color: 'rgba(155, 216, 224, 0.2)',
+      border: '1px solid rgba(155, 216, 224, 1)',
     },
     lineType: 1,
   },
@@ -106,7 +147,8 @@ export const floorHeatingPosition = [
       left: '60.5%',
       bottom: '65.5%',
       width: '350px',
-      color: 'rgba(222, 111, 141, 0.5)',
+      color: 'rgba(222, 111, 141, 0.2)',
+      border: '1px solid rgba(222, 111, 141, 1)',
     },
     lineType: 1,
   },
@@ -115,7 +157,8 @@ export const floorHeatingPosition = [
       left: '73%',
       bottom: '72%',
       width: '140px',
-      color: 'rgba(152, 190, 162, 0.5)',
+      color: 'rgba(152, 190, 162, 0.2)',
+      border: '1px solid rgba(152, 190, 162, 1)',
     },
     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 5ab571a..594b70b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
@@ -18,7 +18,7 @@
     </div>
     <div class="map-box">
       <!-- 温度 -->
-      <div v-if="selectIndex === 1">
+      <div v-if="selectIndex === 0">
         <template v-for="(item, index) in sensorData" :key="index">
           <div
             style="position: absolute"
@@ -76,7 +76,7 @@
         <newTrendModel :dataSource="newTrend" />
       </a-drawer>
       <!-- 空调箱 -->
-      <div v-if="selectIndex === 0">
+      <div v-if="selectIndex === 3">
         <template v-for="(item, index) in conditioningData" :key="index">
           <div
             style="position: absolute; z-index: 2"
@@ -116,7 +116,7 @@
           ref="conditioningModels"
           @selectConditioningData="selectConditioningData" />
       </a-drawer>
-      <div v-if="selectIndex === 0" class="area">
+      <div v-if="selectIndex === 3" class="area-air">
         <div
           v-for="(item, index) in airConditioningPosition"
           :key="index"
@@ -126,7 +126,10 @@
             height: item.styleText.height,
             background: item.styleText.color,
             marginLeft: item.styleText.mLeft,
-            marginTop: item.styleText.mTop,
+            position: item.styleText.position,
+            top: item.styleText.top,
+            left: item.styleText.abLeft,
+            border: item.styleText.border,
           }">
         </div>
       </div>
@@ -165,12 +168,16 @@
             src="../image/airConditioningSystem/floorHeatingIcon.png" />
         </template>
       </div>
-      <div v-if="selectIndex === 4" class="area">
+      <div v-if="selectIndex === 4" class="area-air">
         <div
           v-for="(item, index) in floorHeatingData"
           :key="index"
           style="display: flex"
-          :style="{ width: item.styleText.width, background: item.styleText.color }">
+          :style="{
+            width: item.styleText.width,
+            background: item.styleText.color,
+            border: item.styleText.border,
+          }">
         </div>
       </div>
       <!-- 地暖详情 -->
@@ -567,7 +574,7 @@
     clearInterval(intervalId);
   });
 </script>
-<style lang="less" scoped>
+<style lang="less">
   .legend-box {
     width: 80px;
     height: 100%;
@@ -619,7 +626,7 @@
     perspective-origin: 900px 43px;
   }
 
-  .map-box .area {
+  .map-box .area-air {
     position: absolute;
     bottom: 230px;
     left: 250px;