Merge remote-tracking branch 'origin/gzb' into wzl

# Conflicts:
#	src/views/platformSection/regionManage/regionManage.vue

src/assets/less/common.less

@@ -376,11 +376,12 @@ fieldset[disabled] .ivu-input,
   border-radius: 8px;
 }
 .main_root {
-  margin: 0 16px 10px;
-  min-height: calc(100% - 10px);
+  //margin: 0 16px 10px;
+ height: calc(100% - 10px);
   border-radius: 15px;
   border: 1px solid #e9f0f9;
   background-color: #fff;
+  overflow: auto;
 }
 // 表格
 .table_wrap_modal,

src/utils/index.js

@@ -16,6 +16,13 @@ export const pwdCheck = (rule, value, callback) => {
     callback();
   }
 };
+export const codeCheck = (rule, value, callback) => {
+  if ((value && value.length !== 6) || !value) {
+    return callback(new Error("请输入6位区域码!"));
+  } else {
+    callback();
+  }
+};
 export const padDevices = [
   {
     pdorder: 1,

src/views/platformSection/index.vue

@@ -237,7 +237,8 @@ export default {
     position: relative;
     width: 100%;
     height: calc(100% - 80px);
-    overflow: auto;
+    //overflow: auto;
+    padding: 0 16px 10px;
   }
 }
 </style>

src/views/regionSection/index.vue

@@ -429,7 +429,7 @@ export default {
             top: 32px;
             left: 0;
             padding: 10px 0;
-            min-width: 100px;
+            min-width: 110px;
             color: #253a70;
             font-size: 14px;
             font-weight: normal;
@@ -438,7 +438,7 @@ export default {
             box-shadow: 0 8px 30px 0 #bcc9e380;
             z-index: 999;
             .drop_down_list_item {
-              margin: 0 6px;
+              margin: 0 10px;
               padding: 0 10px;
               white-space: nowrap;
               line-height: 35px;
@@ -488,7 +488,8 @@ export default {
     position: relative;
     width: 100%;
     height: calc(100% - 80px);
-    overflow: auto;
+    //overflow: auto;
+    padding: 0 16px 10px;
   }
 }
 </style>

src/views/regionSection/regionManage/regionManage.vue

@@ -290,7 +290,7 @@
 </template>
 
 <script>
-import { generateRandomString, pwdCheck, reg } from "@/utils";
+import { codeCheck, generateRandomString, pwdCheck, reg } from "@/utils";
 import {
   region_list_admin,
   region_delete,
@@ -416,7 +416,7 @@ export default {
         regionCode: [
           {
             required: true,
-            message: "请输入6位区域码",
+            validator: codeCheck,
             trigger: "blur"
           }
         ],

src/views/regionSection/search/deviceModel.vue

@@ -85,7 +85,7 @@ export default {
         },
         {
           title: "学校设备总数",
-          key: "deviceModel",
+          key: "totalnum",
           width: 140,
           align: "center"
         }

src/views/schoolSection/applicationManage/applicationList.vue

@@ -245,13 +245,13 @@
               <span>选择是时，设备上允许清除该应用对应的缓存。</span>
             </div>
           </FormItem>
-          <FormItem label="默认授权" style="width: 100%">
+          <FormItem label="添加到已有策略" style="width: 100%">
             <div class="comm">
               <RadioGroup v-model="wallpaperInfo.strategy">
                 <Radio :label="1">是</Radio>
                 <Radio :label="0">否</Radio>
               </RadioGroup>
-              <span>仅对新建策略生效;选择是时，新建策略默认授权该应用。</span>
+              <span>选择添加到已有策略，则当前应用会被添加到其授权的且不存在相同包名应用的学校策略。</span>
             </div>
           </FormItem>
           <FormItem label="适配设备" style="width: 100%" class="require">

src/views/schoolSection/index.vue

@@ -471,7 +471,8 @@ export default {
     position: relative;
     width: 100%;
     height: calc(100% - 80px);
-    overflow: auto;
+    //overflow: auto;
+    padding: 0 16px 10px;
   }
 }
 </style>

src/views/schoolSection/strategy/strategyManage.vue

@@ -137,8 +137,8 @@ export default {
 
 <style lang="less" scoped>
 .main_root {
-  width: calc(100% - 32px);
-  height: calc(100% - 60px);
+  width: 100%;
+  height: 100%;
   background-color: transparent;
   border: none;
   display: flex;

src/views/schoolSection/userManage/userManage.vue

@@ -981,8 +981,8 @@ export default {
 
 <style lang="less" scoped>
 .main_root {
-  width: calc(100% - 32px);
-  height: calc(100% - 60px);
+  width: 100%;
+  height: 100%;
   background-color: transparent;
   border: none;
   display: flex;