Merge pull request 'feat : 用户个人中心展示及密码设置' (#564) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/564

src/api/auth/auth.js

@@ -1,9 +1,16 @@
 import request from "@/utils/request.js";
 
-export const modifyUser=(data)=>{
+export const initPassword=(data)=>{
     return request({
-        url:'/admin/user',
-        method:'put',
+        url:'/admin/mosr/user/init/password',
+        method:'post',
         data
     })
-}
+}
+export const editPassword=(data)=>{
+    return request({
+        url:'/admin/mosr/user/update/password',
+        method:'post',
+        data
+    })
+}

src/api/login.js

@@ -28,3 +28,9 @@ export const getUserInfo = () => {
         method: 'get',
     })
 }
+export const getAuthInfo = () => {
+    return request({
+        url: '/admin/mosr/user/detail/info',
+        method: 'get',
+    })
+}

src/layout/navbar/index.vue

@@ -5,7 +5,7 @@
     <div class="right-bar">
       <!--        <bell-socket/>-->
       <div class="user-box">
-        <div  @click.stop="handleVisitedP">
+        <div @click.stop="handleVisitedP">
           <el-avatar>{{ userInfo.nickName }}</el-avatar>
           <div>{{ userInfo.nickName }}
             <el-icon style="margin-left: 5px">
@@ -40,12 +40,12 @@
               </div>
               <!--              <li v-for="item in accountList" :label="item.userName" :value="item.userId"/>-->
             </li>
-            <!--            <li @click="handleToAuth">-->
-            <!--              <el-icon color="gray" size="20" style="margin-right: 5px">-->
-            <!--                <UserFilled/>-->
-            <!--              </el-icon>-->
-            <!--              个人中心-->
-            <!--            </li>-->
+            <li @click="handleToAuth">
+              <el-icon color="gray" size="20" style="margin-right: 5px">
+                <UserFilled/>
+              </el-icon>
+              个人中心
+            </li>
             <li @click="handleLogout">
               <el-icon color="gray" size="20" style="margin-right: 5px">
                 <SwitchButton/>
@@ -118,8 +118,8 @@ const accountChange = (userId) => {
       visitedP.value = !visitedP.value
       authStore.userLogout()
       setToken(res.data)
-      console.log('router',route)
-      if(route.path!=='/'){
+      console.log('router', route)
+      if (route.path !== '/') {
 
       }
       location.reload()

src/views/auth/index.vue

@@ -10,31 +10,49 @@
             </div>
           </template>
           <div class="userDetail">
-            <!-- 头像上传 -->
-            <div class="userImg">
-              <el-image class="avatar" :src="userParams.avatar" fit="fill"/>
+            <div class="userInfo_item">
+              用户名: <span>{{ userParams.userName }}</span>
+            </div>
+            <div class="userInfo_item">
+              用户名称: <span>{{ userParams.nickName }}</span>
+            </div>
+            <div class="userInfo_item">
+              工号: <span>{{ userParams.workCode }}</span>
             </div>
             <div class="userInfo_item">
               <el-icon>
-                <UserFilled />
+                <Iphone/>
               </el-icon>
-              用户呢称: <span>{{ userParams.nickName }}</span>
+              电话号码: <span>{{ userParams.mobile }}</span></div>
+            <div class="userInfo_item">
+              <el-icon>
+                <HomeFilled/>
+              </el-icon>
+              所属公司: <span>{{ userParams.subCompanyName }}</span>
             </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 class="userInfo_item">
+              <el-icon>
+                <HomeFilled/>
+              </el-icon>
+              所属部门: <span>{{ userParams.departmentName }}</span>
+            </div>
+            <div class="userInfo_item">
+              <el-icon>
+                <HomeFilled/>
+              </el-icon>
+              岗位: <span>{{ userParams.jobActivityDesc }}</span>
+            </div>
+            <div class="userInfo_item">
+              <el-icon>
+                <HomeFilled/>
+              </el-icon>
+              账号类型: <span>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</span>
+            </div>
+            <div class="userInfo_item">
+              <el-icon>
+                <OfficeBuilding/>
+              </el-icon>
+              所属角色: <span>{{ belongToRole(userParams.roles) }}</span></div>
           </div>
           <div>
           </div>
@@ -45,143 +63,135 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>基本资料</span>
+              <span>{{ isInitPassword ? '修改密码' : '初始化密码' }}</span>
             </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 {getAuthInfo} from "@/api/login";
+import {editPassword, initPassword} 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({
+  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 () => {
+  if (isInitPassword.value) {
+    editPassword({
+      ...userPassword.value
+    }).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        passwordRef.value.resetFields()
+      }
+    })
+  } else {
+    initPassword({
+      newPassword: userPassword.value.newPassword,
+      confirmPassword: userPassword.value.confirmPassword
+    }).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 +199,35 @@ 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%;
+      }
     }
   }
 
+  .userInfo_item {
+    height: 40px;
+    border-bottom-style: solid;
+    border-color: #daddd2;
+    border-width: 1px;
+    text-align: left;
+    line-height: 40px;
+  }
+
+  .userInfo_item > span {
+    float: right;
+  }
+}
+
 </style>