添加风机控制

src/assets/script/BackgroundData.js

@@ -292,7 +292,7 @@ export default class BackgroundData {
     }
 
     /* 风机控制 */
-    windturbineControl(windturbines) {
+    windturbineControl(windturbines,isLockOrUnlock) {
         var pairs={};
         for (var ind in windturbines) {
             var wb = windturbines[ind];
@@ -308,10 +308,14 @@ export default class BackgroundData {
             };
             pairs[ct.windturbineId]=ct;
         }
-        var heads={
-
-        };
-        console.log(heads);
+        axios.post(`http://127.0.0.1:8099/api/control/send?isLockOrUnlock=${isLockOrUnlock}`,pairs)
+        .then(msg=>{
+            console.log(msg);
+        })
+        .catch(err=>{
+            console.log(err);
+        });
+        console.log(isLockOrUnlock);
     }
 
     /* 标记 */

src/components/TitleBar.vue

@@ -188,7 +188,7 @@
             <br> -->
             <el-button v-if="!isLogin" class="loginoption" @click="userClick">登&emsp;录</el-button>
             <br v-if="!isLogin">
-            <el-button class="loginoption" @click="logout">注&emsp;销</el-button>
+            <el-button v-if="isLogin" class="loginoption" @click="logout">注&emsp;销</el-button>
           </div>
         </el-popover>
 

src/components/area/ControlArea.vue

@@ -7,12 +7,12 @@
     content-style="44"
     @contextmenu="contextmenu"
   >
-    <ControlMatrixCard title="待启动" :datas="ls.start" ref="start"></ControlMatrixCard>
-    <ControlMatrixCard title="待停机" :datas="ls.stop" ref="stop"></ControlMatrixCard>
-    <ControlMatrixCard title="待维护" :datas="ls.maintain" ref="maintain"></ControlMatrixCard>
-    <ControlMatrixCard title="待取消维护" :datas="ls.unmaintain" ref="unmaintain"></ControlMatrixCard>
-    <ControlMatrixCard title="待复位" :datas="ls.reset" ref="reset"></ControlMatrixCard>
-    <el-button style="z-index:2;position:absolute;bottom:10px;right:10px;background: #292929;font-size:15px;width:90px;border:none;color:rgb(220,220,220);" size="small" @click="menuClicked({type:'marking'})">发送</el-button>
+    <ControlMatrixCard title="待启动" :datas="ls.start" :operateStyle="1" ref="start"></ControlMatrixCard>
+    <ControlMatrixCard title="待停机" :datas="ls.stop" :operateStyle="2" ref="stop"></ControlMatrixCard>
+    <ControlMatrixCard title="待维护" :datas="ls.maintain" :operateStyle="6" ref="maintain"></ControlMatrixCard>
+    <ControlMatrixCard title="待取消维护" :datas="ls.unmaintain" :operateStyle="8" ref="unmaintain"></ControlMatrixCard>
+    <ControlMatrixCard title="待复位" :datas="ls.reset" :operateStyle="5" ref="reset"></ControlMatrixCard>
+    <el-button style="z-index:2;position:absolute;bottom:10px;right:10px;background: #292929;font-size:15px;width:90px;border:none;color:rgb(220,220,220);" size="small" @click="menuClicked({type:'lock',value:'CheckLock'})">发送</el-button>
   </gy-card>
   <el-button-group style="z-index:3;position:absolute;top:16px;left:120px;">
       <el-button style="background: black;font-size:14px;width:80px;border:none;color:rgb(220,220,220);" size="mini" round>自动</el-button>
@@ -101,37 +101,37 @@ export default {
             {
               label: "检修",
               click() {
-                that.menuClicked({ type: "lock", value: 8 });
+                that.menuClicked({ type: "lock", value: "CheckLock" });
               },
             },
             {
               label: "故障维修",
               click() {
-                that.menuClicked({ type: "lock", value: 7 });
+                that.menuClicked({ type: "lock", value: "FaultLock" });
               },
             },
             {
               label: "场内受累检修",
               click() {
-                that.menuClicked({ type: "lock", value: 2 });
+                that.menuClicked({ type: "lock", value: "StationCheckLock" });
               },
             },
             {
               label: "场内受累故障",
               click() {
-                that.menuClicked({ type: "lock", value: 3 });
+                that.menuClicked({ type: "lock", value: "StationFaulLock" });
               },
             },
             {
               label: "场外受累电网",
               click() {
-                that.menuClicked({ type: "lock", value: 4 });
+                that.menuClicked({ type: "lock", value: "StationPowerLineLock" });
               },
             },
             {
               label: "场外受累天气",
               click() {
-                that.menuClicked({ type: "lock", value: 5 });
+                that.menuClicked({ type: "lock", value: "StationWeatherLock" });
               },
             },
           ],
@@ -156,12 +156,19 @@ export default {
       }
       if (msg.type == "lock") {
         // 挂牌
+        var los = this.getSelectedItems();
+        for(var id in los){
+          los[id].lockType=msg.value;
+        }
+        bd.windturbineControl(los,true);
       } else if (msg.type == "send") {
         // 发送
+        var vs = this.getSelectedItems(true);
+        bd.windturbineControl(vs,false);
       } else if (msg.type == "marking") {
         // 标注
-        var vs = this.getSelectedItems();
-        bd.marking(vs);
+        var vvs = this.getSelectedItems();
+        bd.marking(vvs);
       }
       this.clearSelected();
     },

src/components/area/ProblemArea.vue

@@ -57,37 +57,37 @@ export default {
             {
               label: "检修",
               click() {
-                that.menuClicked({ type: "lock", value: 8 });
+                that.menuClicked({ type: "lock", value: "CheckLock" });
               },
             },
             {
               label: "故障维修",
               click() {
-                that.menuClicked({ type: "lock", value: 7 });
+                that.menuClicked({ type: "lock", value: "FaultLock" });
               },
             },
             {
               label: "场内受累检修",
               click() {
-                that.menuClicked({ type: "lock", value: 2 });
+                that.menuClicked({ type: "lock", value: "StationCheckLock" });
               },
             },
             {
               label: "场内受累故障",
               click() {
-                that.menuClicked({ type: "lock", value: 3 });
+                that.menuClicked({ type: "lock", value: "StationFaulLock" });
               },
             },
             {
               label: "场外受累电网",
               click() {
-                that.menuClicked({ type: "lock", value: 4 });
+                that.menuClicked({ type: "lock", value: "StationPowerLineLock" });
               },
             },
             {
               label: "场外受累天气",
               click() {
-                that.menuClicked({ type: "lock", value: 5 });
+                that.menuClicked({ type: "lock", value: "StationWeatherLock" });
               },
             },
           ],
@@ -95,7 +95,7 @@ export default {
         {
           label: "取消挂牌",
           click() {
-            that.menuClicked({ type: "unlock" });
+            that.menuClicked({ type: "lock",value:"UnLock" });
           },
         },
       ];
@@ -112,8 +112,11 @@ export default {
       }
       if (msg.type == "lock") {
         // 挂牌
-      } else if (msg.type == "unlock") {
-        // 取消挂牌
+        var los = this.getSelectedItems();
+        for(var id in los){
+          los[id].lockType=msg.value;
+        }
+        bd.windturbineControl(los,true);
       } else if (msg.type == "marking") {
         // 标注
         var vs = this.getSelectedItems();

src/components/area/windturbine/control/ControlMatrixCard.vue

@@ -45,7 +45,7 @@
 <script>
 export default {
   name: "ControlMatrixCard",
-  props: { title: String, datas: Object },
+  props: { title: String, datas: Object,operateStyle:Number },
   data() {
     return {
       values: [],
@@ -104,6 +104,10 @@ export default {
             windSpeed: data.windSpeed,
             rollSpeed: data.rollSpeed,
             windturbineId: item,
+            modelId:data.modelId,
+            projectId:data.projectId,
+            stationId:data.stationId,
+            controlType:this.operateStyle,
           };
           // 替换实时刷新的值
           this.values.splice(i, 1, obj);