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

src/utils/index.js

@@ -2,6 +2,17 @@
 let _timezone = 8; //目标时区时间，东八区   东时区正数 西时区负数
 let _offset_GMT = new Date().getTimezoneOffset(); // 本地时间和格林威治的时间差，单位为分钟
 let diffTime = _offset_GMT * 60 * 1000 + _timezone * 60 * 60 * 1000; //0
+
+export const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{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 {
+    callback();
+  }
+};
 export const weekDay = [
   {
     label: "周日",
@@ -342,7 +353,7 @@ export function hexToRgba(hex, opacity) {
   return rgbaColor;
 }
 // 包含大小写字母和数字的随机组合
-export const generateRandomString = (n = 8) => {
+export const generateRandomString = (n = 6) => {
   let chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   let result = "";
   let hasUpperCase = false;

src/views/layout.vue

@@ -85,7 +85,7 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          注：密码必须是6-16位的大小写英文字母、数字组合。
         </div>
         <div>
           <Button @click="pwInfo.show = false">取消</Button>
@@ -161,17 +161,9 @@
 import { admin_detail, admin_edit_phone, admin_edit_pwd } from "@/api/admin";
 import { login_msg_code } from "@/api/login";
 import { logdoperatemsg_get_nrn } from "@/api/log";
-
+import { pwdCheck, reg } from "@/utils";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(value)) {
-        return callback(new Error("密码格式不正确!"));
-      }
-      callback();
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(value)) {

src/views/login/login.vue

@@ -317,6 +317,7 @@ export default {
     transform: translateY(-50%);
     right: 16%;
     .welcome {
+      margin-bottom: 20px;
       height: 30px;
       color: #000000;
       font-size: 24px;

src/views/platformSection/regionManage/adminManage.vue

@@ -198,7 +198,7 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          注：密码必须是6-16位的大小写英文字母、数字组合。
         </div>
         <div>
           <Button @click="adminInfo.show = false">取消</Button>
@@ -259,18 +259,9 @@ import {
 } from "@/api/admin";
 import { region_list_sel_pt } from "@/api/region";
 import { login_msg_code } from "@/api/login";
-import { generateRandomString } from "@/utils";
+import { generateRandomString, pwdCheck, reg } from "@/utils";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(this.adminInfo.loginpwd)) {
-        return callback(new Error("密码格式不正确。"));
-      } else {
-        callback();
-      }
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(this.adminInfo.loginpwd1)) {
@@ -501,7 +492,7 @@ export default {
         adminid: null,
         aname: "",
         loginname: "",
-        loginpwd: generateRandomString(8),
+        loginpwd: generateRandomString(),
         loginpwd1: "",
         phone: "",
         msgcode: "",

src/views/platformSection/regionManage/regionManage.vue

@@ -142,7 +142,7 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          注：密码必须是6-16位的大小写英文字母、数字组合。
         </div>
         <div>
           <Button @click="regionInfo.show = false">取消</Button>
@@ -230,7 +230,7 @@
 </template>
 
 <script>
-import { generateRandomString } from "@/utils";
+import { generateRandomString, pwdCheck, reg } from "@/utils";
 import {
   region_list_pt,
   region_list_admin,
@@ -241,15 +241,6 @@ import {
 import { login_msg_code } from "@/api/login";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(this.regionInfo.admin.loginpwd)) {
-        return callback(new Error("密码格式不正确。"));
-      } else {
-        callback();
-      }
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(this.regionInfo.admin.loginpwd1)) {
@@ -522,7 +513,7 @@ export default {
         admin: {
           aname: "",
           loginname: "",
-          loginpwd: generateRandomString(8),
+          loginpwd: generateRandomString(),
           loginpwd1: "",
           phone: "",
           msgcode: "",

src/views/regionSection/regionManage/adminManage.vue

@@ -178,45 +178,49 @@
             placeholder="请输入描述信息"
           ></Input>
         </FormItem>
-        <FormItem label="账号类型" style="width: 100%">
-          <RadioGroup v-model="adminInfo.userType">
-            <Radio :label="1">区域管理员</Radio>
-            <Radio :label="2">学校管理员</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem label="所属区域" prop="regionid" style="width: 100%">
-          <Select
-            :transfer="true"
-            v-model="adminInfo.regionid"
-            style="width: calc(50% - 65px)"
-          >
-            <Option
-              v-for="item in searchForm.dropList"
-              :value="item.regionid"
-              :key="item.regionid"
-              >{{ item.regionName }}</Option
+        <div v-if="!adminInfo.adminid">
+          <FormItem label="账号类型" style="width: 100%">
+            <RadioGroup v-model="adminInfo.atype">
+              <Radio :label="2">区域管理员</Radio>
+              <Radio :label="3">学校管理员</Radio>
+            </RadioGroup>
+          </FormItem>
+          <FormItem label="所属区域" prop="regionid" style="width: 100%">
+            <Select
+              :transfer="true"
+              v-model="adminInfo.regionid"
+              @on-change="regionidChange"
+              style="width: calc(50% - 65px)"
             >
-          </Select>
-        </FormItem>
-        <FormItem
-          v-if="adminInfo.userType === 2"
-          label="选择学校"
-          prop="schoolid"
-          style="width: 100%"
-        >
-          <Select
-            :transfer="true"
-            v-model="adminInfo.schoolid"
-            style="width: calc(50% - 65px)"
+              <Option
+                v-for="item in searchForm.dropList"
+                :value="item.regionid"
+                :key="item.regionid"
+                >{{ item.regionName }}</Option
+              >
+            </Select>
+          </FormItem>
+          <FormItem
+            v-if="adminInfo.atype === 3"
+            label="选择学校"
+            prop="schoolid"
+            style="width: 100%"
           >
-            <Option
-              v-for="item in searchForm.schoolList"
-              :value="item.schoolid"
-              :key="item.schoolid"
-              >{{ item.schoolName }}</Option
+            <Select
+              :transfer="true"
+              v-model="adminInfo.schoolid"
+              @on-open-change="openSchoolList"
+              style="width: calc(50% - 65px)"
             >
-          </Select>
-        </FormItem>
+              <Option
+                v-for="item in searchForm.schoolList"
+                :value="item.schoolid"
+                :key="item.schoolid"
+                >{{ item.schoolName }}</Option
+              >
+            </Select>
+          </FormItem>
+        </div>
       </Form>
       <div
         slot="footer"
@@ -227,7 +231,7 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          注：密码必须是6-16位的大小写英文字母、数字组合。
         </div>
         <div>
           <Button @click="adminInfo.show = false">取消</Button>
@@ -261,6 +265,14 @@
         <FormItem label="所属区域" style="margin-bottom: 0; width: 100%">{{
           viewInfo.regionName
         }}</FormItem>
+        <FormItem
+          label="地址"
+          style="margin-bottom: 0; width: calc(50% - 10px)"
+          >{{ viewInfo.address }}</FormItem
+        >
+        <FormItem label="描述信息" style="margin-bottom: 0; width: 100%">{{
+          viewInfo.comm
+        }}</FormItem>
       </Form>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
@@ -285,18 +297,10 @@ import {
 } from "@/api/admin";
 import { region_list_sel_qy } from "@/api/region";
 import { login_msg_code } from "@/api/login";
-import { generateRandomString } from "@/utils";
+import { generateRandomString, pwdCheck, reg } from "@/utils";
+import { school_list_rs } from "@/api/school";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(this.adminInfo.loginpwd)) {
-        return callback(new Error("密码格式不正确!"));
-      } else {
-        callback();
-      }
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(this.adminInfo.loginpwd1)) {
@@ -395,8 +399,9 @@ export default {
         msgcode: "",
         address: "",
         comm: "",
-        userType: 1,
+        atype: 2,
         enabled: 1,
+        schoolid: null,
         regionid: null
       },
       // 查看
@@ -406,7 +411,9 @@ export default {
         aname: "",
         loginname: "",
         phone: "",
-        regionName: ""
+        regionName: "",
+        address: "",
+        comm: ""
       },
       columns: [
         {
@@ -490,6 +497,25 @@ export default {
     this.searchList();
   },
   methods: {
+    regionidChange() {
+      this.showLoading = true;
+      school_list_rs({ regionid: this.adminInfo.regionid }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.searchForm.schoolList = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    openSchoolList(val) {
+      //展开
+      if (val) {
+        if (!this.adminInfo.regionid) {
+          this.$Message.error("请选择区域!");
+        }
+      }
+    },
     // 获取搜索区域列表
     getSearchRegionList() {
       this.showLoading = true;
@@ -552,14 +578,15 @@ export default {
         adminid: null,
         aname: "",
         loginname: "",
-        loginpwd: generateRandomString(8),
+        loginpwd: generateRandomString(),
         loginpwd1: "",
         phone: "",
         msgcode: "",
         enabled: 1,
         address: "",
         comm: "",
-        userType: 1,
+        atype: 2,
+        schoolid: null,
         regionid: null
       };
     },
@@ -644,6 +671,8 @@ export default {
             phone: this.adminInfo.phone,
             msgcode: this.adminInfo.msgcode,
             enabled: this.adminInfo.enabled,
+            atype: this.adminInfo.atype,
+            schoolid: this.adminInfo.schoolid || null,
             regionid: this.adminInfo.regionid,
             address: this.adminInfo.address,
             comm: this.adminInfo.comm
@@ -653,6 +682,7 @@ export default {
             form.adminid = this.adminInfo.adminid;
             form.rversion = this.adminInfo.rversion;
           }
+          console.log(form);
           this.showLoading = true;
           api(form).then((data) => {
             this.showLoading = false;
@@ -668,14 +698,28 @@ export default {
     },
     // 查看
     toView(row) {
-      this.viewInfo = {
-        show: true,
-        enabled: row.enabled,
-        aname: row.aname,
-        loginname: row.loginname,
-        phone: row.phone,
-        regionName: row.regionName
-      };
+      this.showLoading = true;
+      admin_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        adminid: row.adminid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.viewInfo = {
+            show: true,
+            enabled: res.obj.enabled,
+            aname: res.obj.aname,
+            loginname: res.obj.loginname,
+            phone: res.obj.phone,
+            regionName: res.obj.regionName,
+            address: res.obj.address,
+            comm: res.obj.comm
+          };
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
     },
     // 编辑
     toEdit(row) {
@@ -699,8 +743,11 @@ export default {
             phone: res.obj.phone,
             msgcode: "",
             enabled: res.obj.enabled,
+            atype: res.obj.atype,
             regionid: res.obj.regionid,
-            rversion: row.rversion
+            rversion: row.rversion,
+            address: res.obj.address,
+            comm: res.obj.comm
           };
         } else {
           this.$Message.error(res.msg);

src/views/regionSection/regionManage/regionManage.vue

@@ -14,7 +14,12 @@
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
-            <div v-if="row.regionid != powerParams.objectid" @click="toEnter(row)">进入</div>
+            <div
+              v-if="row.regionid != powerParams.objectid"
+              @click="toEnter(row)"
+            >
+              进入
+            </div>
             <div @click="toView(row)">查看</div>
             <div @click="toEdit(row)">编辑</div>
             <div class="action_del" @click="toDel(row)">删除</div>
@@ -127,15 +132,15 @@
         </FormItem>
         <FormItem label="地址" style="width: 100%">
           <Input
-              v-model="regionInfo.admin.address"
-              placeholder="请输入地址"
+            v-model="regionInfo.admin.address"
+            placeholder="请输入地址"
           ></Input>
         </FormItem>
         <FormItem label="描述信息" style="width: 100%">
           <Input
-              type="textarea"
-              v-model="regionInfo.admin.comm"
-              placeholder="请输入描述信息"
+            type="textarea"
+            v-model="regionInfo.admin.comm"
+            placeholder="请输入描述信息"
           ></Input>
         </FormItem>
       </Form>
@@ -148,7 +153,7 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          注：密码必须是6-16位的大小写英文字母、数字组合。
         </div>
         <div>
           <Button @click="regionInfo.show = false">取消</Button>
@@ -285,7 +290,7 @@
 </template>
 
 <script>
-import { generateRandomString } from "@/utils";
+import { generateRandomString, pwdCheck, reg } from "@/utils";
 import {
   region_list_admin,
   region_delete,
@@ -298,14 +303,6 @@ import {
 import { login_msg_code } from "@/api/login";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(value)) {
-        return callback(new Error("密码格式不正确!"));
-      }
-      callback();
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(value)) {
@@ -731,7 +728,7 @@ export default {
         admin: {
           aname: "",
           loginname: "",
-          loginpwd: generateRandomString(8),
+          loginpwd: generateRandomString(),
           loginpwd1: "",
           phone: "",
           msgcode: "",

src/views/regionSection/regionManage/schoolManage.vue

@@ -261,6 +261,19 @@
               }}
             </div>
           </FormItem>
+          <FormItem label="地址" style="width: 100%">
+            <Input
+              v-model="adminInfo.admin.address"
+              placeholder="请输入地址"
+            ></Input>
+          </FormItem>
+          <FormItem label="描述信息" style="width: 100%">
+            <Input
+              type="textarea"
+              v-model="adminInfo.admin.comm"
+              placeholder="请输入描述信息"
+            ></Input>
+          </FormItem>
         </div>
       </Form>
       <div
@@ -272,7 +285,9 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          <span v-if="adminInfo.createAdmin"
+            >注：密码必须是6-16位的大小写英文字母、数字组合。</span
+          >
         </div>
         <div>
           <Button @click="adminInfo.show = false">取消</Button>
@@ -280,37 +295,6 @@
         </div>
       </div>
     </Modal>
-    <!-- 查看 -->
-    <Modal
-      class="modal1"
-      :mask-closable="false"
-      v-model="viewInfo.show"
-      title="查看"
-    >
-      <div class="view_title">
-        <div>{{ viewInfo.aname }}</div>
-        <div v-if="viewInfo.enabled === 1" class="enabled_1">启用</div>
-        <div v-if="viewInfo.enabled === 2" class="enabled_2">禁用</div>
-      </div>
-      <Form :label-width="80" inline>
-        <FormItem
-          label="登录账号"
-          style="margin-bottom: 0; width: calc(50% - 10px)"
-          >{{ viewInfo.loginname }}</FormItem
-        >
-        <FormItem
-          label="手机号码"
-          style="margin-bottom: 0; width: calc(50% - 10px)"
-          >{{ viewInfo.phone }}</FormItem
-        >
-        <FormItem label="所属区域" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.regionName
-        }}</FormItem>
-      </Form>
-      <div slot="footer" style="text-align: center">
-        <Button @click="viewInfo.show = false">关闭</Button>
-      </div>
-    </Modal>
     <Spin fix v-if="showLoading" style="background-color: transparent">
       <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
       <div>加载中</div>
@@ -321,7 +305,7 @@
 <script>
 import { region_list_sel_qy } from "@/api/region";
 import { login_msg_code } from "@/api/login";
-import { generateRandomString } from "@/utils";
+import { generateRandomString, pwdCheck, reg } from "@/utils";
 import {
   area_list_sel,
   school_add,
@@ -334,15 +318,6 @@ import {
 } from "@/api/school";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(this.adminInfo.admin.loginpwd)) {
-        return callback(new Error("密码格式不正确!"));
-      } else {
-        callback();
-      }
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(this.adminInfo.admin.loginpwd1)) {
@@ -389,7 +364,9 @@ export default {
           loginname: "",
           loginpwd: "",
           phone: "",
-          msgcode: ""
+          msgcode: "",
+          address: "",
+          comm: ""
         }
       },
       rules: {
@@ -429,15 +406,6 @@ export default {
           }
         ]
       },
-      // 查看
-      viewInfo: {
-        show: false,
-        enabled: "",
-        aname: "",
-        loginname: "",
-        phone: "",
-        regionName: ""
-      },
       columns: [
         {
           title: "序号",
@@ -647,10 +615,12 @@ export default {
         admin: {
           aname: "",
           loginname: "",
-          loginpwd: generateRandomString(8),
+          loginpwd: generateRandomString(),
           loginpwd1: "",
           phone: "",
-          msgcode: ""
+          msgcode: "",
+          address: "",
+          cpmm: ""
         }
       };
     },
@@ -749,7 +719,9 @@ export default {
               loginname: this.adminInfo.admin.loginname,
               loginpwd: this.adminInfo.admin.loginpwd,
               phone: this.adminInfo.admin.phone,
-              msgcode: this.adminInfo.admin.msgcode
+              msgcode: this.adminInfo.admin.msgcode,
+              address: this.adminInfo.admin.address,
+              comm: this.adminInfo.admin.comm
             };
           }
           this.showLoading = true;

src/views/schoolSection/userManage/userManage.vue

@@ -302,7 +302,7 @@
         "
       >
         <div style="color: #b50000">
-          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+          注：密码必须是6-16位的大小写英文字母、数字组合。
         </div>
         <div>
           <Button @click="addInfo.show = false">取消</Button>
@@ -333,22 +333,11 @@ import {
 } from "@/api/school";
 import { user_add, user_edit } from "@/api/school";
 import { exportToExcel } from "@/utils/exportToExcel";
-
+import { generateRandomString, pwdCheck, reg} from "@/utils";
 export default {
   data() {
-    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
-    // 密码验证
-    const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(value)) {
-        return callback(new Error("密码格式不正确!"));
-      }
-      callback();
-    };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error("确认密码不能为空!"));
-      }
       if (!reg.test(value)) {
         return callback(new Error("密码格式不正确!"));
       }
@@ -417,6 +406,7 @@ export default {
         username: "",
         loginname: "",
         loginpwd: "",
+        loginpwd1: "",
         classid: "",
         classname: "",
         schoolid: null,
@@ -654,7 +644,8 @@ export default {
         usersex: 1,
         username: "",
         loginname: "",
-        loginpwd: "",
+        loginpwd: generateRandomString(),
+        loginpwd1: "",
         classid: "",
         classname: "",
         schoolid: null,