Merge commit 'e73aaf4e552e993bcd745e0962f8d06689d3f683' into gzb

src/views/platformSection/networkManage/whitelistLibrary.vue

@@ -132,7 +132,7 @@
       title="查看"
     >
       <div class="view_title">
-        <div>{{ viewInfo.name }}</div>
+        {{ viewInfo.name }}
         <div v-if="viewInfo.wltype === 1" class="wltype_1">APP</div>
         <div v-if="viewInfo.wltype === 2" class="wltype_2">网址</div>
       </div>
@@ -152,9 +152,11 @@
         <FormItem label="简介" style="margin-bottom: 0; width: 100%">{{
           viewInfo.comm
         }}</FormItem>
-        <FormItem label="网址" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.whiteAddress
-        }}</FormItem>
+        <FormItem
+          label="网址"
+          style="margin-bottom: 0; width: 100%; word-break: break-all"
+          >{{ viewInfo.whiteAddress }}</FormItem
+        >
       </Form>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
@@ -466,12 +468,13 @@ export default {
 .view_title {
   display: flex;
   justify-content: center;
-  align-items: center;
+  align-items: flex-start;
   margin-bottom: 16px;
   font-size: 18px;
   font-weight: bold;
   text-align: center;
   .wltype_1 {
+    margin-top: 2px;
     margin-left: 10px;
     padding: 0 10px;
     line-height: 20px;
@@ -479,9 +482,11 @@ export default {
     font-weight: normal;
     font-size: 12px;
     border-radius: 4px;
+    white-space: nowrap;
     background: #7854f6;
   }
   .wltype_2 {
+    margin-top: 2px;
     margin-left: 10px;
     padding: 0 10px;
     line-height: 20px;
@@ -489,6 +494,7 @@ export default {
     font-weight: normal;
     font-size: 12px;
     border-radius: 4px;
+    white-space: nowrap;
     background: #52c41a;
   }
 }

src/views/platformSection/regionManage/regionManage.vue

@@ -376,6 +376,12 @@ export default {
           key: "regionName",
           align: "center"
         },
+        {
+          title: "区域码",
+          minWidth: 100,
+          key: "regionCode",
+          align: "center"
+        },
         {
           title: "创建人",
           key: "createname",

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -353,28 +353,16 @@
                 >
               </template>
               <template slot-scope="{ row }" slot="violationHandling">
-                <Radio
-                  :disabled="true"
-                  :value="
-                    strategyInfo.padViolatesInfo &&
-                    strategyInfo.padViolatesInfo[row.violateType] &&
-                    strategyInfo.padViolatesInfo[
-                      row.violateType
-                    ].handleMethod.includes('锁定')
-                  "
-                  >锁定</Radio
-                >
-                <Radio
-                  :disabled="true"
+                <CheckboxGroup
                   :value="
                     strategyInfo.padViolatesInfo &&
                     strategyInfo.padViolatesInfo[row.violateType] &&
-                    strategyInfo.padViolatesInfo[
-                      row.violateType
-                    ].handleMethod.includes('恢复出厂设置')
+                    strategyInfo.padViolatesInfo[row.violateType].handleMethod
                   "
-                  >恢复出厂设置</Radio
                 >
+                  <Checkbox :disabled="true" label="锁定"></Checkbox>
+                  <Checkbox :disabled="true" label="恢复出厂设置"></Checkbox>
+                </CheckboxGroup>
               </template>
             </Table>
           </div>