平板策略优化

src/utils/index.js

@@ -16,6 +16,92 @@ export const pwdCheck = (rule, value, callback) => {
     callback();
   }
 };
+export const padDevices = [
+  {
+    pdorder: 1,
+    pdtype: "摄像头",
+    enabled: 1,
+    icon: "ivu-icon iconfont icon-ball-camera"
+  },
+  {
+    pdorder: 2,
+    pdtype: "GPS",
+    enabled: 1,
+    icon: "ivu-icon iconfont icon-GPSxinxi"
+  },
+  {
+    pdorder: 3,
+    pdtype: "蓝牙",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-lanya"
+  },
+  {
+    pdorder: 4,
+    pdtype: "USB连接",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-USB"
+  },
+  {
+    pdorder: 5,
+    pdtype: "电话短信",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
+  },
+  {
+    pdorder: 6,
+    pdtype: "数据流量",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-liuliang"
+  },
+  {
+    pdorder: 7,
+    pdtype: "Wi-Fi高级选项",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-wifiguanbi"
+  },
+  {
+    pdorder: 8,
+    pdtype: "SD卡",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-sdka-09"
+  },
+  {
+    pdorder: 9,
+    pdtype: "OTG",
+    enabled: 2,
+    icon: "ivu-icon iconfont icon-icon-OTG"
+  }
+];
+export const padViolates = [
+  {
+    title: "已ROOT",
+    violateType: 1,
+    checked: false,
+    noticed: false,
+    handleMethod: ""
+  },
+  {
+    title: "安装非商店应用",
+    violateType: 2,
+    checked: false,
+    noticed: false,
+    handleMethod: ""
+  },
+  {
+    title: "更换SIM卡",
+    violateType: 3,
+    checked: false,
+    noticed: false,
+    handleMethod: ""
+  },
+  {
+    title: "USB连接电脑",
+    violateType: 4,
+    checked: false,
+    noticed: false,
+    handleMethod: ""
+  }
+];
 export const weekDay = [
   {
     label: "周日",

src/views/schoolSection/strategy/personalStrategy.vue

@@ -249,7 +249,7 @@
               <Checkbox
                 :disabled="strategyInfo.model === 'see'"
                 class="checked"
-                @on-change="checkedChange(row)"
+                @on-change="headleStrategy(row, 'checked')"
                 v-model="row.checked"
               ></Checkbox>
               <span
@@ -257,25 +257,27 @@
                 >{{ row.title }}</span
               >
             </template>
+            <template slot-scope="{ row }" slot="noticed">
+              <Checkbox
+                  :disabled="strategyInfo.model === 'see'"
+                  class="checked"
+                  v-model="row.noticed"
+                  @on-change="headleStrategy(row, 'noticed')"
+              >通知管理员</Checkbox
+              >
+            </template>
             <template slot-scope="{ row }" slot="violationHandling">
-              <CheckboxGroup
-                @on-change="checkboxChange(row)"
-                v-model="row.handleMethod"
+              <RadioGroup
+                  v-model="row.handleMethod"
+                  @on-change="headleStrategy(row, 'handleMethod')"
               >
-                <Checkbox
-                  :disabled="strategyInfo.model === 'see'"
-                  label="通知管理员"
-                ></Checkbox>
-                <Checkbox
-                  :disabled="strategyInfo.model === 'see'"
-                  style="margin: 0 40px"
-                  label="锁定"
-                ></Checkbox>
-                <Checkbox
-                  :disabled="strategyInfo.model === 'see'"
-                  label="恢复出厂设置"
-                ></Checkbox>
-              </CheckboxGroup>
+                <Radio
+                    style="margin-right: 20px"
+                    :disabled="strategyInfo.model === 'see'"
+                    label="锁定"
+                ></Radio>
+                <Radio   :disabled="strategyInfo.model === 'see'" label="恢复出厂设置"></Radio>
+              </RadioGroup>
             </template>
           </Table>
           <div class="nodata" v-if="!strategyInfo.hasviolate">
@@ -340,6 +342,7 @@ import {
   stPad_list_user
 } from "@/api/stPad";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
+import { padDevices, padViolates } from "@/utils";
 export default {
   components: {
     TimeStrategy
@@ -372,100 +375,18 @@ export default {
         padViolates: [] //设备违规
       },
       padApps: [],
-      padDevices: [
-        {
-          pdorder: 1,
-          pdtype: "摄像头",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-ball-camera"
-        },
-        {
-          pdorder: 2,
-          pdtype: "蓝牙",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-lanya"
-        },
-        {
-          pdorder: 3,
-          pdtype: "USB连接",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-USB"
-        },
-        {
-          pdorder: 4,
-          pdtype: "Wi-Fi开关",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-bx-wifi-2"
-        },
-        {
-          pdorder: 5,
-          pdtype: "电话短信",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
-        },
-        {
-          pdorder: 6,
-          pdtype: "数据流量",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-liuliang"
-        },
-        {
-          pdorder: 7,
-          pdtype: "GPS",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-GPSxinxi"
-        },
-        {
-          pdorder: 8,
-          pdtype: "Wi-Fi高级选项",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-wifiguanbi"
-        },
-        {
-          pdorder: 9,
-          pdtype: "SD卡",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-sdka-09"
-        },
-        {
-          pdorder: 10,
-          pdtype: "OTG",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-icon-OTG"
-        }
-      ],
-      padViolates: [
-        {
-          title: "已ROOT",
-          violateType: 1,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "安装非商店应用",
-          violateType: 2,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "更换SIM卡",
-          violateType: 3,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "USB连接电脑",
-          violateType: 4,
-          checked: false,
-          handleMethod: []
-        }
-      ],
+      padDevices,
+      padViolates,
       columns: [
         {
           title: "违规事件",
           slot: "violationEvents",
-          align: "center",
-          width: 260
+          align: "center"
+        },
+        {
+          title: "是否通知",
+          slot: "noticed",
+          align: "center"
         },
         {
           title: "违规处理",
@@ -591,6 +512,36 @@ export default {
     this.init();
   },
   methods: {
+    headleStrategy(row, key) {
+      this.padViolates.forEach((item) => {
+        if (item.violateType === row.violateType) {
+          item[key] = row[key];
+        }
+      });
+    },
+    HandleIsShowChange(show, type) {
+      if (!show) {
+        if (type === 1) {
+          this.strategyInfo.padTimes = []; // 平板策略时间
+        } else if (type === 2) {
+          this.padApps.forEach((item) => {
+            item.checked = false;
+          });
+        } else if (type === 3) {
+          this.padDevices.forEach((item) => {
+            item.enabled = item.pdorder === 1 ? 1 : item.pdorder === 2 ? 1 : 2;
+          });
+        } else if (type === 4) {
+          this.strategyInfo.padWifis = []; //wifi白名单
+        } else if (type === 5) {
+          this.padViolates.forEach((item) => {
+            item.checked = false;
+            item.noticed = false;
+            item.handleMethod = "";
+          });
+        }
+      }
+    },
     stPadChange(row) {
       //切换选择
       this.stPadInfo.list.forEach((item) => {
@@ -605,11 +556,12 @@ export default {
       this.strategyInfo.padWifis = []; //wifi白名单
       this.strategyInfo.padViolates = []; //设备违规
       this.padDevices.forEach((item) => {
-        item.enabled = 2;
+        item.enabled = item.pdorder === 1 ? 1 : item.pdorder === 2 ? 1 : 2;
       });
       this.padViolates.forEach((item) => {
         item.checked = false;
-        item.handleMethod = [];
+        item.noticed = false;
+        item.handleMethod = "";
       });
       this.padApps.forEach((item) => {
         item.checked = false;
@@ -665,8 +617,8 @@ export default {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
+              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
             });
           }
           this.strategyInfo.padWifis = res.obj.padWifis || [];
@@ -763,8 +715,11 @@ export default {
       //获取违规处理
       for (let item of this.padViolates) {
         if (item.checked) {
-          let handleMethod = item.handleMethod.join(";");
-          padViolates.push({ violateType: item.violateType, handleMethod });
+          padViolates.push({
+            violateType: item.violateType,
+            handleMethod: item.handleMethod || "",
+            noticed: item.noticed ? 1 : 0
+          });
         }
       }
       if (this.strategyInfo.hastime) {
@@ -798,7 +753,7 @@ export default {
         }
         //违规处理选项
         for (let item of padViolates) {
-          if (item.handleMethod.length === 0) {
+          if (!item.handleMethod) {
             this.$Message.error("请选择违规处理!");
             return;
           }
@@ -834,26 +789,6 @@ export default {
         }
       });
     },
-    checkboxChange(row) {
-      row.checked = row.handleMethod.length > 0 ? true : false;
-      this.padViolates.forEach((item) => {
-        if (item.violateType === row.violateType) {
-          item.checked = row.handleMethod.length > 0 ? true : false;
-          item.handleMethod = row.handleMethod;
-        }
-      });
-    },
-    //违规事件
-    checkedChange(row) {
-      this.padViolates.forEach((item) => {
-        if (item.violateType === row.violateType) {
-          if (!row.checked) {
-            //清空违规处理
-            item.handleMethod = [];
-          }
-        }
-      });
-    },
     delWifi(val) {
       //删除wifi白名单
       this.strategyInfo.padWifis = this.strategyInfo.padWifis.filter(
@@ -933,8 +868,8 @@ export default {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
+              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
             });
           }
           this.strategyInfo.padWifis = res.obj.padWifis || [];
@@ -1014,8 +949,8 @@ export default {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
+              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
             });
           }
           this.strategyInfo.show = true;

src/views/schoolSection/strategy/publicStrategy.vue

@@ -17,7 +17,10 @@
           >时间限制策略
         </div>
         <div>
-          <Checkbox v-if="curState === 2" v-model="strategyInfo.hastime"
+          <Checkbox
+            v-if="curState === 2"
+            v-model="strategyInfo.hastime"
+            @on-change="HandleIsShowChange(strategyInfo.hastime, 1)"
             >启用</Checkbox
           >
         </div>
@@ -56,7 +59,10 @@
           <span class="ivu-icon iconfont icon-yingyongcelve"></span>应用策略
         </div>
         <div>
-          <Checkbox v-if="curState === 2" v-model="strategyInfo.hasapp"
+          <Checkbox
+            v-if="curState === 2"
+            v-model="strategyInfo.hasapp"
+            @on-change="HandleIsShowChange(strategyInfo.hastime, 2)"
             >启用</Checkbox
           >
         </div>
@@ -87,7 +93,10 @@
       <div class="strategy_title">
         <div><span class="ivu-icon iconfont icon-shezhi"></span>设备策略</div>
         <div>
-          <Checkbox v-if="curState === 2" v-model="strategyInfo.hasdevice"
+          <Checkbox
+            v-if="curState === 2"
+            v-model="strategyInfo.hasdevice"
+            @on-change="HandleIsShowChange(strategyInfo.hastime, 3)"
             >启用</Checkbox
           >
         </div>
@@ -131,7 +140,10 @@
           >Wifi白名单策略
         </div>
         <div>
-          <Checkbox v-if="curState === 2" v-model="strategyInfo.haswifi"
+          <Checkbox
+            v-if="curState === 2"
+            v-model="strategyInfo.haswifi"
+            @on-change="HandleIsShowChange(strategyInfo.hastime, 4)"
             >启用</Checkbox
           >
         </div>
@@ -174,7 +186,10 @@
           <span class="ivu-icon iconfont icon-weiguiguanli"></span>违规处理
         </div>
         <div>
-          <Checkbox v-if="curState === 2" v-model="strategyInfo.hasviolate"
+          <Checkbox
+            v-if="curState === 2"
+            v-model="strategyInfo.hasviolate"
+            @on-change="HandleIsShowChange(strategyInfo.hastime, 5)"
             >启用</Checkbox
           >
         </div>
@@ -189,29 +204,34 @@
           <Checkbox
             :disabled="curState === 1"
             class="checked"
-            @on-change="checkedChange(row)"
+            @on-change="headleStrategy(row, 'checked')"
             v-model="row.checked"
           ></Checkbox>
           <span style="display: inline-block; width: 120px; text-align: left">{{
             row.title
           }}</span>
         </template>
+        <template slot-scope="{ row }" slot="noticed">
+          <Checkbox
+            :disabled="curState === 1"
+            class="checked"
+            v-model="row.noticed"
+            @on-change="headleStrategy(row, 'noticed')"
+            >通知管理员</Checkbox
+          >
+        </template>
         <template slot-scope="{ row }" slot="violationHandling">
-          <CheckboxGroup
-            @on-change="checkboxChange(row)"
+          <RadioGroup
             v-model="row.handleMethod"
+            @on-change="headleStrategy(row, 'handleMethod')"
           >
-            <Checkbox :disabled="curState === 1" label="通知管理员"></Checkbox>
-            <Checkbox
+            <Radio
+              style="margin-right: 20px"
               :disabled="curState === 1"
-              style="margin: 0 40px"
               label="锁定"
-            ></Checkbox>
-            <Checkbox
-              :disabled="curState === 1"
-              label="恢复出厂设置"
-            ></Checkbox>
-          </CheckboxGroup>
+            ></Radio>
+            <Radio :disabled="curState === 1" label="恢复出厂设置"></Radio>
+          </RadioGroup>
         </template>
       </Table>
       <div class="nodata" v-if="!strategyInfo.hasviolate">未设置违规处理</div>
@@ -268,6 +288,7 @@ import {
 } from "@/api/stPad";
 import { app_list_sel } from "@/api/appgroup";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
+import { padDevices, padViolates } from "@/utils";
 export default {
   components: {
     TimeStrategy
@@ -298,100 +319,18 @@ export default {
         padViolates: [] //设备违规
       },
       padApps: [],
-      padDevices: [
-        {
-          pdorder: 1,
-          pdtype: "摄像头",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-ball-camera"
-        },
-        {
-          pdorder: 2,
-          pdtype: "蓝牙",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-lanya"
-        },
-        {
-          pdorder: 3,
-          pdtype: "USB连接",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-USB"
-        },
-        {
-          pdorder: 4,
-          pdtype: "Wi-Fi开关",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-bx-wifi-2"
-        },
-        {
-          pdorder: 5,
-          pdtype: "电话短信",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
-        },
-        {
-          pdorder: 6,
-          pdtype: "数据流量",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-liuliang"
-        },
-        {
-          pdorder: 7,
-          pdtype: "GPS",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-GPSxinxi"
-        },
-        {
-          pdorder: 8,
-          pdtype: "Wi-Fi高级选项",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-wifiguanbi"
-        },
-        {
-          pdorder: 9,
-          pdtype: "SD卡",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-sdka-09"
-        },
-        {
-          pdorder: 10,
-          pdtype: "OTG",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-icon-OTG"
-        }
-      ],
-      padViolates: [
-        {
-          title: "已ROOT",
-          violateType: 1,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "安装非商店应用",
-          violateType: 2,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "更换SIM卡",
-          violateType: 3,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "USB连接电脑",
-          violateType: 4,
-          checked: false,
-          handleMethod: []
-        }
-      ],
+      padDevices,
+      padViolates,
       columns: [
         {
           title: "违规事件",
           slot: "violationEvents",
-          align: "center",
-          width: 260
+          align: "center"
+        },
+        {
+          title: "是否通知",
+          slot: "noticed",
+          align: "center"
         },
         {
           title: "违规处理",
@@ -468,6 +407,36 @@ export default {
     this.init();
   },
   methods: {
+    headleStrategy(row, key) {
+      this.padViolates.forEach((item) => {
+        if (item.violateType === row.violateType) {
+          item[key] = row[key];
+        }
+      });
+    },
+    HandleIsShowChange(show, type) {
+      if (!show) {
+        if (type === 1) {
+          this.strategyInfo.padTimes = []; // 平板策略时间
+        } else if (type === 2) {
+          this.padApps.forEach((item) => {
+            item.checked = false;
+          });
+        } else if (type === 3) {
+          this.padDevices.forEach((item) => {
+            item.enabled = item.pdorder === 1 ? 1 : item.pdorder === 2 ? 1 : 2;
+          });
+        } else if (type === 4) {
+          this.strategyInfo.padWifis = []; //wifi白名单
+        } else if (type === 5) {
+          this.padViolates.forEach((item) => {
+            item.checked = false;
+            item.noticed = false;
+            item.handleMethod = "";
+          });
+        }
+      }
+    },
     stPadChange(row) {
       //切换选择
       this.stPadInfo.list.forEach((item) => {
@@ -528,8 +497,8 @@ export default {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
+              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
             });
           }
           //刷新左侧树
@@ -630,8 +599,11 @@ export default {
       //获取违规处理
       for (let item of this.padViolates) {
         if (item.checked) {
-          let handleMethod = item.handleMethod.join(";");
-          padViolates.push({ violateType: item.violateType, handleMethod });
+          padViolates.push({
+            violateType: item.violateType,
+            handleMethod: item.handleMethod || "",
+            noticed: item.noticed ? 1 : 0
+          });
         }
       }
       if (this.strategyInfo.hastime) {
@@ -665,7 +637,7 @@ export default {
         }
         //违规处理选项
         for (let item of padViolates) {
-          if (item.handleMethod.length === 0) {
+          if (!item.handleMethod) {
             this.$Message.error("请选择违规处理!");
             return;
           }
@@ -705,26 +677,6 @@ export default {
         }
       });
     },
-    checkboxChange(row) {
-      row.checked = row.handleMethod.length > 0 ? true : false;
-      this.padViolates.forEach((item) => {
-        if (item.violateType === row.violateType) {
-          item.checked = row.handleMethod.length > 0 ? true : false;
-          item.handleMethod = row.handleMethod;
-        }
-      });
-    },
-    //违规事件
-    checkedChange(row) {
-      this.padViolates.forEach((item) => {
-        if (item.violateType === row.violateType) {
-          if (!row.checked) {
-            //清空违规处理
-            item.handleMethod = [];
-          }
-        }
-      });
-    },
     delWifi(val) {
       //删除wifi白名单
       this.strategyInfo.padWifis = this.strategyInfo.padWifis.filter(
@@ -792,8 +744,8 @@ export default {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
+              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
             });
           }
           this.strategyInfo.padWifis = res.obj.padWifis || [];
@@ -818,11 +770,12 @@ export default {
       this.strategyInfo.padWifis = []; //wifi白名单
       this.strategyInfo.padViolates = []; //设备违规
       this.padDevices.forEach((item) => {
-        item.enabled = 2;
+        item.enabled = item.pdorder === 1 ? 1 : item.pdorder === 2 ? 1 : 2;
       });
       this.padViolates.forEach((item) => {
         item.checked = false;
-        item.handleMethod = [];
+        item.noticed = false;
+        item.handleMethod = "";
       });
       //获取应用列表
       this.showLoading = true;

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -100,6 +100,7 @@
               <Checkbox
                 v-if="strategyInfo.model != '查看'"
                 v-model="strategyInfo.hastime"
+                @on-change="HandleIsShowChange(strategyInfo.hastime, 1)"
                 >启用</Checkbox
               >
             </div>
@@ -145,6 +146,7 @@
               <Checkbox
                 v-if="strategyInfo.model != '查看'"
                 v-model="strategyInfo.hasapp"
+                @on-change="HandleIsShowChange(strategyInfo.hasapp, 2)"
                 >启用</Checkbox
               >
             </div>
@@ -180,6 +182,7 @@
               <Checkbox
                 v-if="strategyInfo.model != '查看'"
                 v-model="strategyInfo.hasdevice"
+                @on-change="HandleIsShowChange(strategyInfo.hasdevice, 3)"
                 >启用</Checkbox
               >
             </div>
@@ -226,6 +229,7 @@
               <Checkbox
                 v-if="strategyInfo.model != '查看'"
                 v-model="strategyInfo.haswifi"
+                @on-change="HandleIsShowChange(strategyInfo.haswifi, 4)"
                 >启用</Checkbox
               >
             </div>
@@ -271,6 +275,7 @@
               <Checkbox
                 v-if="strategyInfo.model != '查看'"
                 v-model="strategyInfo.hasviolate"
+                @on-change="HandleIsShowChange(strategyInfo.hasviolate, 5)"
                 >启用</Checkbox
               >
             </div>
@@ -285,33 +290,40 @@
               <Checkbox
                 :disabled="strategyInfo.model === '查看'"
                 class="checked"
-                @on-change="checkedChange(row)"
                 v-model="row.checked"
+                @on-change="headleStrategy(row, 'checked')"
               ></Checkbox>
               <span
                 style="display: inline-block; width: 120px; text-align: left"
                 >{{ row.title }}</span
               >
             </template>
+            <template slot-scope="{ row }" slot="noticed">
+              <Checkbox
+                :disabled="strategyInfo.model === '查看'"
+                class="checked"
+                v-model="row.noticed"
+                @on-change="headleStrategy(row, 'noticed')"
+                >通知管理员</Checkbox
+              >
+            </template>
             <template slot-scope="{ row }" slot="violationHandling">
-              <CheckboxGroup
-                @on-change="checkboxChange(row)"
+              <RadioGroup
                 v-model="row.handleMethod"
+                @on-change="headleStrategy(row, 'handleMethod')"
               >
-                <Checkbox
+                <Radio
+                  style="margin-right: 20px"
                   :disabled="strategyInfo.model === '查看'"
-                  label="通知管理员"
-                ></Checkbox>
-                <Checkbox
-                  :disabled="strategyInfo.model === '查看'"
-                  style="margin: 0 40px"
                   label="锁定"
-                ></Checkbox>
-                <Checkbox
+                  >锁定</Radio
+                >
+                <Radio
                   :disabled="strategyInfo.model === '查看'"
                   label="恢复出厂设置"
-                ></Checkbox>
-              </CheckboxGroup>
+                  >恢复出厂设置</Radio
+                >
+              </RadioGroup>
             </template>
           </Table>
           <div class="nodata" v-if="!strategyInfo.hasviolate">
@@ -349,8 +361,8 @@ import {
   stPad_list
 } from "@/api/stPad";
 import { app_list_sel } from "@/api/appgroup";
-
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
+import { padDevices, padViolates } from "@/utils";
 export default {
   components: {
     TimeStrategy
@@ -392,101 +404,18 @@ export default {
         hasviolate: false, //是否开启违规通知：0否 1是
         padViolates: [] //设备违规
       },
-      padApps: [],
-      padDevices: [
-        {
-          pdorder: 1,
-          pdtype: "摄像头",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-ball-camera"
-        },
-        {
-          pdorder: 2,
-          pdtype: "蓝牙",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-lanya"
-        },
-        {
-          pdorder: 3,
-          pdtype: "USB连接",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-USB"
-        },
-        {
-          pdorder: 4,
-          pdtype: "Wi-Fi开关",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-bx-wifi-2"
-        },
-        {
-          pdorder: 5,
-          pdtype: "电话短信",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
-        },
-        {
-          pdorder: 6,
-          pdtype: "数据流量",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-liuliang"
-        },
-        {
-          pdorder: 7,
-          pdtype: "GPS",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-GPSxinxi"
-        },
-        {
-          pdorder: 8,
-          pdtype: "Wi-Fi高级选项",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-wifiguanbi"
-        },
-        {
-          pdorder: 9,
-          pdtype: "SD卡",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-sdka-09"
-        },
-        {
-          pdorder: 10,
-          pdtype: "OTG",
-          enabled: 2,
-          icon: "ivu-icon iconfont icon-icon-OTG"
-        }
-      ],
-      padViolates: [
-        {
-          title: "已ROOT",
-          violateType: 1,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "安装非商店应用",
-          violateType: 2,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "更换SIM卡",
-          violateType: 3,
-          checked: false,
-          handleMethod: []
-        },
-        {
-          title: "USB连接电脑",
-          violateType: 4,
-          checked: false,
-          handleMethod: []
-        }
-      ],
+      padDevices,
+      padViolates,
       columns1: [
         {
           title: "违规事件",
           slot: "violationEvents",
-          align: "center",
-          width: 260
+          align: "center"
+        },
+        {
+          title: "是否通知",
+          slot: "noticed",
+          align: "center"
         },
         {
           title: "违规处理",
@@ -592,6 +521,36 @@ export default {
     this.searchList();
   },
   methods: {
+    headleStrategy(row, key) {
+      this.padViolates.forEach((item) => {
+        if (item.violateType === row.violateType) {
+          item[key] = row[key];
+        }
+      });
+    },
+    HandleIsShowChange(show, type) {
+      if (!show) {
+        if (type === 1) {
+          this.strategyInfo.padTimes = []; // 平板策略时间
+        } else if (type === 2) {
+          this.padApps.forEach((item) => {
+            item.checked = false;
+          });
+        } else if (type === 3) {
+          this.padDevices.forEach((item) => {
+            item.enabled = item.pdorder === 1 ? 1 : item.pdorder === 2 ? 1 : 2;
+          });
+        } else if (type === 4) {
+          this.strategyInfo.padWifis = []; //wifi白名单
+        } else if (type === 5) {
+          this.padViolates.forEach((item) => {
+            item.checked = false;
+            item.noticed = false;
+            item.handleMethod = "";
+          });
+        }
+      }
+    },
     stPadChange(row) {
       //切换选择
       this.stPadInfo.list.forEach((item) => {
@@ -633,6 +592,7 @@ export default {
           padApps.push(item.appid);
         }
       }
+
       //获取设备
       for (let item of this.padDevices) {
         padDevices.push({
@@ -641,12 +601,14 @@ export default {
           enabled: item.enabled
         });
       }
-
       //获取违规处理
       for (let item of this.padViolates) {
         if (item.checked) {
-          let handleMethod = item.handleMethod.join(";");
-          padViolates.push({ violateType: item.violateType, handleMethod });
+          padViolates.push({
+            violateType: item.violateType,
+            handleMethod: item.handleMethod || "",
+            noticed: item.noticed ? 1 : 0
+          });
         }
       }
       if (this.strategyInfo.hastime) {
@@ -680,7 +642,7 @@ export default {
         }
         //违规处理选项
         for (let item of padViolates) {
-          if (item.handleMethod.length === 0) {
+          if (!item.handleMethod) {
             this.$Message.error("请选择违规处理!");
             return;
           }
@@ -707,7 +669,9 @@ export default {
         form.rversion = this.strategyInfo.rversion;
       }
       let api = this.strategyInfo.model === "编辑" ? stPad_edit : stPad_add;
+      this.showLoading = true;
       api(form).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.$Message.success(res.msg);
           this.searchList();
@@ -717,26 +681,6 @@ export default {
         }
       });
     },
-    checkboxChange(row) {
-      row.checked = row.handleMethod.length > 0 ? true : false;
-      this.padViolates.forEach((item) => {
-        if (item.violateType === row.violateType) {
-          item.checked = row.handleMethod.length > 0 ? true : false;
-          item.handleMethod = row.handleMethod;
-        }
-      });
-    },
-    //违规事件
-    checkedChange(row) {
-      this.padViolates.forEach((item) => {
-        if (item.violateType === row.violateType) {
-          if (!row.checked) {
-            //清空违规处理
-            item.handleMethod = [];
-          }
-        }
-      });
-    },
     delWifi(val) {
       //删除wifi白名单
       this.strategyInfo.padWifis = this.strategyInfo.padWifis.filter(
@@ -799,16 +743,14 @@ export default {
     initData() {
       //数据初始化
       this.strategyInfo.padTimes = []; // 平板策略时间
-      this.strategyInfo.padApps = []; //appid集合
-      this.strategyInfo.padDevices = []; //授权应用
       this.strategyInfo.padWifis = []; //wifi白名单
-      this.strategyInfo.padViolates = []; //设备违规
       this.padDevices.forEach((item) => {
-        item.enabled = 2;
+        item.enabled = item.pdorder === 1 ? 1 : item.pdorder === 2 ? 1 : 2;
       });
       this.padViolates.forEach((item) => {
         item.checked = false;
-        item.handleMethod = [];
+        item.noticed = false;
+        item.handleMethod = "";
       });
       this.padApps.forEach((item) => {
         item.checked = false;
@@ -923,8 +865,8 @@ export default {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
+              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
             });
           }
           this.strategyInfo.show = true;