违规设备、设备管理其他操作推送日志

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -241,7 +241,7 @@ export default {
           align: "center"
         },
         {
-          title: "违规详情",
+          title: "违规数量",
           key: "num",
           align: "center"
         },
@@ -539,14 +539,14 @@ export default {
           title: "提示",
           content: "确定对所选设备进行解除管控操作吗？",
           onOk: () => {
-            this.controlRemovetDevice(snList, useridList);
+            this.controlRemoveDevice(snList, useridList);
           },
           onCancel: () => {}
         });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList) {
+    controlRestoreFactory(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -561,12 +561,12 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 6,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 6,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 发送消息
     controlSendMessage() {
@@ -606,7 +606,7 @@ export default {
       });
     },
     // 解除锁定
-    controlRemoveLimit(snList) {
+    controlRemoveLimit(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -621,15 +621,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 2,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 2,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 锁定
-    controlLimitedUse(snList) {
+    controlLimitedUse(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -644,15 +644,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 3,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 3,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList) {
+    controlUpdateStrategy(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -667,15 +667,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 4,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList) {
+    controlRebootDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -690,15 +690,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 4,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 解除管控
-    controlRemovetDevice(snList) {
+    controlRemoveDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -713,12 +713,12 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 4,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 添加推送日志
     addPushLog(form) {

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -1379,7 +1379,7 @@ export default {
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList) {
+    controlRestoreFactory(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1394,12 +1394,12 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 6,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 6,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 发送消息
     controlSendMessage() {
@@ -1443,7 +1443,7 @@ export default {
       });
     },
     // 解除锁定
-    controlRemoveLimit(snList) {
+    controlRemoveLimit(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1458,15 +1458,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 2,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 2,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 锁定
-    controlLimitedUse(snList) {
+    controlLimitedUse(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1481,15 +1481,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 3,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 3,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList) {
+    controlUpdateStrategy(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1504,15 +1504,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 4,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList) {
+    controlRebootDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1527,15 +1527,15 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 4,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 解除管控
-    controlRemovetDevice(snList) {
+    controlRemovetDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1550,12 +1550,12 @@ export default {
         }
       });
       this.$refs.deviceTable.selectAll(false);
-      // let form = {
-      //   pushType: 4,
-      //   pushObj: 1
-      // };
-      // form.userids = useridList;
-      // this.addPushLog(form);
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      form.userids = useridList;
+      this.addPushLog(form);
     },
     // 添加推送日志
     addPushLog(form) {