平板策略违规处理调整

src/views/schoolSection/strategy/personalStrategy.vue

@@ -268,7 +268,7 @@
             </template>
             <template slot-scope="{ row }" slot="noticed">
               <Checkbox
-                :disabled="strategyInfo.model === 'see'"
+                :disabled="strategyInfo.model === 'see' || !row.checked"
                 class="checked"
                 v-model="row.noticed"
                 @on-change="headleStrategy(row, 'noticed')"
@@ -276,20 +276,20 @@
               >
             </template>
             <template slot-scope="{ row }" slot="violationHandling">
-              <RadioGroup
+              <CheckboxGroup
                 v-model="row.handleMethod"
                 @on-change="headleStrategy(row, 'handleMethod')"
               >
-                <Radio
+                <Checkbox
                   style="margin-right: 20px"
-                  :disabled="strategyInfo.model === 'see'"
+                  :disabled="strategyInfo.model === 'see' || !row.checked"
                   label="锁定"
-                ></Radio>
-                <Radio
-                  :disabled="strategyInfo.model === 'see'"
+                ></Checkbox>
+                <Checkbox
+                  :disabled="strategyInfo.model === 'see' || !row.checked"
                   label="恢复出厂设置"
-                ></Radio>
-              </RadioGroup>
+                ></Checkbox>
+              </CheckboxGroup>
             </template>
           </Table>
           <div class="nodata" v-if="!strategyInfo.hasviolate">
@@ -496,9 +496,18 @@ export default {
       this.padViolates.forEach((item) => {
         if (item.violateType === row.violateType) {
           item[key] = row[key];
+          if (key === "checked") {
+            //默认锁定
+            item.handleMethod = ["锁定"];
+          } else if (key === "handleMethod") {
+            //只能二选一 去掉第一个
+            if (row.handleMethod.length === 2) {
+              item[key] = row[key].slice(1);
+            }
+          }
           if (!item.checked) {
             item.noticed = false;
-            item.handleMethod = "";
+            item.handleMethod = [];
             this.$forceUpdate();
           }
         }
@@ -522,7 +531,7 @@ export default {
           this.padViolates.forEach((item) => {
             item.checked = false;
             item.noticed = false;
-            item.handleMethod = "";
+            item.handleMethod = [];
           });
         }
       }
@@ -546,7 +555,7 @@ export default {
       this.padViolates.forEach((item) => {
         item.checked = false;
         item.noticed = false;
-        item.handleMethod = "";
+        item.handleMethod = [];
       });
       this.padApps.forEach((item) => {
         item.checked = false;
@@ -603,7 +612,7 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = arr.length > 0 ? [arr[0].handleMethod] : [];
             });
           }
           this.strategyInfo.padWifis = res.obj.padWifis || [];
@@ -707,7 +716,7 @@ export default {
         if (item.checked) {
           padViolates.push({
             violateType: item.violateType,
-            handleMethod: item.handleMethod || "",
+            handleMethod: item.handleMethod[0] || "",
             noticed: item.noticed ? 1 : 0
           });
         }
@@ -859,7 +868,7 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = arr.length > 0 ? [arr[0].handleMethod] : [];
             });
           }
           this.strategyInfo.padWifis = res.obj.padWifis || [];
@@ -940,7 +949,7 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = arr.length > 0 ? [arr[0].handleMethod] : [];
             });
           }
           this.strategyInfo.show = true;

src/views/schoolSection/strategy/publicStrategy.vue

@@ -219,7 +219,7 @@
         </template>
         <template slot-scope="{ row }" slot="noticed">
           <Checkbox
-            :disabled="curState === 1"
+            :disabled="curState === 1 || !row.checked"
             class="checked"
             v-model="row.noticed"
             @on-change="headleStrategy(row, 'noticed')"
@@ -227,17 +227,20 @@
           >
         </template>
         <template slot-scope="{ row }" slot="violationHandling">
-          <RadioGroup
+          <CheckboxGroup
             v-model="row.handleMethod"
             @on-change="headleStrategy(row, 'handleMethod')"
           >
-            <Radio
+            <Checkbox
               style="margin-right: 20px"
-              :disabled="curState === 1"
+              :disabled="curState === 1 || !row.checked"
               label="锁定"
-            ></Radio>
-            <Radio :disabled="curState === 1" label="恢复出厂设置"></Radio>
-          </RadioGroup>
+            ></Checkbox>
+            <Checkbox
+              :disabled="curState === 1 || !row.checked"
+              label="恢复出厂设置"
+            ></Checkbox>
+          </CheckboxGroup>
         </template>
       </Table>
       <div class="nodata" v-if="!strategyInfo.hasviolate">未设置违规处理</div>
@@ -382,6 +385,20 @@ export default {
       this.padViolates.forEach((item) => {
         if (item.violateType === row.violateType) {
           item[key] = row[key];
+          if (key === "checked") {
+            //默认锁定
+            item.handleMethod = ["锁定"];
+          } else if (key === "handleMethod") {
+            //只能二选一 去掉第一个
+            if (row.handleMethod.length === 2) {
+              item[key] = row[key].slice(1);
+            }
+          }
+          if (!item.checked) {
+            item.noticed = false;
+            item.handleMethod = [];
+            this.$forceUpdate();
+          }
         }
       });
     },
@@ -403,7 +420,7 @@ export default {
           this.padViolates.forEach((item) => {
             item.checked = false;
             item.noticed = false;
-            item.handleMethod = "";
+            item.handleMethod = [];
           });
         }
       }
@@ -469,7 +486,7 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = arr.length > 0 ? [arr[0].handleMethod] : [];
             });
           }
           //刷新左侧树
@@ -572,7 +589,7 @@ export default {
         if (item.checked) {
           padViolates.push({
             violateType: item.violateType,
-            handleMethod: item.handleMethod || "",
+            handleMethod: item.handleMethod[0] || "",
             noticed: item.noticed ? 1 : 0
           });
         }
@@ -717,7 +734,7 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = arr.length > 0 ? [arr[0].handleMethod] : [];
             });
           }
           this.strategyInfo.padWifis = res.obj.padWifis || [];
@@ -741,7 +758,7 @@ export default {
           this.padViolates.forEach((item) => {
             item.checked = false;
             item.noticed = false;
-            item.handleMethod = "";
+            item.handleMethod = [];
           });
           this.strategyInfo.padWifis = [];
           this.strategyInfo.padTimes = [];
@@ -764,7 +781,7 @@ export default {
       this.padViolates.forEach((item) => {
         item.checked = false;
         item.noticed = false;
-        item.handleMethod = "";
+        item.handleMethod = [];
       });
       //获取应用列表
       this.showLoading = true;

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -302,7 +302,7 @@
             </template>
             <template slot-scope="{ row }" slot="noticed">
               <Checkbox
-                :disabled="strategyInfo.model === '查看'"
+                :disabled="strategyInfo.model === '查看' || !row.checked"
                 class="checked"
                 v-model="row.noticed"
                 @on-change="headleStrategy(row, 'noticed')"
@@ -310,22 +310,20 @@
               >
             </template>
             <template slot-scope="{ row }" slot="violationHandling">
-              <RadioGroup
+              <CheckboxGroup
                 v-model="row.handleMethod"
                 @on-change="headleStrategy(row, 'handleMethod')"
               >
-                <Radio
+                <Checkbox
                   style="margin-right: 20px"
-                  :disabled="strategyInfo.model === '查看'"
+                  :disabled="strategyInfo.model === '查看' || !row.checked"
                   label="锁定"
-                  >锁定</Radio
-                >
-                <Radio
-                  :disabled="strategyInfo.model === '查看'"
+                ></Checkbox>
+                <Checkbox
+                  :disabled="strategyInfo.model === '查看' || !row.checked"
                   label="恢复出厂设置"
-                  >恢复出厂设置</Radio
-                >
-              </RadioGroup>
+                ></Checkbox>
+              </CheckboxGroup>
             </template>
           </Table>
           <div class="nodata" v-if="!strategyInfo.hasviolate">
@@ -496,9 +494,18 @@ export default {
       this.padViolates.forEach((item) => {
         if (item.violateType === row.violateType) {
           item[key] = row[key];
+          if (key === "checked") {
+            //默认锁定
+            item.handleMethod = ["锁定"];
+          } else if (key === "handleMethod") {
+            //只能二选一 去掉第一个
+            if (row.handleMethod.length === 2) {
+              item[key] = row[key].slice(1);
+            }
+          }
           if (!item.checked) {
             item.noticed = false;
-            item.handleMethod = "";
+            item.handleMethod = [];
             this.$forceUpdate();
           }
         }
@@ -522,7 +529,7 @@ export default {
           this.padViolates.forEach((item) => {
             item.checked = false;
             item.noticed = false;
-            item.handleMethod = "";
+            item.handleMethod = [];
           });
         }
       }
@@ -582,7 +589,7 @@ export default {
         if (item.checked) {
           padViolates.push({
             violateType: item.violateType,
-            handleMethod: item.handleMethod || "",
+            handleMethod: item.handleMethod[0] || "",
             noticed: item.noticed ? 1 : 0
           });
         }
@@ -726,7 +733,7 @@ export default {
       this.padViolates.forEach((item) => {
         item.checked = false;
         item.noticed = false;
-        item.handleMethod = "";
+        item.handleMethod = [];
       });
       this.padApps.forEach((item) => {
         item.checked = false;
@@ -842,7 +849,7 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = arr.length > 0 ? [arr[0].handleMethod] : [];
             });
           }
           this.strategyInfo.show = true;