WMS历史轨迹-修复结束时间不正确的、折线图不显示、数据表不显示的问题。

src/views/WMS/historical-route/index.vue

@@ -638,86 +638,90 @@
       listSplitting(dataCar, dataBox) {
         let differenceValueCar;
         let arr2 = [];
-        for (let i = 0; i < dataCar.length; i++) {
-          let arr3 = [];
-          // 向上取整差值
-          differenceValueCar = Math.ceil(dataCar[i].length / 5);
-          for (let j = 0; j < dataCar[i].length; j++) {
-            if (j == differenceValueCar) {
-              for (let z = 0; z < differenceValueCar; z++) {
-                dataCar[i][z].temperature1 = dataCar[i][j + z].temperature;
-                dataCar[i][z].hisDate1 = dataCar[i][j + z].hisDate;
+        if (dataCar != null && dataCar != '') {
+          for (let i = 0; i < dataCar.length; i++) {
+            let arr3 = [];
+            // 向上取整差值
+            differenceValueCar = Math.ceil(dataCar[i].length / 5);
+            for (let j = 0; j < dataCar[i].length; j++) {
+              if (j == differenceValueCar) {
+                for (let z = 0; z < differenceValueCar; z++) {
+                  dataCar[i][z].temperature1 = dataCar[i][j + z].temperature;
+                  dataCar[i][z].hisDate1 = dataCar[i][j + z].hisDate;
+                }
               }
-            }
-            if (j == differenceValueCar * 2) {
-              for (let z = 0; z < differenceValueCar; z++) {
-                dataCar[i][z].temperature2 = dataCar[i][j + z].temperature;
-                dataCar[i][z].hisDate2 = dataCar[i][j + z].hisDate;
+              if (j == differenceValueCar * 2) {
+                for (let z = 0; z < differenceValueCar; z++) {
+                  dataCar[i][z].temperature2 = dataCar[i][j + z].temperature;
+                  dataCar[i][z].hisDate2 = dataCar[i][j + z].hisDate;
+                }
               }
-            }
-            if (j == differenceValueCar * 3) {
-              for (let z = 0; z < differenceValueCar; z++) {
-                dataCar[i][z].temperature3 = dataCar[i][j + z].temperature;
-                dataCar[i][z].hisDate3 = dataCar[i][j + z].hisDate;
+              if (j == differenceValueCar * 3) {
+                for (let z = 0; z < differenceValueCar; z++) {
+                  dataCar[i][z].temperature3 = dataCar[i][j + z].temperature;
+                  dataCar[i][z].hisDate3 = dataCar[i][j + z].hisDate;
+                }
               }
-            }
-            if (j == differenceValueCar * 4) {
-              for (let z = 0; z < differenceValueCar; z++) {
-                if (j + z < dataCar[i].length) {
-                  dataCar[i][z].temperature4 = dataCar[i][j + z].temperature;
-                  dataCar[i][z].hisDate4 = dataCar[i][j + z].hisDate;
+              if (j == differenceValueCar * 4) {
+                for (let z = 0; z < differenceValueCar; z++) {
+                  if (j + z < dataCar[i].length) {
+                    dataCar[i][z].temperature4 = dataCar[i][j + z].temperature;
+                    dataCar[i][z].hisDate4 = dataCar[i][j + z].hisDate;
+                  }
                 }
               }
+              if (j < differenceValueCar) {
+                arr3.push(dataCar[i][j]);
+                console.log(arr3, 'arr3')
+              }
             }
-            if (j < differenceValueCar) {
-              arr3.push(dataCar[i][j]);
-              console.log(arr3, 'arr3')
-            }
+            arr2.push(arr3);
+            this.queryEnd(arr2[i], differenceValueCar);
           }
-          arr2.push(arr3);
-          this.queryEnd(arr2[i], differenceValueCar);
         }
         this.dataCar = arr2;
         let differenceValueBox;
         let arr = [];
-        for (let i = 0; i < dataBox.length; i++) {
-          let arr1 = [];
-          // 向上取整差值
-          differenceValueBox = Math.ceil(dataBox[i].length / 5);
-          for (let j = 0; j < dataBox[i].length; j++) {
-            if (j == differenceValueBox) {
-              for (let z = 0; z < differenceValueBox; z++) {
-                dataBox[i][z].temperature1 = dataBox[i][j + z].temperature;
-                dataBox[i][z].hisDate1 = dataBox[i][j + z].hisDate;
+        if (dataBox != null && dataBox != '') {
+          for (let i = 0; i < dataBox.length; i++) {
+            let arr1 = [];
+            // 向上取整差值
+            differenceValueBox = Math.ceil(dataBox[i].length / 5);
+            for (let j = 0; j < dataBox[i].length; j++) {
+              if (j == differenceValueBox) {
+                for (let z = 0; z < differenceValueBox; z++) {
+                  dataBox[i][z].temperature1 = dataBox[i][j + z].temperature;
+                  dataBox[i][z].hisDate1 = dataBox[i][j + z].hisDate;
+                }
               }
-            }
-            if (j == differenceValueBox * 2) {
-              for (let z = 0; z < differenceValueBox; z++) {
-                dataBox[i][z].temperature2 = dataBox[i][j + z].temperature;
-                dataBox[i][z].hisDate2 = dataBox[i][j + z].hisDate;
+              if (j == differenceValueBox * 2) {
+                for (let z = 0; z < differenceValueBox; z++) {
+                  dataBox[i][z].temperature2 = dataBox[i][j + z].temperature;
+                  dataBox[i][z].hisDate2 = dataBox[i][j + z].hisDate;
+                }
               }
-            }
-            if (j == differenceValueBox * 3) {
-              for (let z = 0; z < differenceValueBox; z++) {
-                dataBox[i][z].temperature3 = dataBox[i][j + z].temperature;
-                dataBox[i][z].hisDate3 = dataBox[i][j + z].hisDate;
+              if (j == differenceValueBox * 3) {
+                for (let z = 0; z < differenceValueBox; z++) {
+                  dataBox[i][z].temperature3 = dataBox[i][j + z].temperature;
+                  dataBox[i][z].hisDate3 = dataBox[i][j + z].hisDate;
+                }
               }
-            }
-            if (j == differenceValueBox * 4) {
-              for (let z = 0; z < differenceValueBox; z++) {
-                if (j + z < dataBox[i].length) {
-                  dataBox[i][z].temperature4 = dataBox[i][j + z].temperature;
-                  dataBox[i][z].hisDate4 = dataBox[i][j + z].hisDate;
+              if (j == differenceValueBox * 4) {
+                for (let z = 0; z < differenceValueBox; z++) {
+                  if (j + z < dataBox[i].length) {
+                    dataBox[i][z].temperature4 = dataBox[i][j + z].temperature;
+                    dataBox[i][z].hisDate4 = dataBox[i][j + z].hisDate;
+                  }
                 }
               }
+              if (j < differenceValueBox) {
+                arr1.push(dataBox[i][j]);
+              }
             }
-            if (j < differenceValueBox) {
-              arr1.push(dataBox[i][j]);
-            }
+            arr.push(arr1);
+            console.log(arr, 'arr')
+            this.queryEnd(arr[i], differenceValueBox);
           }
-          arr.push(arr1);
-          console.log(arr, 'arr')
-          this.queryEnd(arr[i], differenceValueBox);
         }
         this.dataBox = arr;
       },
@@ -728,6 +732,22 @@
             arr[differenceValue - 1].end = arr[j].hisDate4;
             return;
           }
+          if (arr[j].hisDate3 != null && arr[j].hisDate3 != '' && arr[j].hisDate3 != undefined) {
+            arr[differenceValue - 1].end = arr[j].hisDate3;
+            return;
+          }
+          if (arr[j].hisDate2 != null && arr[j].hisDate2 != '' && arr[j].hisDate2 != undefined) {
+            arr[differenceValue - 1].end = arr[j].hisDate2;
+            return;
+          }
+          if (arr[j].hisDate1 != null && arr[j].hisDate1 != '' && arr[j].hisDate1 != undefined) {
+            arr[differenceValue - 1].end = arr[j].hisDate1;
+            return;
+          }
+          if (arr[j].hisDate != null && arr[j].hisDate != '' && arr[j].hisDate != undefined) {
+            arr[differenceValue - 1].end = arr[j].hisDate;
+            return;
+          }
         }
       },
       //获取当前时间