Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into dev-yjl

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"],
+            data: this.xData,
           },
         ],
         yAxis: [
@@ -215,7 +217,7 @@ export default {
               },
             },
             axisTick: { show: true },
-            data: ["8.00", "10.00", "12.00", "14.00", ],
+            data: this.xData,
           },
         ],
         yAxis: [

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 {