From 99dc9c330c472ff8b4601aaf2cfc4ee8f625f22b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 10 Sep 2024 13:45:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/auth.js        |   7 +
 src/layout/navbar/index.vue |  11 +-
 src/views/auth/index.vue    | 367 ++++++++++++++++++++----------------
 3 files changed, 217 insertions(+), 168 deletions(-)

diff --git a/src/api/auth/auth.js b/src/api/auth/auth.js
index 45155f3..38be5c4 100644
--- a/src/api/auth/auth.js
+++ b/src/api/auth/auth.js
@@ -7,3 +7,10 @@ export const modifyUser=(data)=>{
         data
     })
 }
+export const editPassword=(data)=>{
+    return request({
+        url:'/admin/mosr/user/update/password',
+        method:'post',
+        data
+    })
+}
diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue
index 40ddc5a..59bdd93 100644
--- a/src/layout/navbar/index.vue
+++ b/src/layout/navbar/index.vue
@@ -4,10 +4,13 @@
     <Breadcrumb></Breadcrumb>
     <div class="right-bar">
       <div class="user-box">
-       <div>
-<!--         <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">-->
-         <span>{{userInfo.userName}}</span>
-       </div>
+        <div @click.stop="handleVisitedP" style="cursor: pointer">
+          <div>{{ userInfo.userName }}
+            <el-icon style="margin-left: 5px">
+              <ArrowDownBold/>
+            </el-icon>
+          </div>
+        </div>
         <div class="person" v-if="visitedP">
           <ul>
             <li @click="handleToAuth">个人中心</li>
diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue
index 45e19cc..5498b2b 100644
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -6,37 +6,91 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>个人信息</span>
+              <div>个人信息</div>
             </div>
           </template>
           <div class="userDetail">
-            <!-- 头像上传 -->
-            <div class="userImg">
-              <el-image class="avatar" :src="userParams.avatar" fit="fill"/>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名:
+              </div>
+              <div>{{ userParams.userName }}</div>
             </div>
             <div class="userInfo_item">
-              <el-icon>
-                <UserFilled />
-              </el-icon>
-              用户呢称: <span>{{ userParams.nickName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名称:
+              </div>
+              <div>{{ userParams.nickName }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Notification/>
+                </el-icon>
+                工号:
+              </div>
+              <div>{{ userParams.workCode }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Phone/>
+                </el-icon>
+                电话号码:
+              </div>
+              <div>{{ userParams.mobile }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <House/>
+                </el-icon>
+                所属公司:
+              </div>
+              <div>{{ userParams.subCompanyName }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <FolderOpened/>
+                </el-icon>
+                所属部门:
+              </div>
+              <div>{{ userParams.departmentName }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Folder/>
+                </el-icon>
+                岗位:
+              </div>
+              <div>{{ userParams.jobActivityDesc }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Wallet/>
+                </el-icon>
+                账号类型:
+              </div>
+              <div>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                所属角色:
+              </div>
+              <div>{{ belongToRole(userParams.roles) }}</div>
             </div>
-            <div class="userInfo_item"><el-icon>
-              <Iphone />
-            </el-icon>电话号码: <span>{{ userParams.phoneNumber }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <Message />
-            </el-icon>用户邮箱:<span>{{ userParams.email }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <HomeFilled />
-            </el-icon>所属部门: <span>{{ userParams.city }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <OfficeBuilding />
-            </el-icon>所属角色: <span>{{ userParams.createBy }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <Calendar />
-            </el-icon>创建日期:<span>{{ userParams.loginDate }}</span> </div>
-          </div>
-          <div>
           </div>
         </el-card>
       </el-col>
@@ -45,143 +99,121 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>基本资料</span>
+              <div>{{ isInitPassword ? '修改密码' : '初始化密码' }}</div>
             </div>
           </template>
-
-          <el-tabs class="demo-tabs" v-model="activeName">
-            <el-tab-pane label="基本资料" name="first" >
-              <el-form
-                  :model="userParams"
-                  label-width="120px"
-                  class="demo-ruleForm"
-              >
-                <el-form-item label="用户昵称" prop="userName" :required="true" style="text-align:left">
-                  <el-input  v-model="userParams.nickName"/>
-                </el-form-item>
-                <el-form-item label="手机号码"  :required="true" style="text-align:left">
-                  <el-input v-model="userParams.phoneNumber"/>
-                </el-form-item>
-                <el-form-item label="邮箱" prop="email" :required="true" style="text-align:left">
-                  <el-input v-model="userParams.email"/>
-                </el-form-item>
-                <el-form-item label="性别" prop="sex">
-                  <el-radio-group v-model="userParams.sex">
-                    <el-radio label="0">男</el-radio>
-                    <el-radio label="1">女</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="submit">保存</el-button>
-                  <el-button @click="close">关闭</el-button>
-                </el-form-item>
-              </el-form>
-            </el-tab-pane>
-            <el-tab-pane label="修改密码" name="second">
-              <el-form label-width="120px" :model="userPassword">
-                <el-form-item label="旧密码" :required="true" style="text-align:left">
-                  <el-input placeholder="请输入旧密码" v-model="userPassword.oldPassWord"/>
-                </el-form-item>
-                <el-form-item label="新密码" :required="true" style="text-align:left">
-                  <el-input placeholder="请输入新密码" v-model="userPassword.newPassWord"/>
-                </el-form-item>
-                <el-form-item label="确认密码" :required="true" style="text-align:left">
-                  <el-input placeholder="请确认新密码" v-model="userPassword.querenPassWord"/>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="submit2">保存</el-button>
-                  <el-button @click="close">关闭</el-button>
-                </el-form-item>
-              </el-form>
-            </el-tab-pane>
-          </el-tabs>
+          <el-form label-width="120px" ref="passwordRef" :model="userPassword" :rules="rules">
+            <el-form-item label="旧密码" prop="oldPassword" :required="true" style="text-align:left" v-if="isInitPassword">
+              <el-input placeholder="请输入旧密码" v-model="userPassword.oldPassword" type="password"/>
+            </el-form-item>
+            <el-form-item label="新密码" prop="newPassword" :required="true" style="text-align:left">
+              <el-input placeholder="请输入新密码" v-model="userPassword.newPassword" type="password"/>
+            </el-form-item>
+            <el-form-item label="确认密码" prop="confirmPassword" :required="true" style="text-align:left">
+              <el-input placeholder="请确认新密码" v-model="userPassword.confirmPassword" type="password"/>
+            </el-form-item>
+            <el-form-item>
+              <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+              <el-button @click="close">关闭</el-button>
+            </el-form-item>
+          </el-form>
         </el-card>
       </el-col>
     </el-row>
   </div>
 </template>
 <script setup>
-import {getUserInfo} from '@/api/login';
-import {ref} from "vue";
-import {modifyUser} from '@/api/auth/auth'
-import { ElMessage } from 'element-plus'
-import { useTagsView } from '@/stores/tagsview.js'
-var userParams = ref({})
-var userPassword=ref({
-  oldPassWord:'',
-  newPassWord:'',
-  querenPassWord:''
-})
-const activeName = ref('first')
+import {ElNotification} from 'element-plus'
+import {useTagsView} from '@/stores/tagsview.js'
+import {editPassword} from "@/api/auth/auth";
+
+const isInitPassword = ref(false);
+const userParams = ref({});
+const passwordRef = ref();
+const router = useRouter()
+const userPassword = ref({
+  oldPassword: '',
+  newPassword: '',
+  confirmPassword: ''
+});
 const tagsViewStore = useTagsView()
-const getuserinfo=async ()=>{
-  await getUserInfo().then(res=>{
-    userParams.value=res.data.user
-  })
-}
+const validatePasswordComplexity = (rule, value, callback) => {
+  const reg = /^(?=.*[a-zA-Z])(?=.*\d).{1,9}$/; //密码必须是至少包含字母、数字，1-9位
+  if (!reg.test(value)) {
+    callback(new Error("密码必须是至少包含字母、数字，1-9位"));
+  } else {
+    callback();
+  }
+};
 
-// 修改资料
-const submit=async ()=>{
-  await modifyUser({
-    userName:userParams.value.userName,
-    nickName:userParams.value.nickName,
-    phoneNumber:userParams.value.phoneNumber,
-    email:userParams.value.email,
-    sex:userParams.value.sex,
-    userId:userParams.value.userId
-  }).then(res=>{
-    console.log(res)
-  })
+
+const validatePasswordEquality = (rule, value, callback) => {
+  if (userPassword.value.newPassword != value) {
+    callback(new Error("两次输入密码不一致!"));
+  } else {
+    callback();
+  }
 }
-// 修改密码
-const submit2=async ()=>{
-  await getUserInfo().then( res=>{
-    if(res.data!=''){
-      console.log(res.data.user.password)
-      if (userPassword.value.oldPassWord==res.data.user.password && userPassword.value.newPassWord==userPassword.value.querenPassWord){
-        modifyUser({
-          userName:userParams.value.userName,
-          nickName:userParams.value.nickName,
-          password:userPassword.value.newPassWord,
-          userId:userParams.value.userId
-        }).then(res=>{
-          ElMessage({
-            message: '修改密码成功',
-            type: 'success',
-          })
-        })
-      }else if(userPassword.value.oldPassWord!=res.data.user.password && userPassword.value.newPassWord==userPassword.value.querenPassWord){
-        ElMessage({
-          message: '旧密码错误',
-          type: 'error',
-        })
-      }else if(userPassword.value.oldPassWord==res.data.user.password && userPassword.value.newPassWord!=userPassword.value.querenPassWord){
-        ElMessage({
-          message: '新密码与确认密码不同',
-          type: 'error',
-        })
-      }
-    }else{
-      ElMessage({
-        message: '请求错误',
-        type: 'error',
-      })
+const rules = reactive({
+  oldPassword: [
+    {required: true, message: "旧密码不能为空", trigger: ["change", "blur"]},
+  ],
+  newPassword: [
+    {required: true, message: "新密码不能为空", trigger: ["change", "blur"]},
+    {
+      required: true,
+      trigger: ["change", "blur"],
+      validator: validatePasswordComplexity
     }
+  ],
+  confirmPassword: [
+    {required: true, message: "确认密码不能为空", trigger: ["change", "blur"]},
+    {
+      required: true,
+      trigger: ["change", "blur"],
+      validator: validatePasswordEquality
+    }
+  ],
+})
 
-
+const getInfo = async () => {
+  await getAuthInfo().then(res => {
+    userParams.value = res.data.user
+    isInitPassword.value = res.data.initPassword
   })
 }
+
+const belongToRole = (roles) => {
+  if (!roles) return;
+  return roles.map(item => item.roleName).join('，')
+}
+
+// 修改密码
+const handleSubmit = async () => {
+    editPassword({
+      ...userPassword.value
+    }).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        passwordRef.value.resetFields()
+      }
+    })
+}
 // 关闭
 const close = () => {
-  tagsViewStore.delVisitedViews({
-      path:"/auth",meta:{hidden: false, title: '个人中心', breadcrumb: true}})
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push('/')
 }
-onMounted(()=>{
-  getuserinfo()
-})
+// onMounted(() => {
+//   getInfo()
+// })
 </script>
 <style lang="scss">
-body,div {
+body, div {
   margin: 0;
   padding: 0;
 }
@@ -189,32 +221,39 @@ body,div {
 .my {
   margin: 0 auto;
   margin-top: 20px;
-    .userDetail {
-      .userImg {
-        height: 170px;
-        text-align: center;
-        border-bottom-style: solid;
-        border-color: #daddd2;
-        border-width: 1px;
-        .avatar {
-          width: 150px;
-          height: 150px;
-          border-radius: 50%;
-        }
-      }
-    }
-    .userInfo_item {
-      height: 40px;
+
+  .userDetail {
+    .userImg {
+      height: 170px;
+      text-align: center;
       border-bottom-style: solid;
       border-color: #daddd2;
       border-width: 1px;
-      text-align: left;
-      line-height: 40px;
-    }
 
-    .userInfo_item > span {
-      float: right;
+      .avatar {
+        width: 150px;
+        height: 150px;
+        border-radius: 50%;
+      }
     }
   }
 
-</style>
\ No newline at end of file
+  .userInfo_item {
+    display: flex;align-items: center;
+    justify-content: space-between;
+    height: 40px;
+    border-bottom-style: solid;
+    border-color: #daddd2;
+    border-width: 1px;
+    //text-align: left;
+    //line-height: 40px;
+
+  }
+
+  //
+  //.userInfo_item > div {
+  //  float: right;
+  //}
+}
+
+</style>