chenyh
/
xiuos_IoT
forked from floraachy/xiuos_IoT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert change of data/history page

This commit is contained in:
龚祖望 2022-12-12 17:26:46 +08:00
parent c374981579
commit 53c3bd84cc
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xiuosiot-frontend/src/views/data/history/index.vue
View File

@ -990,17 +990,16 @@ export default {
var PM3 = PmArray3[0] var PM3 = PmArray3[0]
var curDate = data[0].dayTime var curDate = data[0].dayTime
var dataToDisplay = new Array() var dataToDisplay = new Array()
const len = parseInt(data.length / 3) for (var i = 0; i < data.length / 3; i++) {
for (var i = 0; i <= len; i++) {
curDate = data[i + 0].dayTime curDate = data[i + 0].dayTime
PM1 = this.getValid(data[i + 0].paramsValue, PmArray1[0], PmArray1[1]) PM1 = this.getValid(data[i + 0].paramsValue, PmArray1[0], PmArray1[1])
PM2 = this.getValid( PM2 = this.getValid(
data[i + len].paramsValue, data[i + data.length / 3].paramsValue,
PmArray2[0], PmArray2[0],
PmArray2[1] PmArray2[1]
) )
PM3 = this.getValid( PM3 = this.getValid(
data[i + len * 2].paramsValue, data[i + (data.length / 3) * 2].paramsValue,
PmArray3[0], PmArray3[0],
PmArray3[1] PmArray3[1]
) )
@ -1096,8 +1095,7 @@ export default {
var Array3 = new Array() var Array3 = new Array()
var curDate = data[0].dayTime var curDate = data[0].dayTime
var dataToDisplay = new Array() var dataToDisplay = new Array()
const len = parseInt(data.length / 3) for (var i = 0; i < data.length / 3; i++) {
for (var i = 0; i <= len; i++) {
if (i % 3 === 0) { if (i % 3 === 0) {
curDate = data[i + 0].dayTime curDate = data[i + 0].dayTime
Mix1 = this.getValid( Mix1 = this.getValid(
@ -1106,12 +1104,12 @@ export default {
MixArray1[1] MixArray1[1]
) )
Mix2 = this.getValid( Mix2 = this.getValid(
data[i + len].paramsValue, data[i + data.length / 3].paramsValue,
MixArray2[0], MixArray2[0],
MixArray2[1] MixArray2[1]
) )
Mix3 = this.getValid( Mix3 = this.getValid(
data[i + len * 2].paramsValue, data[i + (data.length / 3) * 2].paramsValue,
MixArray3[0], MixArray3[0],
MixArray3[1] MixArray3[1]
) )