密码验证优化；应用策略时间可不选；隐藏设置”启用截屏“

src/utils/index.js

@@ -2,11 +2,14 @@
 let _timezone = 8; //目标时区时间，东八区   东时区正数 西时区负数
 let _offset_GMT = new Date().getTimezoneOffset(); // 本地时间和格林威治的时间差，单位为分钟
 let diffTime = _offset_GMT * 60 * 1000 + _timezone * 60 * 60 * 1000; //0
-
+/**
+ * 字符串是6-16位的大小写英文字母、数字组合。
+ */
 export const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,16}$/;
-// 密码验证
+/**
+ * 字符串是6-16位的大小写英文字母、数字组合。
+ */
 export const pwdCheck = (rule, value, callback) => {
-  const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,16}$/;
   if (!reg.test(value)) {
     return callback(new Error("密码格式不正确!"));
   } else {

src/views/platformSection/regionManage/adminManage.vue

@@ -547,11 +547,8 @@ export default {
             this.adminInfo.adminid &&
             (this.adminInfo.loginpwd || this.adminInfo.loginpwd1)
           ) {
-            const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
             if (!reg.test(this.adminInfo.loginpwd)) {
-              this.$Message.error(
-                "密码必须包含大小写字母和数字的组合，长度在8-32之间。"
-              );
+              this.$Message.error("密码格式不正确。");
               return;
             }
             if (this.adminInfo.loginpwd != this.adminInfo.loginpwd1) {

src/views/platformSection/regionManage/regionManage.vue

@@ -82,7 +82,11 @@
             placeholder="请输入登录账号"
           ></Input>
         </FormItem>
-        <FormItem label="密码" prop="loginpwd" style="width: calc(50% - 10px)">
+        <FormItem
+          label="密码"
+          prop="admin.loginpwd"
+          style="width: calc(50% - 10px)"
+        >
           <Input
             v-model="regionInfo.admin.loginpwd"
             placeholder="请输入密码"
@@ -90,7 +94,7 @@
         </FormItem>
         <FormItem
           label="确认密码"
-          prop="loginpwd1"
+          prop="admin.loginpwd1"
           style="width: calc(50% - 10px)"
         >
           <Input
@@ -98,7 +102,11 @@
             placeholder="请输入确认密码"
           ></Input>
         </FormItem>
-        <FormItem label="手机号码" prop="phone" style="width: calc(50% - 10px)">
+        <FormItem
+          label="手机号码"
+          prop="admin.phone"
+          style="width: calc(50% - 10px)"
+        >
           <Input
             v-model="regionInfo.admin.phone"
             placeholder="请输入手机号码"
@@ -119,13 +127,13 @@
             }}
           </div>
         </FormItem>
-        <FormItem label="地址" prop="address" style="width: 100%">
+        <FormItem label="地址" prop="admin.address" style="width: 100%">
           <Input
             v-model="regionInfo.admin.address"
             placeholder="请输入地址"
           ></Input>
         </FormItem>
-        <FormItem label="描述信息" prop="comm" style="width: 100%">
+        <FormItem label="描述信息" prop="admin.comm" style="width: 100%">
           <Input
             type="textarea"
             v-model="regionInfo.admin.comm"
@@ -351,7 +359,7 @@ export default {
             trigger: "blur"
           }
         ],
-        loginpwd: [
+        "admin.loginpwd": [
           {
             required: true,
             validator: pwdCheck,

src/views/regionSection/regionManage/adminManage.vue

@@ -637,7 +637,6 @@ export default {
             this.adminInfo.adminid &&
             (this.adminInfo.loginpwd || this.adminInfo.loginpwd1)
           ) {
-            const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
             if (!reg.test(this.adminInfo.loginpwd)) {
               this.$Message.error("密码格式不正确!");
               return;

src/views/schoolSection/applicationStrategy/appStrategyManageEdit.vue

@@ -319,10 +319,10 @@ export default {
     },
     toAddStrategySet() {
       let _tempStrategyInfo = JSON.parse(JSON.stringify(this.tempStrategyInfo));
-      if (_tempStrategyInfo.times.length === 0) {
-        this.$Message.error("请选择时间范围");
-        return;
-      }
+      // if (_tempStrategyInfo.times.length === 0) {
+      //   this.$Message.error("请选择时间范围");
+      //   return;
+      // }
       if (_tempStrategyInfo.apps.length === 0) {
         this.$Message.error("请选择应用");
         return;

src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue

@@ -297,10 +297,10 @@ export default {
     },
     toAddStrategySet() {
       let _tempStrategyInfo = JSON.parse(JSON.stringify(this.tempStrategyInfo));
-      if (_tempStrategyInfo.times.length === 0) {
-        this.$Message.error("请选择时间范围");
-        return;
-      }
+      // if (_tempStrategyInfo.times.length === 0) {
+      //   this.$Message.error("请选择时间范围");
+      //   return;
+      // }
       if (_tempStrategyInfo.apps.length === 0) {
         this.$Message.error("请选择应用");
         return;

src/views/schoolSection/applicationStrategy/appStrategyTemplateEdit.vue

@@ -320,10 +320,10 @@ export default {
     },
     toAddStrategySet() {
       let _tempStrategyInfo = JSON.parse(JSON.stringify(this.tempStrategyInfo));
-      if (_tempStrategyInfo.times.length === 0) {
-        this.$Message.error("请选择时间范围");
-        return;
-      }
+      // if (_tempStrategyInfo.times.length === 0) {
+      //   this.$Message.error("请选择时间范围");
+      //   return;
+      // }
       if (_tempStrategyInfo.apps.length === 0) {
         this.$Message.error("请选择应用");
         return;

src/views/schoolSection/setting/deviceSetting.vue

@@ -115,12 +115,12 @@
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem> -->
-        <FormItem label="启用截屏">
+        <!-- <FormItem label="启用截屏">
           <RadioGroup v-model="menuInfo.setDetail.screenshots">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
         <!-- <FormItem label="启用客户端管理员">
           <RadioGroup v-model="menuInfo.setDetail.clientAdmin">
             <Radio :label="1">是</Radio>
@@ -267,7 +267,7 @@ export default {
           accelerate: 0,
           // gesturePwd: 0,
           // wifiAdvanced: 0,
-          screenshots: 0,
+          // screenshots: 0,
           // clientAdmin: 0,
           rotateSetting: 0,
           gallery: 0,
@@ -385,7 +385,7 @@ export default {
               accelerate: 0,
               // gesturePwd: 0,
               // wifiAdvanced: 0,
-              screenshots: 0,
+              // screenshots: 0,
               // clientAdmin: 0,
               rotateSetting: 0,
               gallery: 0,
@@ -460,7 +460,7 @@ export default {
         accelerate: this.menuInfo.setDetail.accelerate,
         // gesturePwd: this.menuInfo.setDetail.gesturePwd,
         // wifiAdvanced: this.menuInfo.setDetail.wifiAdvanced,
-        screenshots: this.menuInfo.setDetail.screenshots,
+        // screenshots: this.menuInfo.setDetail.screenshots,
         // clientAdmin: this.menuInfo.setDetail.clientAdmin,
         rotateSetting: this.menuInfo.setDetail.rotateSetting,
         gallery: this.menuInfo.setDetail.gallery,