From be5032602d65a82d49e4f1572a2a31698cb96826 Mon Sep 17 00:00:00 2001
From: Shu Guang <61069967+shuguangnet@users.noreply.github.com>
Date: Sun, 18 May 2025 07:41:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor(components/edit):=20=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E9=80=89=E6=8B=A9=E5=99=A8=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将性别选择器从单选按钮组替换为下拉框，提升用户体验。同时，对代码进行格式化，统一缩进和代码风格，提高代码可读性和维护性。
---
 src/components/edit/EditStudent.vue |  27 +-
 src/views/user/Student.vue          | 459 +++++++++++++-------------
 src/views/user/Teacher.vue          | 477 +++++++++++++++-------------
 3 files changed, 509 insertions(+), 454 deletions(-)

diff --git a/src/components/edit/EditStudent.vue b/src/components/edit/EditStudent.vue
index 6e51335e..5294b58d 100644
--- a/src/components/edit/EditStudent.vue
+++ b/src/components/edit/EditStudent.vue
@@ -79,14 +79,14 @@
       />
 		</a-form-item>
     <a-form-item label="性别">
-      <a-radio-group v-decorator="decorator.gender" :options="sexes" />
+      <a-select v-decorator="decorator.gender" :options="sexes" placeholder="请选择性别" />
     </a-form-item>
   </a-form>
 </template>
 
 <script>
 import { pick } from 'lodash-es';
-import { UserStatus,grades, sexes } from '@/utils/const';
+import { UserStatus, grades, sexes } from '@/utils/const';
 import EditMixin from './edit-mixin';
 
 export default {
@@ -95,20 +95,20 @@ export default {
   data() {
     return {
       grades,
-			UserStatus,
+      UserStatus,
       decorator,
       sexes,
-			userPrivileges:[
-				{label:'管理员',value:'0'},
-				{label:'教师',value:'1'},
-				{label:'学生',value:'2'},
-			]
+      userPrivileges: [
+        { label: '管理员', value: '0' },
+        { label: '教师', value: '1' },
+        { label: '学生', value: '2' },
+      ]
     };
   },
   methods: {
     initData() {
       const { data } = this;
-      const result = pick(data, ['stid', 'userName', 'gender',  'collegeId','phone','email','userStatus']);
+      const result = pick(data, ['stid', 'userName', 'gender', 'collegeId', 'phone', 'email', 'userStatus']);
       this.form.setFieldsValue(result);
     },
   },
@@ -139,17 +139,18 @@ const decorator = {
   gender: ['gender', {
     initialValue: '男',
   }],
-	collegeId: ['collegeId', {
+  collegeId: ['collegeId', {
     rules: [{
       required: false,
       message: '请选择学院！',
     }],
-  }]
-	,userPrivileges: ['userPrivileges', {
+  }],
+  userPrivileges: ['userPrivileges', {
     rules: [{
       message: '请选择身份！',
     }],
-  }],UserStatus: ['UserStatus', {
+  }],
+  UserStatus: ['UserStatus', {
     initialValue: '正常',
   }],
   phone: ['phone', {
diff --git a/src/views/user/Student.vue b/src/views/user/Student.vue
index f7fca596..84b7263e 100644
--- a/src/views/user/Student.vue
+++ b/src/views/user/Student.vue
@@ -22,22 +22,12 @@
       <template #header>
         <!-- 操作按钮组 -->
         <a-button-group>
-          <a-button type="primary" @click="addUser">
-            添加学生
-          </a-button>
-          <a-button
-            :disabled="!selectedKeys.length"
-            @click="batchDelete"
-          >
+          <a-button type="primary" @click="addUser"> 添加学生 </a-button>
+          <a-button :disabled="!selectedKeys.length" @click="batchDelete">
             批量删除 ({{ selectedKeys.length }})
           </a-button>
-          <a-button @click="$refs.import.show()">
-            Excel导入
-          </a-button>
-          <a-button
-            :loading="exporting"
-            @click="exportAll"
-          >
+          <a-button @click="$refs.import.show()"> Excel导入 </a-button>
+          <a-button :loading="exporting" @click="exportAll">
             全量导出
           </a-button>
         </a-button-group>
@@ -99,98 +89,97 @@
 </template>
 
 <script>
-import { grades, gradeMap, sexes, sexMap } from '@/utils/const';
-import { exportData } from '@/utils/excel';
-import createColumns from '@/helpers/importuser-columns';
-import EditStudent from '@/components/edit/EditStudent';
-import UserImport from '@/components/common/UserImport';
-import GrantRole from '@/components/common/GrantRole';
+import { grades, gradeMap, sexes, sexMap } from "@/utils/const";
+import { exportData } from "@/utils/excel";
+import createColumns from "@/helpers/importuser-columns";
+import EditStudent from "@/components/edit/EditStudent";
+import UserImport from "@/components/common/UserImport";
+import GrantRole from "@/components/common/GrantRole";
 
 // 格式化日期函数
 function formatDate(dateString) {
   const date = new Date(dateString); // 将日期字符串转换为 Date 对象
   const year = date.getFullYear(); // 获取年份
-  const month = String(date.getMonth() + 1).padStart(2, '0'); // 获取月份，并补零
-  const day = String(date.getDate()).padStart(2, '0'); // 获取日期，并补零
+  const month = String(date.getMonth() + 1).padStart(2, "0"); // 获取月份，并补零
+  const day = String(date.getDate()).padStart(2, "0"); // 获取日期，并补零
   return `${year}-${month}-${day}`; // 返回格式化后的日期字符串
 }
 
-
 // 定义状态映射对象
 const statusMap = {
-  0: '正常',
-  1: '异常',
+  0: "正常",
+  1: "异常",
   // 其他状态以此类推
 };
 
 const STUDENT_COLUMNS = [
-  { title: '学号', dataIndex: 'stid' , align: 'center'},
-  { title: '姓名', dataIndex: 'userName' , align: 'center' },
-	{ 
-      title: '性别', 
-      dataIndex: 'gender',
-			align: 'center',
-      customRender: (text, record) => {
-        return text ? text : '男';
-      }
+  { title: "学号", dataIndex: "stid", align: "center" },
+  { title: "姓名", dataIndex: "userName", align: "center" },
+  {
+    title: "性别",
+    dataIndex: "gender",
+    align: "center",
+    customRender: (text, record) => {
+      return text ? text : "男";
     },
-  { 
-    title: '学院', 
-    dataIndex: 'collegeId', 
-		align: 'center',
-    customRender: (text, record) => gradeMap[record.collegeId] // 根据学院 ID 查找映射对象中的学院名称
-  },
-  { 
-    title: '生日', 
-    dataIndex: 'birthdate', 
-		align: 'center',
-    customRender: (text, record) => formatDate(record.birthdate) // 在渲染时调用 formatDate 函数
-  },
-	{ 
-      title: '手机', 
-      dataIndex: 'phone',
-			align: 'center',
-      customRender: (text, record) => {
-        return text ? text : '无';
-      }
-    },
-  { 
-    title: '状态', 
-    dataIndex: 'userStatus',
-		align: 'center',
-    customRender: (text, record) => statusMap[record.userStatus] // 根据状态值查找映射对象中的状态名称
   },
   {
-    title: '操作',
-    align: 'center',
+    title: "学院",
+    dataIndex: "collegeId",
+    align: "center",
+    customRender: (text, record) => gradeMap[record.collegeId], // 根据学院 ID 查找映射对象中的学院名称
+  },
+  {
+    title: "生日",
+    dataIndex: "birthdate",
+    align: "center",
+    customRender: (text, record) => formatDate(record.birthdate), // 在渲染时调用 formatDate 函数
+  },
+  {
+    title: "手机",
+    dataIndex: "phone",
+    align: "center",
+    customRender: (text, record) => {
+      return text ? text : "无";
+    },
+  },
+  {
+    title: "状态",
+    dataIndex: "userStatus",
+    align: "center",
+    customRender: (text, record) => statusMap[record.userStatus], // 根据状态值查找映射对象中的状态名称
+  },
+  {
+    title: "操作",
+    align: "center",
     width: 100,
-    scopedSlots: { customRender: 'action' },
+    scopedSlots: { customRender: "action" },
   },
 ];
 
 function exportExcel(data) {
-  const header = STUDENT_COLUMNS.map(v => v.title);
+  const header = STUDENT_COLUMNS.map((v) => v.title);
   header.pop(); // 去掉最后一栏操作栏
   return exportData({
-    name: '学生信息',
+    name: "学生信息",
     data,
     header,
     keyMap: {
-      stid: '学号',
-      userName: '姓名',
-      gender: '性别',
-      collegeId: '学院',
-      birthdate: '生日',
-      phone: '手机',
-      userStatus: '状态',
+      stid: "学号",
+      userName: "姓名",
+      gender: "性别",
+      collegeId: "学院",
+      birthdate: "生日",
+      phone: "手机",
+      userStatus: "状态",
     },
   });
 }
 
 export default {
-  name: 'Student',
+  name: "Student",
   metaInfo: {
-    title: '学生管理',
+    title: "学生管理",
   },
   components: {
     UserImport,
@@ -202,7 +191,7 @@ export default {
       query: {},
       selectedKeys: [],
       users: [],
-			originalUsers: [],
+      originalUsers: [],
       current: 1,
       pageSize: 12,
       total: 0,
@@ -228,7 +217,9 @@ export default {
     },
   },
   mounted() {
-    this.$watch(() => [this.pageSize, this.current], this.getData, { immediate: true });
+    this.$watch(() => [this.pageSize, this.current], this.getData, {
+      immediate: true,
+    });
   },
   methods: {
     // 搜索
@@ -244,87 +235,107 @@ export default {
     getData() {
       this.loading = true;
       this.query = this.$refs.searchForm.getResult();
-			console.log(this.query);
-      this.$api.AllUser({}).then(data => {
-        // 过滤权限大于1的用户
-        this.originalUsers = data.data.filter(user => user.userPrivileges > 1);
-				this.filterUsers(); // 调用过滤用户方法
-        this.total = data.users.length;
-      }).catch(e => {
-        console.error(e);
-        // this.$message.error(e.msg || '获取数据失败');
-      }).finally(() => {
-        this.loading = false;
-      });
+      console.log(this.query);
+      this.$api
+        .AllUser({})
+        .then((data) => {
+          // 过滤权限大于1的用户
+          this.originalUsers = data.data.filter(
+            (user) => user.userPrivileges > 1
+          );
+          this.filterUsers(); // 调用过滤用户方法
+          this.total = data.users.length;
+        })
+        .catch((e) => {
+          console.error(e);
+          // this.$message.error(e.msg || '获取数据失败');
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
-		filterUsers() {
-  		let filteredUsers = this.originalUsers.slice(); // 复制原始用户数据
-			console.log(filteredUsers)
-  	if (this.query.sid) {
-    filteredUsers = filteredUsers.filter(user => user.stid.includes(this.query.sid));
-  	}
+    filterUsers() {
+      let filteredUsers = this.originalUsers.slice(); // 复制原始用户数据
+      console.log(filteredUsers);
+      if (this.query.sid) {
+        filteredUsers = filteredUsers.filter((user) =>
+          user.stid.includes(this.query.sid)
+        );
+      }
 
-  if (this.query.name) {
-    filteredUsers = filteredUsers.filter(user => user.userName.includes(this.query.name));
-  }
+      if (this.query.name) {
+        filteredUsers = filteredUsers.filter((user) =>
+          user.userName.includes(this.query.name)
+        );
+      }
 
-  if (this.query.sex) {
-    filteredUsers = filteredUsers.filter(user => user.gender === this.query.sex);
-  }
+      if (this.query.sex) {
+        filteredUsers = filteredUsers.filter(
+          (user) => user.gender === this.query.sex
+        );
+      }
 
-  if (this.query.collageId) {
-    filteredUsers = filteredUsers.filter(user => user.collageId === this.query.collageId);
-  }
-
-  this.users = filteredUsers;
-},
+      if (this.query.collageId) {
+        filteredUsers = filteredUsers.filter(
+          (user) => user.collageId === this.query.collageId
+        );
+      }
 
+      this.users = filteredUsers;
+    },
 
     // 重置密码
     resetPassword(row) {
       const key = Date.now();
       this.$message.loading({
         key,
-        content: '请稍后',
+        content: "请稍后",
         duration: 0,
       });
-      this.$api.resetPassword({
-        type: 'student',
-        account: row.sid,
-      }).then(() => {
-        this.$message.success({ content: '已重置', key });
-      }).catch(() => {
-        this.$message.error({ content: '重置失败', key });
-      });
+      this.$api
+        .resetPassword({
+          type: "student",
+          account: row.sid,
+        })
+        .then(() => {
+          this.$message.success({ content: "已重置", key });
+        })
+        .catch(() => {
+          this.$message.error({ content: "重置失败", key });
+        });
     },
     // 添加学生
     addUser() {
       let vnode;
       this.$confirm({
-        title: '添加学生',
-        content: h => (vnode = h(EditStudent)),
+        title: "添加学生",
+        content: (h) => (vnode = h(EditStudent)),
         onOk: async () => {
-					const values = await vnode.componentInstance.validate();
-					const data = {
-    				sTId: values.stid,
-						userPassword: values.password,
-						// 用户权限学生
-   					userPrivileges: 2,
-   					userName: values.userName,
-   					collegeId: values.collegeId,
-   					userStatus: 0,
-   					email: values.email,
-   					phone: values.phone,
-					};
-          
-          return this.$api.CreateUser(data).then(() => {
-            this.$message.success('添加成功');
-            this.getData();
-          }).catch(e => {
-            console.error(e);
-            this.$message.error(e.msg || '添加失败');
-            throw e;
-          });
+          const values = await vnode.componentInstance.validate();
+          const data = {
+            sTId: values.stid,
+            userPassword: values.password,
+            // 用户权限学生
+            userPrivileges: 2,
+            userName: values.userName,
+            collegeId: values.collegeId,
+            userStatus: 0,
+            email: values.email,
+            phone: values.phone,
+            sex: values.sex,
+          };
+
+          return this.$api
+            .CreateUser(data)
+            .then(() => {
+              this.$message.success("添加成功");
+              this.getData();
+            })
+            .catch((e) => {
+              console.error(e);
+              this.$message.error(e.msg || "添加失败");
+              throw e;
+            });
         },
       });
     },
@@ -332,90 +343,107 @@ export default {
     editUser(row) {
       let vnode;
       this.$confirm({
-        title: '修改信息',
-        content: h => (vnode = <EditStudent type="update" data={row} />),
+        title: "修改信息",
+        content: (h) => (vnode = <EditStudent type="update" data={row} />),
         onOk: async () => {
           const values = await vnode.componentInstance.validate();
-					console.log(values)
-					let data={
-						stid: row.stid,
-						userId:row.userId,
-						userName:values.userName,
-						userPassword:values.password,
-						userPrivileges:values.userPrivileges,
-						phone:values.phone,
-						email:values.email,
-						collegeId:values.collegeId,
-						userStatus:0,
-					}
-          return this.$api.UPuser(data).then(() => {
-            this.$message.success('修改成功');
-            this.getData();
-          }).catch(e => {
-            console.error(e);
-            this.$message.error(e.msg || '修改失败');
-            throw e;
-          });
+          console.log(values);
+          let data = {
+            sTId: values.stid,
+            userId: row.userId,
+            userName: values.userName,
+            userPassword: values.password,
+            userPrivileges: values.userPrivileges,
+            phone: values.phone,
+            email: values.email,
+            collegeId: values.collegeId,
+            gender: values.gender,
+            sex: values.sexual,
+            userStatus: 0,
+          };
+          return this.$api
+            .UPuser(data)
+            .then(() => {
+              this.$message.success("修改成功");
+              this.getData();
+            })
+            .catch((e) => {
+              console.error(e);
+              this.$message.error(e.msg || "修改失败");
+              throw e;
+            });
         },
       });
     },
     // 删除学生
     deleteUser(row) {
       const key = Math.random();
-      this.$message.loading({ content: '正在删除', duration: 0, key });
-      this.$api.deleteUser('student', {
-        ids: [row.sid],
-      }).then(() => {
-        this.$message.success({ content: '删除成功!', key });
-        this.getData();
-      }).catch(e => {
-        this.$message.error({ content: e.msg || '删除失败!', key });
-      });
+      this.$message.loading({ content: "正在删除", duration: 0, key });
+      this.$api
+        .deleteUser("student", {
+          ids: [row.sid],
+        })
+        .then(() => {
+          this.$message.success({ content: "删除成功!", key });
+          this.getData();
+        })
+        .catch((e) => {
+          this.$message.error({ content: e.msg || "删除失败!", key });
+        });
     },
     // 批量删除
     batchDelete(row) {
       this.$modal.confirm({
         title: `确认删除选中的${this.selectedKeys.length}项数据?`,
         onOk: () => {
-					let data={
-						list:this.selectedKeys.map(index => this.users[index].userId)
-					}
-					this.$api.deleteList(data).then(() => {
-          this.$message.success('删除成功!');
-          this.selectedKeys.splice(0);
-          this.getData();
-        }).catch(e => {
-          this.$message.error(e.msg || '删除失败!');
-          throw e;
-        })
-				}
+          let data = {
+            list: this.selectedKeys.map((index) => this.users[index].userId),
+          };
+          this.$api
+            .deleteList(data)
+            .then(() => {
+              this.$message.success("删除成功!");
+              this.selectedKeys.splice(0);
+              this.getData();
+            })
+            .catch((e) => {
+              this.$message.error(e.msg || "删除失败!");
+              throw e;
+            });
+        },
       });
     },
     // 导出学生
     exportAll() {
       this.exporting = true;
-      this.$api.AllUser().then(data => {
-        // 过滤权限2的用户
-				return exportExcel(data.data.filter(user => user.userPrivileges > 1));
-      }).then(data => {
-        return exportExcel(data.data);
-      }).catch(e => {
-        console.error(e);
-        this.$message.error(e.msg || '导出失败');
-      }).finally(() => {
-        this.exporting = false;
-      });
+      this.$api
+        .AllUser()
+        .then((data) => {
+          // 过滤权限2的用户
+          return exportExcel(
+            data.data.filter((user) => user.userPrivileges > 1)
+          );
+        })
+        .then((data) => {
+          return exportExcel(data.data);
+        })
+        .catch((e) => {
+          console.error(e);
+          this.$message.error(e.msg || "导出失败");
+        })
+        .finally(() => {
+          this.exporting = false;
+        });
     },
     // 授权用户
     grantRole(item) {
       let vnode;
       this.$confirm({
-        title: '授权',
-        content: () => (vnode = <GrantRole
-          type="student"
-          role={item.role_id}
-          account={item.sid}
-        />),
+        title: "授权",
+        content: () =>
+          (vnode = (
+            <GrantRole type="student" role={item.role_id} account={item.sid} />
+          )),
         onOk: async () => {
           await vnode.componentInstance.confirm();
           this.getData();
@@ -429,40 +457,39 @@ export default {
 function createSearchOptions() {
   return [
     {
-      label: '学号',
-      key: 'sid',
-      default: '',
-      component: 'input',
-			align: 'center'
+      label: "学号",
+      key: "sid",
+      default: "",
+      component: "input",
+      align: "center",
     },
     {
-      label: '姓名',
-      key: 'name',
-      default: '',
-      component: 'input',
-			align: 'center'
+      label: "姓名",
+      key: "name",
+      default: "",
+      component: "input",
+      align: "center",
     },
     {
-      label: '性别',
-      key: 'sex',
+      label: "性别",
+      key: "sex",
       default: undefined,
-      component: 'select',
-			align: 'center',
+      component: "select",
+      align: "center",
       props: {
         options: sexes,
       },
     },
     {
-      label: '学院',
-      key: 'collageId',
+      label: "学院",
+      key: "collageId",
       default: undefined,
-      component: 'select',
-			align: 'center',
+      component: "select",
+      align: "center",
       props: {
         options: grades,
       },
     },
-    
   ];
 }
 </script>
diff --git a/src/views/user/Teacher.vue b/src/views/user/Teacher.vue
index 0cdbcf6c..bcd2aa6f 100644
--- a/src/views/user/Teacher.vue
+++ b/src/views/user/Teacher.vue
@@ -20,23 +20,12 @@
     >
       <template #header>
         <a-button-group>
-          <a-button  type="primary" @click="addUser">
-            添加教师
-          </a-button>
-          <a-button
-           
-            :disabled="!selectedKeys.length"
-            @click="batchDelete"
-          >
+          <a-button type="primary" @click="addUser"> 添加教师 </a-button>
+          <a-button :disabled="!selectedKeys.length" @click="batchDelete">
             批量删除 ({{ selectedKeys.length }})
           </a-button>
-          <a-button  @click="$refs.import.show()">
-            Excel导入
-          </a-button>
-          <a-button
-            :loading="exporting"
-            @click="exportAll"
-          >
+          <a-button @click="$refs.import.show()"> Excel导入 </a-button>
+          <a-button :loading="exporting" @click="exportAll">
             全量导出
           </a-button>
         </a-button-group>
@@ -96,109 +85,109 @@
 </template>
 
 <script>
-import { gradeMap,rankMap, ranks,grades,sexes } from '@/utils/const';
-import { exportData } from '@/utils/excel';
-import createColumns from '@/helpers/importuser-columns';
-import EditTeacher from '@/components/edit/EditTeacher';
-import UserImport from '@/components/common/UserImport.vue';
-import GrantRole from '@/components/common/GrantRole';
+import { gradeMap, rankMap, ranks, grades, sexes } from "@/utils/const";
+import { exportData } from "@/utils/excel";
+import createColumns from "@/helpers/importuser-columns";
+import EditTeacher from "@/components/edit/EditTeacher";
+import UserImport from "@/components/common/UserImport.vue";
+import GrantRole from "@/components/common/GrantRole";
 // 定义状态映射对象
 const statusMap = {
-  0: '正常',
-  1: '异常',
+  0: "正常",
+  1: "异常",
   // 其他状态以此类推
 };
 // 格式化日期函数
 function formatDate(dateString) {
   const date = new Date(dateString); // 将日期字符串转换为 Date 对象
   const year = date.getFullYear(); // 获取年份
-  const month = String(date.getMonth() + 1).padStart(2, '0'); // 获取月份，并补零
-  const day = String(date.getDate()).padStart(2, '0'); // 获取日期，并补零
+  const month = String(date.getMonth() + 1).padStart(2, "0"); // 获取月份，并补零
+  const day = String(date.getDate()).padStart(2, "0"); // 获取日期，并补零
   return `${year}-${month}-${day}`; // 返回格式化后的日期字符串
 }
 const TEACHER_COLUMNS = [
-  { title: '工号', dataIndex: 'stid' },
-  { title: '姓名', dataIndex: 'userName' },
-	{ 
-      title: '性别', 
-      dataIndex: 'gender',
-      customRender: (text, record) => {
-        return text ? text : '男';
-      }
+  { title: "工号", dataIndex: "stid" },
+  { title: "姓名", dataIndex: "userName" },
+  {
+    title: "性别",
+    dataIndex: "gender",
+    customRender: (text, record) => {
+      return text ? text : "男";
     },
-		{ 
-      title: '职称', 
-      dataIndex: 'teacherTitle',
-      customRender: (text, record) => {
-        return text ? text : '无';
-      }
-    },
-  { 
-    title: '学院', 
-    dataIndex: 'collegeId', 
-    customRender: (text, record) => gradeMap[record.collegeId] // 根据学院 ID 查找映射对象中的学院名称
-  },
-  { 
-    title: '生日', 
-    dataIndex: 'birthdate', 
-    customRender: (text, record) => formatDate(record.birthdate) // 在渲染时调用 formatDate 函数
-  },
-  { 
-      title: '手机', 
-      dataIndex: 'phone',
-      customRender: (text, record) => {
-        return text ? text : '无';
-      }
-    },
-  { 
-    title: '状态', 
-    dataIndex: 'userStatus',
-    customRender: (text, record) => statusMap[record.userStatus] // 根据状态值查找映射对象中的状态名称
   },
   {
-    title: '操作',
-    align: 'center',
+    title: "职称",
+    dataIndex: "teacherTitle",
+    customRender: (text, record) => {
+      return text ? text : "无";
+    },
+  },
+  {
+    title: "学院",
+    dataIndex: "collegeId",
+    customRender: (text, record) => gradeMap[record.collegeId], // 根据学院 ID 查找映射对象中的学院名称
+  },
+  {
+    title: "生日",
+    dataIndex: "birthdate",
+    customRender: (text, record) => formatDate(record.birthdate), // 在渲染时调用 formatDate 函数
+  },
+  {
+    title: "手机",
+    dataIndex: "phone",
+    customRender: (text, record) => {
+      return text ? text : "无";
+    },
+  },
+  {
+    title: "状态",
+    dataIndex: "userStatus",
+    customRender: (text, record) => statusMap[record.userStatus], // 根据状态值查找映射对象中的状态名称
+  },
+  {
+    title: "操作",
+    align: "center",
     width: 100,
-    scopedSlots: { customRender: 'action' },
+    scopedSlots: { customRender: "action" },
   },
 ];
 
 function exportExcel(data) {
-  const header = TEACHER_COLUMNS.map(v => v.title);
+  const header = TEACHER_COLUMNS.map((v) => v.title);
   header.pop(); // 去掉最后一栏操作栏
   return exportData({
-    name: '教师信息',
+    name: "教师信息",
     data,
     header,
     keyMap: {
-      stid: '工号',
-      userName: '姓名',
-			gender:'性别',
-      teacherTitle: '职称',
-      collegeId: '学院',
-      birthdate: '生日',
-      phone: '手机',
-      userStatus: '状态',
+      stid: "工号",
+      userName: "姓名",
+      gender: "性别",
+      teacherTitle: "职称",
+      collegeId: "学院",
+      birthdate: "生日",
+      phone: "手机",
+      userStatus: "状态",
     },
   });
 }
 
 export default {
-  name: 'Teacher',
+  name: "Teacher",
   components: { UserImport },
   metaInfo: {
-    title: '教师管理',
+    title: "教师管理",
   },
   data() {
     return {
-			grades,
-			sexes,
+      grades,
+      sexes,
       loading: false,
       exporting: false,
       query: {},
       selectedKeys: [],
       users: [],
-			originalUsers: [],
+      originalUsers: [],
       current: 1,
       pageSize: 10,
       total: 0,
@@ -224,7 +213,9 @@ export default {
     },
   },
   mounted() {
-    this.$watch(() => [this.pageSize, this.current], this.getData, { immediate: true });
+    this.$watch(() => [this.pageSize, this.current], this.getData, {
+      immediate: true,
+    });
   },
   methods: {
     search() {
@@ -234,171 +225,207 @@ export default {
     changePage({ pageSize, current }) {
       Object.assign(this, { pageSize, current });
     },
-		getData() {
-			console.log(this.query)
+    getData() {
+      console.log(this.query);
       this.loading = true;
       this.query = this.$refs.searchForm.getResult();
-      this.$api.AllUser({}).then(data => {
-        // 过滤权限大于0的用户
-        this.originalUsers = data.data.filter(user => user.userPrivileges ==1);
-				this.filterUsers(); // 调用过滤用户方法
-        this.total = data.users.length;
-      }).catch(e => {
-        console.error(e);
-        // this.$message.error(e.msg || '获取数据失败');
-      }).finally(() => {
-        this.loading = false;
-      });
+      this.$api
+        .AllUser({})
+        .then((data) => {
+          // 过滤权限大于0的用户
+          this.originalUsers = data.data.filter(
+            (user) => user.userPrivileges == 1
+          );
+          this.filterUsers(); // 调用过滤用户方法
+          this.total = data.users.length;
+        })
+        .catch((e) => {
+          console.error(e);
+          // this.$message.error(e.msg || '获取数据失败');
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
-		// 过滤用户
-		filterUsers() {
-  		let filteredUsers = this.originalUsers.slice(); // 复制原始用户数据
-  	if (this.query.tid) {
-    filteredUsers = filteredUsers.filter(user => user.stid.includes(this.query.tid));
-  	}
+    // 过滤用户
+    filterUsers() {
+      let filteredUsers = this.originalUsers.slice(); // 复制原始用户数据
+      if (this.query.tid) {
+        filteredUsers = filteredUsers.filter((user) =>
+          user.stid.includes(this.query.tid)
+        );
+      }
 
-  if (this.query.name) {
-    filteredUsers = filteredUsers.filter(user => user.userName.includes(this.query.name));
-  }
+      if (this.query.name) {
+        filteredUsers = filteredUsers.filter((user) =>
+          user.userName.includes(this.query.name)
+        );
+      }
 
-  if (this.query.sex) {
-    filteredUsers = filteredUsers.filter(user => user.gender === this.query.sex);
-  }
+      if (this.query.sex) {
+        filteredUsers = filteredUsers.filter(
+          (user) => user.gender === this.query.sex
+        );
+      }
 
-  if (this.query.collageId) {
-    filteredUsers = filteredUsers.filter(user => user.collageId === this.query.collageId);
-  }
-  if (this.query.rank) {
-    filteredUsers = filteredUsers.filter(user => user.teacherTitle === this.query.rank);
-  }
-  this.users = filteredUsers;
-},
+      if (this.query.collageId) {
+        filteredUsers = filteredUsers.filter(
+          (user) => user.collageId === this.query.collageId
+        );
+      }
+      if (this.query.rank) {
+        filteredUsers = filteredUsers.filter(
+          (user) => user.teacherTitle === this.query.rank
+        );
+      }
+      this.users = filteredUsers;
+    },
     resetPassword(row) {
       const key = Date.now();
       this.$message.loading({
         key,
-        content: '请稍后',
+        content: "请稍后",
         duration: 0,
       });
-      this.$api.resetPassword({
-        type: 'teacher',
-        account: row.tid,
-      }).then(() => {
-        this.$message.success({ content: '已重置', key });
-      }).catch(() => {
-        this.$message.error({ content: '重置失败', key });
-      });
+      this.$api
+        .resetPassword({
+          type: "teacher",
+          account: row.tid,
+        })
+        .then(() => {
+          this.$message.success({ content: "已重置", key });
+        })
+        .catch(() => {
+          this.$message.error({ content: "重置失败", key });
+        });
     },
     addUser() {
       let vnode;
       this.$confirm({
-        title: '添加教师',
-        content: h => (vnode = h(EditTeacher)),
+        title: "添加教师",
+        content: (h) => (vnode = h(EditTeacher)),
         onOk: async () => {
           const values = await vnode.componentInstance.validate();
-					const data = {
-    				sTId: values.stid,
-   					userPassword: values.password,
-   					userPrivileges: 1,
-   					userName: values.userName,
-   					teacherTitle: values.teacherTitle,
-   					collegeId: values.collegeId,
-   					userStatus: 0,
-   					email: values.email,
-   					phone: values.phone,
-					};
-          return this.$api.CreateUser(data).then(() => {
-            this.$message.success('添加成功');
-            this.getData();
-          }).catch(e => {
-            console.error(e);
-            this.$message.error(e.msg || '添加失败');
-            throw e;
-          });
+          const data = {
+            sTId: values.stid,
+            userPassword: values.password,
+            userPrivileges: 1,
+            userName: values.userName,
+            teacherTitle: values.teacherTitle,
+            collegeId: values.collegeId,
+            userStatus: 0,
+            email: values.email,
+            phone: values.phone,
+          };
+          return this.$api
+            .CreateUser(data)
+            .then(() => {
+              this.$message.success("添加成功");
+              this.getData();
+            })
+            .catch((e) => {
+              console.error(e);
+              this.$message.error(e.msg || "添加失败");
+              throw e;
+            });
         },
       });
     },
     editUser(row) {
       let vnode;
       this.$confirm({
-        title: '修改信息',
-        content: h => (vnode = <EditTeacher type="update" data={row} />),
+        title: "修改信息",
+        content: (h) => (vnode = <EditTeacher type="update" data={row} />),
         onOk: async () => {
           const values = await vnode.componentInstance.validate();
-					console.log(values)
-					let data={
-						stid: values.stid,
-						userId:row.userId,
-						userName:values.userName,
-						userPassword:values.password,
-						userPrivileges:values.userPrivileges,
-						teacherTitle:values.teacherTitle,
-						email:values.email,
-						collegeId:values.collegeId,
-						userStatus:0,
-					}
-          return this.$api.updateUser(data).then(() => {
-            this.$message.success('修改成功');
-            this.getData();
-          }).catch(e => {
-            console.error(e);
-            this.$message.error(e.msg || '修改失败');
-            throw e;
-          });
+          console.log(values);
+          let data = {
+            sTId: values.stid,
+            userId: row.userId,
+            userName: values.userName,
+            userPassword: values.password,
+            userPrivileges: values.userPrivileges,
+            teacherTitle: values.teacherTitle,
+            email: values.email,
+            collegeId: values.collegeId,
+            userStatus: 0,
+          };
+          return this.$api
+            .updateUser(data)
+            .then(() => {
+              this.$message.success("修改成功");
+              this.getData();
+            })
+            .catch((e) => {
+              console.error(e);
+              this.$message.error(e.msg || "修改失败");
+              throw e;
+            });
         },
       });
     },
     deleteUser(row) {
       const key = Math.random();
-      this.$message.loading({ content: '正在删除', duration: 0, key });
-      this.$api.deleteUser('teacher', {
-        ids: [row.tid],
-      }).then(() => {
-        this.$message.success({ content: '删除成功!', key });
-        this.getData();
-      }).catch(e => {
-        this.$message.error({ content: e.msg || '删除失败!', key });
-      });
+      this.$message.loading({ content: "正在删除", duration: 0, key });
+      this.$api
+        .deleteUser("teacher", {
+          ids: [row.tid],
+        })
+        .then(() => {
+          this.$message.success({ content: "删除成功!", key });
+          this.getData();
+        })
+        .catch((e) => {
+          this.$message.error({ content: e.msg || "删除失败!", key });
+        });
     },
-		batchDelete(row) {
+    batchDelete(row) {
       this.$modal.confirm({
         title: `确认删除选中的${this.selectedKeys.length}项数据?`,
         onOk: () => {
-					let data={
-						list:this.selectedKeys.map(index => this.users[index].userId)
-					}
-					this.$api.deleteList(data).then(() => {
-          this.$message.success('删除成功!');
-          this.selectedKeys.splice(0);
-          this.getData();
-        }).catch(e => {
-          this.$message.error(e.msg || '删除失败!');
-          throw e;
-        })
-				}
+          let data = {
+            list: this.selectedKeys.map((index) => this.users[index].userId),
+          };
+          this.$api
+            .deleteList(data)
+            .then(() => {
+              this.$message.success("删除成功!");
+              this.selectedKeys.splice(0);
+              this.getData();
+            })
+            .catch((e) => {
+              this.$message.error(e.msg || "删除失败!");
+              throw e;
+            });
+        },
       });
     },
     exportAll() {
       this.exporting = true;
-			this.$api.AllUser().then(data => {
-        // 过滤权限大于1的用户
-				return exportExcel(data.data.filter(user => user.userPrivileges == 1));
-      }).catch(e => {
-        console.error(e);
-        this.$message.error(e.msg || '导出失败');
-      }).finally(() => {
-        this.exporting = false;
-      });
+      this.$api
+        .AllUser()
+        .then((data) => {
+          // 过滤权限大于1的用户
+          return exportExcel(
+            data.data.filter((user) => user.userPrivileges == 1)
+          );
+        })
+        .catch((e) => {
+          console.error(e);
+          this.$message.error(e.msg || "导出失败");
+        })
+        .finally(() => {
+          this.exporting = false;
+        });
     },
     grantRole(item) {
       let vnode;
       this.$confirm({
-        title: '授权',
-        content: () => (vnode = <GrantRole
-          type="teacher"
-          role={item.role_id}
-          account={item.tid}
-        />),
+        title: "授权",
+        content: () =>
+          (vnode = (
+            <GrantRole type="teacher" role={item.role_id} account={item.tid} />
+          )),
         onOk: async () => {
           await vnode.componentInstance.confirm();
           this.getData();
@@ -411,44 +438,44 @@ export default {
 function createSearchOptions() {
   return [
     {
-      label: '工号',
-      key: 'tid',
-      default: '',
-      component: 'input',
-			align: 'center'
+      label: "工号",
+      key: "tid",
+      default: "",
+      component: "input",
+      align: "center",
     },
     {
-      label: '姓名',
-      key: 'name',
-      default: '',
-      component: 'input',
-			align: 'center'
+      label: "姓名",
+      key: "name",
+      default: "",
+      component: "input",
+      align: "center",
     },
-		{
-      label: '性别',
-      key: 'sex',
+    {
+      label: "性别",
+      key: "sex",
       default: undefined,
-			align: 'center',
+      align: "center",
       props: {
         options: sexes,
       },
     },
     {
-      label: '职称',
-      key: 'rank',
+      label: "职称",
+      key: "rank",
       default: undefined,
-      component: 'select',
-			align: 'center',
+      component: "select",
+      align: "center",
       props: {
         options: ranks,
       },
     },
-		{
-      label: '学院',
-      key: 'collageId',
+    {
+      label: "学院",
+      key: "collageId",
       default: undefined,
-      component: 'select',
-			align: 'center',
+      component: "select",
+      align: "center",
       props: {
         options: grades,
       },