From 8599fce91972d508acfe74c5714a05c9f32a4633 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Wed, 9 Jul 2025 11:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |  7 +-
 .../qualification/trainApproval/index.vue     |  4 +-
 src/views/system/user/profile/resetPwd.vue    | 53 ++++++++++-
 src/views/system/user/profile/userInfo.vue    | 89 ++++++++++++++-----
 4 files changed, 125 insertions(+), 28 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5739c8d..ec956b6 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -43,15 +43,12 @@
             </div>
             <template #dropdown>
               <el-dropdown-menu>
-                <!-- <router-link to="/user/profile">
+                <router-link to="/user/profile">
                   <el-dropdown-item>个人中心</el-dropdown-item>
                 </router-link> 
                 <el-dropdown-item divided command="logout">
                   <span>退出登录</span>
-                </el-dropdown-item> -->
-                <el-dropdown-item command="logout">
-                  <span>退出登录</span>
-                </el-dropdown-item>
+                </el-dropdown-item> 
               </el-dropdown-menu>
             </template>
           </el-dropdown>
diff --git a/src/views/qualification/trainApproval/index.vue b/src/views/qualification/trainApproval/index.vue
index eda5749..a41b81c 100644
--- a/src/views/qualification/trainApproval/index.vue
+++ b/src/views/qualification/trainApproval/index.vue
@@ -20,8 +20,8 @@
                         <el-form-item label="员工姓名">
                             <el-select v-model="queryParams.userId" filterable placeholder="请选择员工" style="width: 160px"
                                 clearable>
-                                <el-option v-for="item in allUsers" :key="item.userId" :label="item.nickName"
-                                    :value="item.userId" />
+                                <el-option v-for="item in allUsers" :key="item.userId"
+                                    :label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
                             </el-select>
                         </el-form-item>
                         <el-form-item style="margin-right: 10px;">
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 73c6b18..57fae7f 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,5 +1,5 @@
 <template>
-   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
+   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="120px">
       <el-form-item label="旧密码" prop="oldPassword">
          <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
       </el-form-item>
@@ -57,3 +57,54 @@ function close() {
   proxy.$tab.closePage()
 }
 </script>
+
+<style lang="scss">
+.el-form-item--default {
+  margin-bottom: 20px !important;
+}
+
+.el-form-item__label {
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 18px !important;
+  text-align: left;
+  color: #666666 !important;
+}
+.el-input__inner {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+
+.el-select__wrapper {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+
+.el-checkbox__label {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+
+.el-form-item__error {
+    font-size: 16px;
+}
+
+.el-radio__inner {
+    width: 16px !important;
+    height: 16px !important;
+}
+
+.el-radio__label {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+</style>
+
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 5099ffa..73b82fc 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,25 +1,25 @@
 <template>
-   <el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="用户昵称" prop="nickName">
-         <el-input v-model="form.nickName" maxlength="30" />
-      </el-form-item>
-      <el-form-item label="手机号码" prop="phonenumber">
-         <el-input v-model="form.phonenumber" maxlength="11" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-         <el-input v-model="form.email" maxlength="50" />
-      </el-form-item>
-      <el-form-item label="性别">
-         <el-radio-group v-model="form.sex">
-            <el-radio value="0">男</el-radio>
-            <el-radio value="1">女</el-radio>
-         </el-radio-group>
-      </el-form-item>
-      <el-form-item>
+  <el-form ref="userRef" :model="form" :rules="rules" label-width="120px">
+    <el-form-item label="用户昵称" prop="nickName">
+      <el-input v-model="form.nickName" maxlength="30" />
+    </el-form-item>
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="form.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="form.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="form.sex">
+        <el-radio value="0">男</el-radio>
+        <el-radio value="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
       <el-button type="primary" @click="submit">保存</el-button>
       <el-button type="danger" @click="close">关闭</el-button>
-      </el-form-item>
-   </el-form>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script setup>
@@ -63,5 +63,54 @@ watch(() => props.user, user => {
   if (user) {
     form.value = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex }
   }
-},{ immediate: true })
+}, { immediate: true })
 </script>
+<style lang="scss">
+.el-form-item--default {
+  margin-bottom: 20px !important;
+}
+
+.el-form-item__label {
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 18px !important;
+  text-align: left;
+  color: #666666 !important;
+}
+.el-input__inner {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+
+.el-select__wrapper {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+
+.el-checkbox__label {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+
+.el-form-item__error {
+    font-size: 16px;
+}
+
+.el-radio__inner {
+    width: 16px !important;
+    height: 16px !important;
+}
+
+.el-radio__label {
+    font-weight: 400;
+    font-size: 18px;
+    text-align: left;
+    color: #000000;
+}
+</style>