|
@@ -566,27 +566,27 @@
|
|
}
|
|
}
|
|
console.log(table, 'table');
|
|
console.log(table, 'table');
|
|
if (array.length % 2 == 0) {
|
|
if (array.length % 2 == 0) {
|
|
- for (let i = 0, j = median; i < median; i++, j++) {
|
|
|
|
- table[i].measuringPointName = array[i].measuringPointName;
|
|
|
|
- table[i].measuringPointAddr = array[i].measuringPointAddr;
|
|
|
|
- table[i].temperature = array[i].temperature;
|
|
|
|
- table[i].hisDate = array[i].hisDate;
|
|
|
|
- table[i].measuringPointName1 = array[j].measuringPointName;
|
|
|
|
- table[i].measuringPointAddr1 = array[j].measuringPointAddr;
|
|
|
|
- table[i].temperature1 = array[j].temperature;
|
|
|
|
- table[i].hisDate1 = array[j].hisDate;
|
|
|
|
|
|
+ for (let i = 0, j = 0, z = 1; i < median; i++, j = j + 2, z = z + 2) {
|
|
|
|
+ table[i].measuringPointName = array[j].measuringPointName;
|
|
|
|
+ table[i].measuringPointAddr = array[j].measuringPointAddr;
|
|
|
|
+ table[i].temperature = array[j].temperature;
|
|
|
|
+ table[i].hisDate = array[j].hisDate;
|
|
|
|
+ table[i].measuringPointName1 = array[z].measuringPointName;
|
|
|
|
+ table[i].measuringPointAddr1 = array[z].measuringPointAddr;
|
|
|
|
+ table[i].temperature1 = array[z].temperature;
|
|
|
|
+ table[i].hisDate1 = array[z].hisDate;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- for (let i = 0, j = median; i < median; i++, j++) {
|
|
|
|
- table[i].measuringPointName = array[i].measuringPointName;
|
|
|
|
- table[i].measuringPointAddr = array[i].measuringPointAddr;
|
|
|
|
- table[i].temperature = array[i].temperature;
|
|
|
|
- table[i].hisDate = array[i].hisDate;
|
|
|
|
|
|
+ for (let i = 0, j = 0, z = 1; i < median; i++, j = j + 2, z = z + 2) {
|
|
|
|
+ table[i].measuringPointName = array[j].measuringPointName;
|
|
|
|
+ table[i].measuringPointAddr = array[j].measuringPointAddr;
|
|
|
|
+ table[i].temperature = array[j].temperature;
|
|
|
|
+ table[i].hisDate = array[j].hisDate;
|
|
if (i != median - 1) {
|
|
if (i != median - 1) {
|
|
- table[i].measuringPointName1 = array[j].measuringPointName;
|
|
|
|
- table[i].measuringPointAddr1 = array[j].measuringPointAddr;
|
|
|
|
- table[i].temperature1 = array[j].temperature;
|
|
|
|
- table[i].hisDate1 = array[j].hisDate;
|
|
|
|
|
|
+ table[i].measuringPointName1 = array[z].measuringPointName;
|
|
|
|
+ table[i].measuringPointAddr1 = array[z].measuringPointAddr;
|
|
|
|
+ table[i].temperature1 = array[z].temperature;
|
|
|
|
+ table[i].hisDate1 = array[z].hisDate;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|