From 27164d652e7e687e3945cd91a47f47a282065769 Mon Sep 17 00:00:00 2001
From: "605875155@qq.com" <mac@HelloWorld.lan>
Date: Wed, 11 Jan 2023 02:39:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化点位名称样式
---
 src/views/projectFront/projectSummary/devicePointConfig.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/projectFront/projectSummary/devicePointConfig.vue b/src/views/projectFront/projectSummary/devicePointConfig.vue
index 213e42d3..201ee71c 100644
--- a/src/views/projectFront/projectSummary/devicePointConfig.vue
+++ b/src/views/projectFront/projectSummary/devicePointConfig.vue
@@ -522,6 +522,7 @@ export default {
         color: #fff;
         font-size: 13px;
         // margin-left: 10px;
+        word-break: keep-all;
     }
   }
 //   .point:hover {

From 802f34713ae0938d427bc25b46b29830e91db4f7 Mon Sep 17 00:00:00 2001
From: "605875155@qq.com" <mac@HelloWorld.lan>
Date: Wed, 11 Jan 2023 13:47:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

标养室管理接口对接
---
 .../projectAdmin/fourEngin/quality/leftMiddle.vue      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue b/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
index da24e38e..b71bef9f 100644
--- a/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
+++ b/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
@@ -53,6 +53,7 @@ export default {
       dustData_24: [],
       humidityList:[],//湿度
       temperatureList:[],//温度
+      xData:[],//x轴时间
     };
   },
   mounted() {
@@ -81,6 +82,7 @@ export default {
         this.dustData_24.forEach(item=>{
           this.humidityList.push(item.humidity)
           this.temperatureList.push(item.temperature)
+          this.xData.push(item.receiveTime.split(' ')[1])
         })
         this.createdEchart1(); 
         this.createdEchart2(); 
@@ -118,7 +120,7 @@ export default {
               },
             },
             axisTick: { show: true },
-            data: ["8.00", "10.00", "12.00", "14.00", "16.00"],
+            data: this.xData,
           },
         ],
         yAxis: [
@@ -176,7 +178,7 @@ export default {
                 shadowBlur: 100, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
               },
             },
-            data: [90, 105, 84, 125, 110],
+            data: this.temperatureList,
           },
         ],
       };
@@ -215,7 +217,7 @@ export default {
               },
             },
             axisTick: { show: true },
-            data: ["8.00", "10.00", "12.00", "14.00", "16.00"],
+            data: this.xData,
           },
         ],
         yAxis: [
@@ -273,7 +275,7 @@ export default {
                 shadowBlur: 100, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
               },
             },
-            data: [90, 105, 84, 125, 110],
+            data: this.humidityList,
           },
         ],
       };