同步

src/assets/script/MessageBridge.js

@@ -38,7 +38,7 @@ export default class MessageBridge {
     var os = this.getActions(msg.headers.destination);
     for (var id in os) {
       try{
-        os[id].action(msg.body);
+        os[id].action(msg.body,msg.headers);
       }catch(e){console.log(e);}
     }
   }

src/components/area/ControlArea.vue

@@ -106,10 +106,9 @@ export default {
       var vs = [{ key: "/topic/suggestion", action: this.suggestion }];
       mb.register(vs);
     },
-    suggestion(msg) {
+    suggestion(msg,headers) {
       var val = JSON.parse(msg);
-      var tp = this.getSuggestionType(val);
-      if (tp == null) return;
+      var tp = headers["operate-type"];
       if (tp == "UnMaintain") {
         this.updateSuggestion(this.ls.unmaintain.value, val);
       } else if (tp == "Start") {
@@ -125,36 +124,6 @@ export default {
         // 推荐维护
         this.updateSuggestion(this.ls.maintain.value, val);
       }
-
-      /* for (var vv in val) {
-        var v = val[vv];
-        var windturbineId = v.windturbineId;
-        if (v.adviceOperateStyle == "UnMaintain") {
-          if (!this.ls.unmaintain.value.includes(windturbineId)) {
-            this.ls.unmaintain.value.push(windturbineId);
-          }
-        } else if (v.adviceOperateStyle == "Start") {
-          //推荐启动
-          if (!this.ls.start.value.includes(windturbineId)) {
-            this.ls.start.value.push(windturbineId);
-          }
-        } else if (v.adviceOperateStyle == "Stop") {
-          // 推荐停机
-          if (!this.ls.stop.value.includes(windturbineId)) {
-            this.ls.stop.value.push(windturbineId);
-          }
-        } else if (v.adviceOperateStyle == "Reset") {
-          // 推荐复位
-          if (!this.ls.reset.value.includes(windturbineId)) {
-            this.ls.reset.value.push(windturbineId);
-          }
-        } else if (v.adviceOperateStyle == "Maintain") {
-          // 推荐维护
-          if (!this.ls.maintain.value.includes(windturbineId)) {
-            this.ls.maintain.value.push(windturbineId);
-          }
-        }
-      } */
     },
 
     /* 获取推荐类型 */

src/components/area/windturbine/problem/ProblemMatrixCard.vue

@@ -131,8 +131,6 @@ export default {
         }
       } */
       for(var v1 in ll){
-        // todo 这里有问题
-        //this.values.splice(v1-1,1);
         var ind = this.values.indexOf(ll[v1]);
         if(ind<0)continue;
         this.values.splice(ind,1);