Merge remote-tracking branch 'origin/main' into main

package.json

@@ -37,7 +37,7 @@
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-vue": "^8.0.3",
+    "eslint-plugin-vue": "^7.0.0",
     "postcss": "^8.4.49",
     "sass": "^1.32.7",
     "sass-loader": "^12.0.0",

src/components/AmphiPosition/index.vue

@@ -184,12 +184,12 @@ export default {
       zyjhzx({
         nf: this.formData.nf,
       }).then((res) => {
-        let dataX = [];
-        let dataDayX = [];
-        let legendData = [];
-        let seriesData = [{}, {}, {}, {}, {}, {}];
-        let dataY = [];
-        let dateData = [];
+        let dataX = []; // 当月所有日期
+        let dataDayX = []; //x轴
+        let legendData = ["一区", "二区", "三区", "四区", "五区", "六区"]; //设置所有作业区
+        let dataY = []; //所有作业区，设置30日数据起始值0
+        let seriesData = [];
+        let dateData = []; //设置30天--0
         let zyqList = res.data.reduce((prev, current) => {
           const key = current.zyq;
           if (!prev[key]) {
@@ -199,8 +199,7 @@ export default {
           return prev;
         }, {});
 
-        // 获取所有作业区
-        legendData = Object.keys(zyqList);
+        // 获取当月所有日期
         dataX = this.getAllDatesOfCurrentMonth();
 
         dataX.forEach((item, index) => {
@@ -214,126 +213,35 @@ export default {
 
         // 循环数据
         legendData.forEach((item, index) => {
-          if (item == "一区") {
           let Y = JSON.parse(JSON.stringify(dataY));
+          seriesData[index] = [];
           for (let i = 0; i < Y.length; i++) {
             let arry1 = Y[i];
+            if (zyqList[item]) {
               let arry2 = zyqList[item].find((item) => item.day === arry1.day);
               if (arry2) {
                 arry1.data = arry2.sl;
               }
-            }
-            seriesData[0].data = Y;
-          } else if (item == "二区") {
-            let Y = JSON.parse(JSON.stringify(dataY));
-            for (let i = 0; i < Y.length; i++) {
-              let arry1 = Y[i];
-              let arry2 = zyqList[item].find((item) => item.day === arry1.day);
-              if (arry2) {
-                arry1.data = arry2.sl;
-              }
-            }
-            seriesData[1].data = Y;
-          } else if (item == "三区") {
-            let Y = JSON.parse(JSON.stringify(dataY));
-            for (let i = 0; i < Y.length; i++) {
-              let arry1 = Y[i];
-              let arry2 = zyqList[item].find((item) => item.day === arry1.day);
-              if (arry2) {
-                arry1.data = arry2.sl;
-              }
-            }
-            seriesData[2].data = Y;
-          } else if (item == "四区") {
-            let Y = JSON.parse(JSON.stringify(dataY));
-            for (let i = 0; i < Y.length; i++) {
-              let arry1 = Y[i];
-              let arry2 = zyqList[item].find((item) => item.day === arry1.day);
-              if (arry2) {
-                arry1.data = arry2.sl;
-              }
-            }
-            seriesData[3].data = Y;
-          } else if (item == "五区") {
-            let Y = JSON.parse(JSON.stringify(dataY));
-            for (let i = 0; i < Y.length; i++) {
-              let arry1 = Y[i];
-              let arry2 = zyqList[item].find((item) => item.day === arry1.day);
-              if (arry2) {
-                arry1.data = arry2.sl;
-              }
-            }
-            seriesData[4].data = Y;
-          } else if (item == "六区") {
-            let Y = JSON.parse(JSON.stringify(dataY));
-            for (let i = 0; i < Y.length; i++) {
-              let arry1 = Y[i];
-              let arry2 = zyqList[item].find((item) => item.day === arry1.day);
-              if (arry2) {
-                arry1.data = arry2.sl;
-              }
-            }
-            seriesData[5].data = Y;
-          }
-        });
-        var oneArr = [];
-        var twoArr = [];
-        var threeArr = [];
-        var fourArr = [];
-        var fiveArr = [];
-        var sixArr = [];
-        if (seriesData[0] && seriesData[0].data) {
-          seriesData[0].data.forEach((item) => {
-            oneArr.push(item.data);
-          });
+              seriesData[index] = Y;
             } else {
-          oneArr = dateData;
+              seriesData[index] = [];
             }
-        if (seriesData[1] && seriesData[1].data) {
-          seriesData[1].data.forEach((item) => {
-            twoArr.push(item.data);
-          });
-        } else {
-          twoArr = dateData;
-        }
-        if (seriesData[2] && seriesData[2].data) {
-          seriesData[2].data.forEach((item) => {
-            threeArr.push(item.data);
-          });
-        } else {
-          threeArr = dateData;
           }
-        if (seriesData[3] && seriesData[3].data) {
-          seriesData[3].data.forEach((item) => {
-            fourArr.push(item.data);
         });
-        } else {
-          fourArr = dateData;
-        }
-        if (seriesData[4] && seriesData[4].data) {
-          seriesData[4].data.forEach((item) => {
-            fiveArr.push(item.data);
+
+        let Arr = [];
+        seriesData.forEach((item, index) => {
+          Arr[index] = [];
+          if (item && item.length > 0) {
+            item.forEach((em) => {
+              Arr[index].push(em.data ? em.data : 0);
             });
           } else {
-          fiveArr = dateData;
+            Arr[index] = dateData;
           }
-        if (seriesData[5] && seriesData[5].data) {
-          seriesData[5].data.forEach((item) => {
-            sixArr.push(item.data);
         });
-        } else {
-          sixArr = dateData;
-        }
         //   折线图
-        this.TableLine(
-          dataDayX,
-          oneArr,
-          twoArr,
-          threeArr,
-          fourArr,
-          fiveArr,
-          sixArr
-        );
+        this.TableLine(dataDayX, Arr);
       });
     },
     today_zyjhzx() {
@@ -711,7 +619,7 @@ export default {
         myChart.resize();
       });
     },
-    TableLine(dataX, oneArr, twoArr, threeArr, fourArr, fiveArr, sixArr) {
+    TableLine(dataX, Arr) {
       var myChart = this.$echarts.init(document.getElementById("TableLine"));
 
       var option = {
@@ -774,32 +682,32 @@ export default {
           {
             name: "一区",
             type: "line",
-            data: oneArr,
+            data: Arr[0],
           },
           {
             name: "二区",
             type: "line",
-            data: twoArr,
+            data: Arr[1],
           },
           {
             name: "三区",
             type: "line",
-            data: threeArr,
+            data: Arr[2],
           },
           {
             name: "四区",
             type: "line",
-            data: fourArr,
+            data: Arr[3],
           },
           {
             name: "五区",
             type: "line",
-            data: fiveArr,
+            data: Arr[4],
           },
           {
             name: "六区",
             type: "line",
-            data: sixArr,
+            data: Arr[5],
           },
         ],
       };

src/components/LineTableAnalysis/index.vue

@@ -134,47 +134,47 @@ export default {
           });
 
           xbStartData.push(
-            new Date(
+            xbListCopy[item] && xbListCopy[item][0].yf
+              ? new Date(
                   this.$moment().format("yyyy") +
                     "/" +
-                (xbListCopy[item] && xbListCopy[item][0].yf
-                  ? xbListCopy[item][0].yf
-                  : "") +
+                    xbListCopy[item][0].yf +
                     "/01"
                 )
+              : ""
           );
           xbEndData.push(
-            new Date(
+            xbListCopy[item] && xbListCopy[item].length > 0
+              ? new Date(
                   this.$moment().format("yyyy") +
                     "/" +
-                (xbListCopy[item] && xbListCopy[item].length > 0
-                  ? xbListCopy[item][xbListCopy[item].length - 1].yf
-                  : "") +
+                    xbListCopy[item][xbListCopy[item].length - 1].yf +
                     "/01"
                 )
+              : ""
           );
 
           // =====
           ydStartData.push(
-            new Date(
+            ydListCopy[item] && ydListCopy[item].length > 0
+              ? new Date(
                   this.$moment().format("yyyy") +
                     "/" +
-                (ydListCopy[item] && ydListCopy[item].length > 0
-                  ? ydListCopy[item][0].yf
-                  : "") +
+                    ydListCopy[item][0].yf +
                     "/01"
                 )
+              : ""
           );
 
           ydEndData.push(
-            new Date(
+            ydListCopy[item] && ydListCopy[item].length > 0
+              ? new Date(
                   this.$moment().format("yyyy") +
                     "/" +
-                (ydListCopy[item] && ydListCopy[item].length > 0
-                  ? ydListCopy[item][ydListCopy[item].length - 1].yf
-                  : "") +
+                    ydListCopy[item][ydListCopy[item].length - 1].yf +
                     "/01"
                 )
+              : ""
           );
         });
         // 船只分析甘特图
@@ -400,41 +400,49 @@ export default {
           },
           formatter: (params) => {
             if (params && params.length) {
-              var res = "";
+              var xbRes = "";
+              var ydRes = "";
               var date0 = this.$moment(params[0].data).format("yyyy-MM");
               var date1 =
-                params.length > 1
+                params.length > 1 && params[1].data
                   ? this.$moment(params[1].data).format("yyyy-MM")
                   : "";
               var date2 =
-                params.length > 2
+                params.length > 2 && params[2].data
                   ? this.$moment(params[2].data).format("yyyy-MM")
                   : "";
               var date3 =
-                params.length > 3
+                params.length > 3 && params[3].data
                   ? this.$moment(params[3].data).format("yyyy-MM")
                   : "";
-              res =
+
+              if (date0 || date1) {
+                xbRes =
                   params[0].name +
                   "</br>" +
-                (params.length > 1
-                  ? params[1].marker + params[1].seriesName
-                  : "") +
+                  params[1].marker +
+                  params[1].seriesName +
                   ":</br>" +
                   date0 +
                   "~" +
                   date1 +
-                "</br>" +
-                (params.length > 3
-                  ? params[3].marker + params[3].seriesName
-                  : "") +
+                  "</br>";
+              } else {
+                xbRes = "";
+              }
+              if (date2 || date3) {
+                ydRes =
+                  params[3].marker +
+                  params[3].seriesName +
                   ":</br>" +
                   date2 +
                   "~" +
                   date3 +
                   "</br>";
-
-              return res;
+              } else {
+                ydRes = "";
+              }
+              return xbRes + ydRes;
             }
           },
         },

src/components/RealTimeMonitor/index.vue

@@ -560,13 +560,13 @@ export default {
     // 8.作业区未完成与完成量对比饼图
     zxqwcqk() {
       zxqwcqk().then((res) => {
-        res.data.forEach((item) => {
         let oneValue = [0, 0];
         let secondValue = [0, 0];
         let threeValue = [0, 0];
         let fourValue = [0, 0];
         let fiveValue = [0, 0];
         let sixValue = [0, 0];
+        res.data.forEach((item) => {
           if (item.zyq == "一区") {
           } else if (item.zyq == "二区") {
             oneValue = [item.wcl, item.wc];
@@ -579,6 +579,7 @@ export default {
           } else if (item.zyq == "六区") {
             sixValue = [item.wcl, item.wc];
           }
+        });
         this.FinishOnePie(oneValue[0], oneValue[1]);
         this.FinishSecondPie(secondValue[0], secondValue[1]);
         this.FinishThreePie(threeValue[0], threeValue[1]);
@@ -586,7 +587,6 @@ export default {
         this.FinishFivePie(fiveValue[0], fiveValue[1]);
         this.FinishSixPie(sixValue[0], sixValue[1]);
       });
-      });
     },
     AttendancePieChart() {
       var myChart = this.$echarts.init(