From 6b6db300fe09a09a098cc2262bd8a4896e1a5ca9 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Fri, 28 Jul 2023 18:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E6=97=8F=20=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utlis/validate.js                         |  6 ++-
 src/views/Home.vue                            |  8 ++++
 src/views/basic-dictionary/Nation.vue         | 14 +++---
 src/views/basic-dictionary/ResultStatus.vue   |  4 +-
 .../customerOrg/patientRegisterRecover.vue    |  4 +-
 src/views/login/Login.vue                     | 33 +++++++++-----
 src/views/user-list/AuditLog.vue              |  4 +-
 src/views/user-list/UserList.vue              | 44 ++++++++++++-------
 8 files changed, 77 insertions(+), 40 deletions(-)

diff --git a/src/utlis/validate.js b/src/utlis/validate.js
index b76ebb3..8a60bdf 100644
--- a/src/utlis/validate.js
+++ b/src/utlis/validate.js
@@ -33,7 +33,7 @@ export const yzstr = (value) => {
     if (!reg.test(s1)) {
       isyz = false;
     } else {
-      isyz = true;
+      isyz = true; 
     }
   } else {
     //失败
@@ -43,3 +43,7 @@ export const yzstr = (value) => {
 
   return isyz;
 };
+//正则校验密码
+const regex = /^.{6,15}$/;
+export const isValid = regex.test();
+console.log(isValid);
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index eff1147..cfb5f5e 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -566,8 +566,10 @@ export default {
     logout() {
       // localStorage.removeItem("tokentype");
       // localStorage.removeItem("token");
+      // localStorage.removeItem(['expires_in','tokentype','refresh_token','user','token'])
       localStorage.clear();
       this.$router.push({ path: "/login" });
+       
     },
     aa(aa) {
       console.log(aa);
@@ -577,10 +579,16 @@ export default {
 };
 </script>
 <style scoped>
+.el-dropdown-item{
+  text-align: center;
+}
 .el-dropdown-menu {
+  text-align: center;
   overflow: scroll;
   max-height: 500px;
+  width: 150px;
   overflow-x: hidden;
+  /* margin-left: 5%; */
 }
 .el-header {
   position: fixed;
diff --git a/src/views/basic-dictionary/Nation.vue b/src/views/basic-dictionary/Nation.vue
index 4fc1a93..65af654 100644
--- a/src/views/basic-dictionary/Nation.vue
+++ b/src/views/basic-dictionary/Nation.vue
@@ -19,13 +19,13 @@
         <el-table
           :data="tableData"
           style="width: 100%; height: 500px"
-          row-key="id"
+          row-key="nationId"
           :height="tableHeight"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
           highlight-current-row
         >
-          <el-table-column prop="id" label="编号" width="300">
+          <el-table-column prop="nationId" label="编号" width="300">
           </el-table-column>
           <el-table-column prop="displayName" label="名称" width="">
           </el-table-column>
@@ -314,7 +314,7 @@ export default {
         const currentDisplayOrder = this.initTableData[index].displayOrder;
         if (item.displayOrder != currentDisplayOrder) {
           // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
-          result.push({ id: item.id, displayOrder: currentDisplayOrder });
+          result.push({ nationId: item.nationId, displayOrder: currentDisplayOrder });
         }
       });
       // console.log('assertion', result);
@@ -353,10 +353,10 @@ export default {
     },
     //置顶
     topping() {
-      if (this.form.id == undefined) {
+      if (this.form.nationId == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
-        opBottomtheFamousclan(this.form.id, 1).then((res) => {
+        opBottomtheFamousclan(this.form.nationId, 1).then((res) => {
           this.$message.success("操作成功");
           this.getlist();
         });
@@ -436,8 +436,8 @@ export default {
     getlist() {
       console.log(this.pages);
       ethniclist(this.pages).then((res) => {
-        this.initTableData = [...res.data.items];
-        this.tableData = res.data.items;
+        this.initTableData = [...res.data];
+        this.tableData = res.data;
         this.totalCount = res.data.totalCount;
         console.log(res);
       });
diff --git a/src/views/basic-dictionary/ResultStatus.vue b/src/views/basic-dictionary/ResultStatus.vue
index 89143da..ada4bc9 100644
--- a/src/views/basic-dictionary/ResultStatus.vue
+++ b/src/views/basic-dictionary/ResultStatus.vue
@@ -196,7 +196,7 @@ export default {
       pages: {
         // currentPage: 0,
         SkipCount: 0,
-        MaxResultCount: 5,
+        MaxResultCount: 100,
         Sorting: "displayOrder desc",
         // totalCount: 0,
       },
@@ -342,7 +342,7 @@ export default {
               ),
               dataInputFontColor: Number(this.form.dataInputFontColor),
             };
-            statusmodification(this.form.resultStatusId, obj).then((res) => {
+            statusmodification(this.form.id, obj).then((res) => {
               this.$message.success("修改成功");
               this.getlist();
               this.dialogVisible = false;
diff --git a/src/views/customerOrg/patientRegisterRecover.vue b/src/views/customerOrg/patientRegisterRecover.vue
index 68aabab..d2332d9 100644
--- a/src/views/customerOrg/patientRegisterRecover.vue
+++ b/src/views/customerOrg/patientRegisterRecover.vue
@@ -117,7 +117,9 @@ export default {
       //民族
       getapi("/api/app/nation/in-filter").then((res) => {
         if (res.code == 1) {
-          this.dict.nation = res.data.items;
+          // this.dict.nation = res.data.items;
+           this.dict.nation = res.data;
+          console.log(res,'名族');
         }
       });
 
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index ad823f8..a225680 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -60,7 +60,7 @@ export default {
     };
   },
   methods: {
-    onSubmit() {
+  async  onSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
           // lognis({
@@ -98,17 +98,26 @@ export default {
               }
             )
             .then((res) => {
-              //console.log(res.data)
-              writetoken(res.data.expires_in);
-              window.localStorage.setItem("token", res.data.access_token);
-              window.localStorage.setItem("refresh_token",res.data.refresh_token);
-              // window.localStorage.setItem("expires_in", res.data.expires_in);
-              window.localStorage.setItem("tokentype", res.data.token_type);
-              window.localStorage.setItem("user", this.form.Username);              
-              this.$message.success("登录成功");
-              this.$router.push({ path: "home" });
-              // this.$store.dispatch('changepassword',this.form.Password)
-              this.$store.state.changepassword=this.form.Password
+              console.log(res, "222222");
+              
+              if (res.status == 200) {
+                //console.log(res.data)
+                writetoken(res.data.expires_in);
+                window.localStorage.setItem("token", res.data.access_token);
+                window.localStorage.setItem(
+                  "refresh_token",
+                  res.data.refresh_token
+                );
+                // window.localStorage.setItem("expires_in", res.data.expires_in);
+                window.localStorage.setItem("tokentype", res.data.token_type);
+                window.localStorage.setItem("user", this.form.Username);
+                this.$message.success("登录成功");
+                this.$router.push({ path: "home" });
+                // this.$store.dispatch('changepassword',this.form.Password)
+                this.$store.state.changepassword = this.form.Password;
+              } else {
+                this.$message.warning("用户名或密码错误");
+              }
             });
         }
       });
diff --git a/src/views/user-list/AuditLog.vue b/src/views/user-list/AuditLog.vue
index 51274da..d5acb5e 100644
--- a/src/views/user-list/AuditLog.vue
+++ b/src/views/user-list/AuditLog.vue
@@ -24,7 +24,7 @@
             {{ scope.row.executionTime | dateFormat }}
           </template>
         </el-table-column>
-        <el-table-column prop="browserInfo" label="浏览器信息" width="180">
+        <el-table-column prop="browserInfo" label="浏览器信息" width="">
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -60,7 +60,7 @@
               {{ scope.row.executionTime | dateFormat }}
             </template>
           </el-table-column>
-          <el-table-column prop="browserInfo" label="浏览器信息" width="180">
+          <el-table-column prop="browserInfo" label="浏览器信息" width="">
           </el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index f6f9b33..9580c5b 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -205,7 +205,6 @@
                 label: 'displayName',
                 children: 'treeChildren',
               }"
-              
               :default-checked-keys="defaultchekedKeys"
               :default-expand-all="true"
               show-checkbox
@@ -408,13 +407,13 @@
       </el-dialog>
       <!-- 修改密码弹框 -->
       <el-dialog
-        title="修改密码"
+        :title="'修改密码' + '当前用户' + usersName"
         :visible.sync="editpassworddialogVisible"
         width="30%"
       >
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="新密码">
-            <el-input v-model="newPassWord"></el-input>
+            <el-input v-model="newPassWord" max="16" min="6"></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -445,6 +444,7 @@ import {
   lognis,
 } from "../../request/ruquset";
 import { mapState } from "vuex";
+import { isValid } from "@/utlis/validate";
 import { getapi, postapi } from "@/api/api";
 // let validatePassword = (rule, value, callback) => {
 //   var reg1 =
@@ -458,11 +458,12 @@ import { getapi, postapi } from "@/api/api";
 //     callback();
 //   }
 // };
-let validatePassword = /^[a-zA-Z]\w{5,8}$/;
+let validatePassword = /^[a-zA-Z0-9@\$\^\.\*\\?]\{6,15}$/;
 export default {
   data() {
     return {
-      defaultchekedKeys:[],//默认选中的科室
+      usersName: "", //用户名
+      defaultchekedKeys: [], //默认选中的科室
       department: [], //选中的科室
       setupdepartments: [], //设置科室
       newPassWord: "", //新密码
@@ -492,10 +493,16 @@ export default {
             message: "密码不能为空",
           },
           {
-            required: true,
+            min: 6,
+            max: 15,
+            message: "长度在 6 到 15 个字符",
             trigger: "blur",
-            validator: validatePassword,
           },
+          // {
+          //   required: true,
+          //   trigger: "blur",
+          //   validator: validatePassword,
+          // },
         ],
         email: [
           {
@@ -539,7 +546,7 @@ export default {
       checkList: [], //多选框
       pages: {
         SkipCount: 0,
-        MaxResultCount: 5,
+        MaxResultCount: 100,
         Filter: "",
         // Filter:{
         //   userName:this.form.userName,
@@ -595,6 +602,7 @@ export default {
     editpassword(row) {
       this.editpassworddialogVisible = true;
       this.passwordid = row.id;
+      this.usersName = row.userName;
     },
     //新增选择的
     ischesc() {
@@ -821,14 +829,20 @@ export default {
                     orgId: this.defaultKeys,
                   }).then((res) => {
                     console.log(res);
+                    postapi(
+                      `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
+                      this.department
+                    ).then((res) => {
+                      // this.$message.success("操作成功");
+                    });
                     // this.$message.success("修改绑定组织成功");
                   });
-                  postapi(
-                    `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
-                    this.department
-                  ).then((res) => {
-                    // this.$message.success("操作成功");
-                  });
+                  // postapi(
+                  //   `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
+                  //   this.department
+                  // ).then((res) => {
+                  //   // this.$message.success("操作成功");
+                  // });
                   console.log("aaaaaa");
                 }
               });
@@ -893,7 +907,7 @@ export default {
           `/api/app/abpuserdepartment/getuserdepartment?UserId=${row.id}`
         ).then((res) => {
           // default-checked-keys
-          this.defaultchekedKeys=res.data
+          this.defaultchekedKeys = res.data;
           console.log(res, "科室");
         });
       }