学校-设备管理其他操作优化

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -542,11 +542,7 @@ export default {
         pushType: 6,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 发送消息
@@ -568,11 +564,7 @@ export default {
             pushObj: 1,
             content: this.controlMessageInfo.content
           };
-          if (snList.length > 1) {
-            form.userids = useridList;
-          } else {
-            form.pushObjid = useridList[0];
-          }
+          form.userids = useridList;
           this.addPushLog(form);
         }
       });
@@ -590,11 +582,7 @@ export default {
         pushType: 2,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 限制使用
@@ -610,11 +598,7 @@ export default {
         pushType: 3,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 更新策略
@@ -630,11 +614,7 @@ export default {
         pushType: 4,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 重启设备
@@ -650,11 +630,7 @@ export default {
         pushType: 4,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 添加推送日志

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -975,19 +975,23 @@ export default {
           this.strategyInfo.padApps = res.obj.padApps || [];
           this.strategyInfo.padWifis = res.obj.padWifis || [];
           this.strategyInfo.padTimes = res.obj.padTimes || [];
-          let pdtypeInfo = {};
-          this.strategyInfo.padDevices = res.obj.padDevices;
-          this.strategyInfo.padDevices.forEach((item) => {
-            pdtypeInfo[item.pdtype] = item.enabled;
-          });
-          this.strategyInfo.pdtypeInfo = pdtypeInfo;
-          let violatesInfo = {};
-          this.strategyInfo.padViolates = res.obj.padViolates;
-          this.strategyInfo.padViolates.forEach((item) => {
-            violatesInfo[item.violateType] =
-              item.handle_method && item.handle_method.split("；");
-          });
-          this.strategyInfo.violatesInfo = violatesInfo;
+          if (this.strategyInfo.hasdevice) {
+            let pdtypeInfo = {};
+            this.strategyInfo.padDevices = res.obj.padDevices;
+            this.strategyInfo.padDevices.forEach((item) => {
+              pdtypeInfo[item.pdtype] = item.enabled;
+            });
+            this.strategyInfo.pdtypeInfo = pdtypeInfo;
+          }
+          if (this.strategyInfo.hasviolate) {
+            let violatesInfo = {};
+            this.strategyInfo.padViolates = res.obj.padViolates;
+            this.strategyInfo.padViolates.forEach((item) => {
+              violatesInfo[item.violateType] =
+                item.handle_method && item.handle_method.split("；");
+            });
+            this.strategyInfo.violatesInfo = violatesInfo;
+          }
           this.strategyInfo.show = true;
         } else {
           this.$Message.error(res.msg);
@@ -1149,11 +1153,7 @@ export default {
         pushType: 6,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 发送消息
@@ -1178,11 +1178,7 @@ export default {
           if (this.controlMessageInfo.classid) {
             form.pushObjid = this.controlMessageInfo.classid;
           } else {
-            if (snList.length > 1) {
-              form.userids = useridList;
-            } else {
-              form.pushObjid = useridList[0];
-            }
+            form.userids = useridList;
           }
           this.addPushLog(form);
         }
@@ -1201,11 +1197,7 @@ export default {
         pushType: 2,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 限制使用
@@ -1221,11 +1213,7 @@ export default {
         pushType: 3,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 更新策略
@@ -1241,11 +1229,7 @@ export default {
         pushType: 4,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 重启设备
@@ -1261,11 +1245,7 @@ export default {
         pushType: 4,
         pushObj: 1
       };
-      if (snList.length > 1) {
-        form.userids = useridList;
-      } else {
-        form.pushObjid = useridList[0];
-      }
+      form.userids = useridList;
       this.addPushLog(form);
     },
     // 添加推送日志