admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
骆乐 2023-01-11 14:03:30 +08:00
commit 6313f41642
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
View File

@ -53,6 +53,7 @@ export default {
dustData_24: [], dustData_24: [],
humidityList:[],//湿度 humidityList:[],//湿度
temperatureList:[],//温度 temperatureList:[],//温度
xData:[],//x轴时间
}; };
}, },
mounted() { mounted() {
@ -81,6 +82,7 @@ export default {
this.dustData_24.forEach(item=>{ this.dustData_24.forEach(item=>{
this.humidityList.push(item.humidity) this.humidityList.push(item.humidity)
this.temperatureList.push(item.temperature) this.temperatureList.push(item.temperature)
this.xData.push(item.receiveTime.split(' ')[1])
}) })
this.createdEchart1(); this.createdEchart1();
this.createdEchart2(); this.createdEchart2();
@ -118,7 +120,7 @@ export default {
}, },
}, },
axisTick: { show: true }, axisTick: { show: true },
data: ["8.00", "10.00", "12.00", "14.00"], data: this.xData,
}, },
], ],
yAxis: [ yAxis: [
@ -215,7 +217,7 @@ export default {
}, },
}, },
axisTick: { show: true }, axisTick: { show: true },
data: ["8.00", "10.00", "12.00", "14.00", ], data: this.xData,
}, },
], ],
yAxis: [ yAxis: [

1
src/views/projectFront/projectSummary/devicePointConfig.vue
View File

@ -522,6 +522,7 @@ export default {
color: #fff; color: #fff;
font-size: 13px; font-size: 13px;
// margin-left: 10px; // margin-left: 10px;
word-break: keep-all;
} }
} }
// .point:hover { // .point:hover {