Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx into mw

src/App.vue

@@ -399,12 +399,12 @@ export default {
 
   &::-webkit-scrollbar-track-piece {
     background-color: rgba(255, 255, 255, 0.05);
-    -webkit-border-radius: 4px;
+    border-radius: 4px;
   }
 
   &::-webkit-scrollbar-thumb {
     background-color: fade(@gray, 75);
-    -webkit-border-radius: 4px;
+    border-radius: 4px;
     outline: none;
     outline-offset: 0px;
     border: none;

src/views/sampleDatabase/powerlineAnalysis/index.vue

@@ -47,20 +47,22 @@ export default {
     };
   },
   created() {
-    // this.$nextTick(() => {
-    //   this.getPHAnalyse();
-    // });
+    this.$nextTick(() => {
+      // this.getPHAnalyse();
+      this.get();
+    });
   },
   methods: {
     get() {
       // this.getPHAnalyse();
-       this.getScatter();
+      this.getScatter();
     },
     //散点数据
     getScatter() {
       let that = this;
       that.API.requestData({
         method: "POST",
+        showLoading: true,
         baseURL: "http://192.168.10.5:9002/",
         subUrl: "scatter/list",
         data: {
@@ -78,15 +80,17 @@ export default {
             ];
             that.scatterData = scatterArr;
             let lineArr = {
-              legends: ["实际", "修正"],
-              data: [[], []],
+              legends: [],
+              data: [[],[]],
             };
+
             res.data.lineactual.forEach((ele) => {
               lineArr.data[0].push(ele[1]);
             });
             res.data.lineoptimal.forEach((ele) => {
               lineArr.data[1].push(ele[1]);
             });
+
             that.lineData = lineArr;
           }
         },
@@ -343,8 +347,8 @@ export default {
             }
           }
         }
-        
-           console.log(selectedItems);
+
+        console.log(selectedItems);
       });
 
       this.resize = function () {

src/views/sampleDatabase/powerlineAnalysis/scatter-line-chart.vue

@@ -559,7 +559,10 @@ export default {
           xTitle: "折线X",
           yTitle: "折线y",
           legends: ["1", "2", "3"],
-          data: [[1, 2, 3, 4]],
+          data: [
+            [1, 2, 3, 4],
+            [5, 6, 7, 8],
+          ],
         };
       },
     },