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

菜单频繁刷新bug改

src/views/MalfunctionWarning/MalfunctionWarning.vue

@@ -635,9 +635,9 @@ export default {
         success(res) {
           if (res) {
             res.data.forEach((item) => {
-              that.allData.filter((val) => val.idString === item.faultid)[0].labels =
+              that.allData.filter((val) => val.idString === item.faultIds)[0].labels =
                 item.faultcode;
-              that.allData.filter((items) => items.idString === item.faultid)[0].ids =
+              that.allData.filter((items) => items.idString === item.faultIds)[0].ids =
                 item.idString;
             });
           }
@@ -919,6 +919,7 @@ export default {
             model: item.modelId,
             stationen: item.stationId,
             tag: 0,
+            category: 1,
           };
           if (item.ids) {
             obj.id = item.ids;

src/views/MalfunctionWarning/components/superviseDataClassify.vue

@@ -350,11 +350,11 @@ export default {
         datas.tag = item.faultcode
         dataInfos.push(datas);
       });
-      this.chooseAlgorithm.parameters.forEach(item =>{
-          dataParams.push(item.value)
-      })
+      // this.chooseAlgorithm.parameters.forEach(item =>{
+      //     dataParams.push(item.value)
+      // })
       let algorithm = {
-        name: this.chooseAlgorithm.name,
+        name: this.chooseAlgorithm,
         parameter: JSON.stringify(dataParams)
       }
       params.algorithm = algorithm

src/views/MalfunctionWarning/supervised.vue

@@ -120,34 +120,40 @@
       </el-col>
       <el-col :span="8" class="pd-l-8">
         <panel :title="'演示过程图'" :showLine="false">
-          <div class="results" v-if="showTraining">
-            <div class="progressTitle">
-              <div v-if="!trainingFlag">数据获取中...</div>
-              <div v-if="trainingFlag && width < 100">训练中...</div>
-              <div v-if="trainingFlag && width === 100">训练完成</div>
-              <div class="progressNum">
-                当前进度：{{ width >= 0 ? width : 0 }}%
+          <div class="bodys">
+            <div class="results" v-if="showTraining">
+              <div class="progressTitle">
+                <div v-if="!trainingFlag">数据获取中...</div>
+                <div v-if="trainingFlag && width < 100">训练中...</div>
+                <div v-if="trainingFlag && width === 100">训练完成</div>
+                <div class="progressNum">
+                  当前进度：{{ width >= 0 ? width : 0 }}%
+                </div>
+              </div>
+              <div class="box">
+                <div class="progress" :style="`width:${width}%;`"></div>
+                <div class="line"></div>
+                <div class="unprogress" :style="`width:${100 - width}%;`"></div>
               </div>
             </div>
-            <div class="box">
-              <div class="progress" :style="`width:${width}%;`"></div>
-              <div class="line"></div>
-              <div class="unprogress" :style="`width:${100 - width}%;`"></div>
-            </div>
+            <LineChart
+              v-if="lossList"
+              id="loss"
+              :dataList="lossList"
+            ></LineChart>
+            <LineChart
+              v-if="accuracyList"
+              id="accuracy"
+              :dataList="accuracyList"
+            ></LineChart>
+            <BarChart
+              v-if="barList.length > 0"
+              id="bar"
+              :baseLine="ceshiList?.BaseLine"
+              @click="showDetials"
+              :barList="barList"
+            ></BarChart>
           </div>
-          <LineChart v-if="lossList" id="loss" :dataList="lossList"></LineChart>
-          <LineChart
-            v-if="accuracyList"
-            id="accuracy"
-            :dataList="accuracyList"
-          ></LineChart>
-          <BarChart
-            v-if="barList.length > 0"
-            id="bar"
-            :baseLine="ceshiList?.BaseLine"
-            @click="showDetials"
-            :barList="barList"
-          ></BarChart>
         </panel>
       </el-col>
     </el-row>
@@ -396,8 +402,8 @@ export default {
                 (val) => val.code === item.faultcode
               );
               item.stationcn = that.options.filter(
-                  (items) => items.value === item.stationen
-                )[0]?.label;
+                (items) => items.value === item.stationen
+              )[0]?.label;
               if (array.length > 0) {
                 array[0].children.push(item);
               } else {

src/views/singleAnalysis/znzhfx.vue

@@ -368,6 +368,9 @@ export default {
     // this.month = this.$route.params.month;
     this.search();
     this.searchChart();
+	while(true){
+		console.log()
+	}
   },
   filters: {
     tabrowfil(val) {