socket解除管控

src/utils/ControlWSMsg.js

@@ -49,6 +49,10 @@ class ControlWSMsg {
   restoreFactory() {
     this.code = 2006;
   }
+  // 解除管控
+  removeControl() {
+    this.code = 2007;
+  }
   toJSONString() {
     let tempObj = {};
     for (let key in this) {

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -32,6 +32,7 @@
             <DropdownItem name="5">限制使用</DropdownItem>
             <DropdownItem name="6">更新策略</DropdownItem>
             <DropdownItem name="7">重启设备</DropdownItem>
+            <DropdownItem name="9">解除管控</DropdownItem>
             <DropdownItem name="8">合规处理</DropdownItem>
           </DropdownMenu>
         </Dropdown>
@@ -39,6 +40,7 @@
     </div>
     <div class="table_wrap">
       <Table
+        ref="deviceTable"
         :columns="columns"
         :data="searchForm.list"
         @on-selection-change="selectionChange"
@@ -527,23 +529,44 @@ export default {
           return;
         }
         this.toLogHandle(snList);
+      } else if (name === "9") {
+        // 解除管控
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除管控操作吗？",
+          onOk: () => {
+            this.controlRemovetDevice(snList, useridList);
+          },
+          onCancel: () => {}
+        });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList, useridList) {
+    controlRestoreFactory(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.restoreFactory();
-      controlWSMsg.send();
-      let form = {
-        pushType: 6,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 6,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 发送消息
     controlSendMessage() {
@@ -563,7 +586,13 @@ export default {
               content: this.controlMessageInfo.content
             })
           );
-          controlWSMsg.send();
+          controlWSMsg.send((isSend) => {
+            if (isSend) {
+              this.$Message.success("推送成功");
+            } else {
+              this.$Message.error("推送失败");
+            }
+          });
           let form = {
             pushType: 1,
             pushObj: 1,
@@ -571,79 +600,130 @@ export default {
             content: this.controlMessageInfo.content
           };
           form.userids = useridList;
+          this.$refs.deviceTable.selectAll(false);
           this.addPushLog(form);
         }
       });
     },
     // 解除限制
-    controlRemoveLimit(snList, useridList) {
+    controlRemoveLimit(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.removeLimit();
-      controlWSMsg.send();
-      let form = {
-        pushType: 2,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 2,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 限制使用
-    controlLimitedUse(snList, useridList) {
+    controlLimitedUse(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.limitedUse();
-      controlWSMsg.send();
-      let form = {
-        pushType: 3,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 3,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList, useridList) {
+    controlUpdateStrategy(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.updateStrategy();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList, useridList) {
+    controlRebootDevice(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.rebootDevice();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
+    },
+    // 解除管控
+    controlRemovetDevice(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeControl();
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 添加推送日志
     addPushLog(form) {
       logPush_add(form).then((data) => {
         if (data.code === 0) {
-          this.$refs.deviceTable.selectAll(false);
           this.$Message.success(data.msg);
         } else {
           this.$Message.error(data.msg);

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -72,6 +72,7 @@
               <DropdownItem name="5">限制使用</DropdownItem>
               <DropdownItem name="6">更新策略</DropdownItem>
               <DropdownItem name="7">重启设备</DropdownItem>
+              <DropdownItem name="9">解除管控</DropdownItem>
             </DropdownMenu>
           </Dropdown>
         </div>
@@ -1361,23 +1362,44 @@ export default {
           },
           onCancel: () => {}
         });
+      } else if (name === "9") {
+        // 解除管控
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除管控操作吗？",
+          onOk: () => {
+            this.controlRemovetDevice(snList, useridList);
+          },
+          onCancel: () => {}
+        });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList, useridList) {
+    controlRestoreFactory(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.restoreFactory();
-      controlWSMsg.send();
-      let form = {
-        pushType: 6,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 6,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 发送消息
     controlSendMessage() {
@@ -1397,7 +1419,13 @@ export default {
               content: this.controlMessageInfo.content
             })
           );
-          controlWSMsg.send();
+          controlWSMsg.send((isSend) => {
+            if (isSend) {
+              this.$Message.success("推送成功");
+            } else {
+              this.$Message.error("推送失败");
+            }
+          });
           let form = {
             pushType: 1,
             pushObj: this.controlMessageInfo.classid ? 2 : 1,
@@ -1409,81 +1437,130 @@ export default {
           } else {
             form.userids = useridList;
           }
+          this.$refs.deviceTable.selectAll(false);
           this.addPushLog(form);
         }
       });
     },
     // 解除限制
-    controlRemoveLimit(snList, useridList) {
+    controlRemoveLimit(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.removeLimit();
-      controlWSMsg.send();
-      let form = {
-        pushType: 2,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 2,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 限制使用
-    controlLimitedUse(snList, useridList) {
+    controlLimitedUse(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.limitedUse();
-      controlWSMsg.send();
-      let form = {
-        pushType: 3,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 3,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList, useridList) {
+    controlUpdateStrategy(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.updateStrategy();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList, useridList) {
+    controlRebootDevice(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.rebootDevice();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
+    },
+    // 解除管控
+    controlRemovetDevice(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeControl();
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 添加推送日志
     addPushLog(form) {
       logPush_add(form).then((data) => {
-        if (data.code === 0) {
-          this.$refs.deviceTable.selectAll(false);
-          this.$Message.success(data.msg);
-        } else {
+        if (data.code !== 0) {
           this.$Message.error(data.msg);
         }
       });