学校-设备管理-解除绑定

src/utils/ControlWSMsg.js

@@ -53,6 +53,10 @@ class ControlWSMsg {
   removeControl() {
     this.code = 2007;
   }
+  // 解除绑定
+  removeBind() {
+    this.code = 2008;
+  }
   toJSONString() {
     let tempObj = {};
     for (let key in this) {

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -707,7 +707,7 @@ export default {
       });
       this.$refs.deviceTable.selectAll(false);
       let form = {
-        pushType: 4,
+        pushType: 5,
         pushObj: 1
       };
       form.userids = useridList;
@@ -730,7 +730,7 @@ export default {
       });
       this.$refs.deviceTable.selectAll(false);
       let form = {
-        pushType: 4,
+        pushType: 7,
         pushObj: 1
       };
       form.userids = useridList;

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -73,6 +73,7 @@
               <DropdownItem name="6">更新策略</DropdownItem>
               <DropdownItem name="7">重启设备</DropdownItem>
               <DropdownItem name="9">解除管控</DropdownItem>
+              <DropdownItem name="10">解除绑定</DropdownItem>
             </DropdownMenu>
           </Dropdown>
         </div>
@@ -96,6 +97,7 @@
               <div v-if="row.sn" @click="toView(row)">查看</div>
               <div @click="toStrategy(row)">策略</div>
               <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
+              <div v-if="row.sn" @click="toUnbind(row)">解除绑定</div>
             </div>
           </template>
         </Table>
@@ -670,7 +672,7 @@ export default {
         {
           title: "状态",
           slot: "onlineSlot",
-          width: 70,
+          width: 90,
           align: "center"
         },
         {
@@ -697,7 +699,7 @@ export default {
         {
           title: "操作",
           slot: "actionSlot",
-          width: 200,
+          width: 275,
           align: "center"
         }
       ],
@@ -1257,6 +1259,17 @@ export default {
         }
       });
     },
+    // 解除绑定
+    toUnbind(row) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "确定对所选设备进行解除绑定操作吗？",
+        onOk: () => {
+          this.controlRemoveBind([row.sn], [row.userid]);
+        },
+        onCancel: () => {}
+      });
+    },
     selectionChange(selection) {
       this.tableSelection = selection;
     },
@@ -1391,7 +1404,21 @@ export default {
           title: "提示",
           content: "确定对所选设备进行解除管控操作吗？",
           onOk: () => {
-            this.controlRemovetDevice(snList, useridList);
+            this.controlRemoveDevice(snList, useridList);
+          },
+          onCancel: () => {}
+        });
+      } else if (name === "10") {
+        // 解除绑定
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除绑定操作吗？",
+          onOk: () => {
+            this.controlRemoveBind(snList, useridList);
           },
           onCancel: () => {}
         });
@@ -1547,14 +1574,14 @@ export default {
       });
       this.$refs.deviceTable.selectAll(false);
       let form = {
-        pushType: 4,
+        pushType: 5,
         pushObj: 1
       };
       form.userids = useridList;
       this.addPushLog(form);
     },
     // 解除管控
-    controlRemovetDevice(snList, useridList) {
+    controlRemoveDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1570,7 +1597,30 @@ export default {
       });
       this.$refs.deviceTable.selectAll(false);
       let form = {
-        pushType: 4,
+        pushType: 7,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
+    },
+    // 解除绑定
+    controlRemoveBind(snList, useridList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeBind();
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      let form = {
+        pushType: 8,
         pushObj: 1
       };
       form.userids = useridList;