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

# Conflicts:
#	src/views/MalfunctionWarning/components/superviseDataClassify.vue

src/views/MalfunctionWarning/components/superviseDataClassify.vue

@@ -182,8 +182,7 @@
 import axios from "axios";
 import BASE from "@tools/basicTool.js";
 export default {
-  components: {
+  components: {},
-  },
   data() {
     return {
       trainingList: [],
@@ -337,25 +336,26 @@ export default {
     },
     startTraining() {
       let params = {};
-      let dataInfos = []
+      let dataInfos = [];
-      let dataParams = []
+      let dataParams = [];
       this.trainingList.forEach((item) => {
-		  let model = '';
+        let model = "";
-		  if(item.model === 'UP82' && item.stationen === "SBQ_FDC"){
+        if (item.model === "UP82" && item.stationen === "SBQ_FDC") {
-			  model = 'UP82_2'
+          model = "UP82_2";
-		  }else{
+        } else {
-			  model = item.model;
+          model = item.model;
-		  }
+        }
         let datas = {};
         datas.startTs =
-          new Date(item.starttime).getTime() - this.intervalValue * 3600000;
+          new Date(item.starttime).getTime() -
+          (this.intervalValue * 3600000) / 6;
         datas.endTs = new Date(item.starttime).getTime();
         datas.thingId = item.windturbineid;
         datas.modelId = model;
         datas.stationId = item.stationen;
         datas.id = item.faultid;
         datas.faultTime = new Date(item.starttime).getTime();
-        datas.tag = item.faultcode
+        datas.tag = item.faultcode;
         dataInfos.push(datas);
       });
       // this.chooseAlgorithm.parameters.forEach(item =>{
@@ -363,11 +363,11 @@ export default {
       // })
       let algorithm = {
         name: this.chooseAlgorithm,
-        parameter: JSON.stringify(dataParams)
+        parameter: JSON.stringify(dataParams),
-      }
+      };
-      params.algorithm = algorithm
+      params.algorithm = algorithm;
-      params.dataInfos = dataInfos
+      params.dataInfos = dataInfos;
-	  
+
       axios({
         method: "post",
         url: "http://10.155.32.14:9002/api/supervised/execute",
@@ -383,7 +383,7 @@ export default {
           });
           // this.trainingFlag = true;
           this.$emit("click-training");
-        }else{
+        } else {
           this.BASE.showMsg({
             type: "warning",
             msg: res.data,