From 6d2b14fcc51753494176a373ea181e62729cde9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Tue, 11 Nov 2025 17:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=20=E8=80=81=E5=B8=88=E6=97=B6=20=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E9=94=99=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/student/index.vue | 126 ++++++++++++++++--------------
 src/views/teacher/index.vue | 150 +++++++++++++++++++++---------------
 2 files changed, 154 insertions(+), 122 deletions(-)

diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 33fc7ff..69c08f0 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -20,8 +20,7 @@
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
@@ -38,25 +37,28 @@
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
-        <el-form-item style="width: 100px" v-show="search.schoolId">
-          <el-select v-model="search.classId" placeholder="班级" clearable filterable>
+        <el-form-item v-show="search.schoolId" style="width: 100px">
+          <el-select
+            v-model="search.classId"
+            placeholder="班级"
+            clearable
+            filterable
+          >
             <el-option
               v-for="item in classList"
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="handleReloadPaged" :icon="Search"
+          <el-button type="primary" :icon="Search" @click="handleReloadPaged"
             >查询</el-button
           >
 
@@ -64,7 +66,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="toolbar-container" v-show="!selectUser">
+    <div v-show="!selectUser" class="toolbar-container">
       <!-- 按钮组 -->
       <el-button type="success" @click="importData">导入用户</el-button>
       <el-button type="default" @click="downLoadImportUsersTemplate"
@@ -74,40 +76,49 @@
         >导出用户</el-button
       > -->
     </div>
-    <div class="toolbar-container" v-show="!selectUser">
+    <div v-show="!selectUser" class="toolbar-container">
       <!-- 按钮组 -->
-      <el-button type="success" @click="AddDialog" plain>新增</el-button>
+      <el-button type="success" plain @click="AddDialog">新增</el-button>
     </div>
     <el-table
-      @row-dblclick="setCurrent"
-      @row-click="selectUserClick"
       ref="selectUserTable"
       :data="table.data"
-      @selection-change="handleSelectionChange"
       style="width: 100%"
       :max-height="maxTableHeight"
+      @row-dblclick="setCurrent"
+      @row-click="selectUserClick"
+      @selection-change="handleSelectionChange"
     >
       <!-- <el-table-column type="selection" width="40" /> -->
       <el-table-column label="操作" width="100">
         <template #default="scope">
-          <el-button text type="primary" @click="EditDialog(scope.row)" plain
+          <el-button text type="primary" plain @click="EditDialog(scope.row)"
             >修改</el-button
           >
         </template>
       </el-table-column>
       <el-table-column label="学生信息" width="450">
         <template #default="scope">
-          <el-tooltip :content="`id ` + scope.row.id" placement="top" effect="light">
+          <el-tooltip
+            :content="`id ` + scope.row.id"
+            placement="top"
+            effect="light"
+          >
             <div>
               <span :tips="scope.row.id">{{ scope.row.realName }}</span>
               <div
-                class="inline-block"
                 v-for="(position, index) in scope.row.positions"
+                v-show="
+                  index < 3 ||
+                  (index >= 3 && showAllPosition.includes(scope.row))
+                "
                 :key="'Position' + index"
-                v-show="index < 3 || (index >= 3 && showAllPosition.includes(scope.row))"
+                class="inline-block"
               >
                 <div class="subjectTagEnableDiv">
-                  <el-tag v-if="position.enable === false" type="info">已禁用</el-tag>
+                  <el-tag v-if="position.enable === false" type="info"
+                    >已禁用</el-tag
+                  >
                   <el-tag>{{ position.schoolName || "-" }}</el-tag>
                   <el-tag type="success">{{
                     position.graduationYear
@@ -135,9 +146,8 @@
         <template #default="scope">
           <span v-if="!scope.row.reliefApplication">未申请</span>
           <span v-else
-            >{{ scope.row.reliefSubTime }}申请{{ scope.row.amountRelief }}元 <br />{{
-              scope.row.reliefType
-            }}
+            >{{ scope.row.reliefSubTime }}申请{{ scope.row.amountRelief }}元
+            <br />{{ scope.row.reliefType }}
           </span>
         </template>
       </el-table-column>
@@ -152,20 +162,20 @@
     </el-table>
     <el-pagination
       style="display: flex; justify-content: center; padding-top: 10px"
-      @size-change="pageSizeChange"
-      @current-change="pageIndexChange"
       :current-page="pagination.now"
       :page-sizes="[10, 20, 40, 80, 100]"
       :page-size="pagination.size"
       layout="prev, pager, next,sizes, total"
       :total="pagination.total"
+      @size-change="pageSizeChange"
+      @current-change="pageIndexChange"
     />
     <div class="dialog-container">
       <el-dialog
         v-if="dialog.update.visible"
         ref="UserEditFromDialog"
-        :title="dialog.update.title"
         v-model="dialog.update.visible"
+        :title="dialog.update.title"
         :width="dialog.update.width"
         :close-on-click-modal="dialog.close"
         :close-on-press-escape="dialog.close"
@@ -189,7 +199,7 @@ import {
   getSubjectData,
   getPageUserList,
   UserDetail,
-  Position,
+  Position
 } from "@/api/userCenter";
 import { getenum } from "@/api/enum";
 import { hTableAPI } from "@/api/hTable";
@@ -201,7 +211,7 @@ import {
   Message,
   ArrowDownBold,
   Search,
-  Star,
+  Star
 } from "@element-plus/icons-vue";
 import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
 import { ImportStudent, PageList } from "@/api/student";
@@ -271,20 +281,20 @@ interface DialogData {
 const props = defineProps({
   selectUser: {
     type: Boolean,
-    default: false,
+    default: false
   },
   selectCallBack: {
     type: Function,
-    default: () => {},
+    default: () => {}
   },
   maxTableHeight: {
     type: Number,
-    default: 580,
+    default: 580
   },
   searchData: {
     type: Object as () => SearchParams,
-    default: undefined,
-  },
+    default: undefined
+  }
 });
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
@@ -305,13 +315,13 @@ const search = reactive<SearchParams>({
   grade: "",
   classId: "",
   subjectId: "",
-  positionId: "",
+  positionId: ""
 });
 
 const userTypeList = ref<ComboModel[]>([
   { value: 1, text: "学生" },
   { value: 2, text: "教师" },
-  { value: 3, text: "管理员" },
+  { value: 3, text: "管理员" }
 ]);
 
 const userLevelList = ref<ComboModel[]>([]);
@@ -325,13 +335,13 @@ const table = reactive<TableData>({
   data: [],
   selectRows: [],
   sort: "",
-  border: true,
+  border: true
 });
 
 const pagination = reactive<PaginationData>({
   index: 1,
   size: 10,
-  total: 0,
+  total: 0
 });
 
 const dialog = reactive<DialogData>({
@@ -339,32 +349,32 @@ const dialog = reactive<DialogData>({
   update: {
     title: "",
     visible: false,
-    width: "1000px",
+    width: "1000px"
   },
   editLevel: {
     userIds: [],
     title: "",
     visible: false,
-    width: "400px",
+    width: "400px"
   },
   editSubjectLevel: {
     userIds: [],
     title: "",
     visible: false,
-    width: "450px",
+    width: "450px"
   },
   bindUser: {
     title: "分配权限码",
     visible: false,
     width: "1150px",
-    height: "",
+    height: ""
   },
   userBindInfo: {
     title: "用户权限码",
     visible: false,
     width: "1150px",
-    height: "",
-  },
+    height: ""
+  }
 });
 
 const checkUserBindInfo = () => {
@@ -427,7 +437,7 @@ const exportUser = async () => {
     SubjectId: search.subjectId || 0,
     PositionId: search.positionId || 0,
     PageIndex: pagination.index,
-    PageSize: pagination.size,
+    PageSize: pagination.size
   };
 
   // const res = await exportUserApi(data);
@@ -488,9 +498,9 @@ const getClass = () => {
   const data = {
     schoolId: search.schoolId || 0,
     graduationYear: search.graduationYear || 0,
-    grade: search.grade,
+    grade: search.grade
   };
-  getClassCombo(data).then((res) => {
+  getClassCombo(data).then(res => {
     if (res.code === 200) {
       classList.value = res.data;
     }
@@ -510,12 +520,12 @@ const fetchPagedData = (searchUnUse = false) => {
     PositionId: search.positionId || 0,
     PageIndex: pagination.index,
     PageSize: pagination.size,
-    UnUsed: searchUnUse,
+    UnUsed: searchUnUse
   };
-  PageList(data).then((res) => {
+  PageList(data).then(res => {
     if (res.code === 200) {
       pagination.total = res.data.total;
-      res.data.data.forEach((item) => {
+      res.data.data.forEach(item => {
         if (item.positions) {
           item.positions = PositionsSort(item.positions);
         }
@@ -593,14 +603,14 @@ const getUserLevelTag = (level: number) => {
   return level === 0
     ? "info"
     : level === 1
-    ? "success"
-    : level === 2
-    ? "warning"
-    : "error";
+      ? "success"
+      : level === 2
+        ? "warning"
+        : "error";
 };
 
 const getUserLevelText = (level: number) => {
-  const r = userLevelList.value.filter((w) => w.value === level);
+  const r = userLevelList.value.filter(w => w.value === level);
   if (r.length > 0) {
     return r[0].text;
   }
@@ -617,7 +627,7 @@ const PositionsSort = (arr: Position[]) => {
       return 1;
     }
   });
-  return arr;
+  return arr.filter(s => s.enable);
 };
 
 const handleReloadPaged = (event?: any, searchUnUse?: boolean) => {
@@ -663,7 +673,7 @@ const handleEditLevel = () => {
     return;
   }
   dialog.editLevel.title = "修改学生层次";
-  dialog.editLevel.userIds = table.selectRows.map((w) => w.id);
+  dialog.editLevel.userIds = table.selectRows.map(w => w.id);
   dialog.editLevel.visible = true;
 };
 
@@ -678,7 +688,7 @@ const handleEditSubjectLevel = () => {
     return;
   }
   dialog.editSubjectLevel.title = "修改学生科目层次";
-  dialog.editSubjectLevel.userIds = table.selectRows.map((w) => w.id);
+  dialog.editSubjectLevel.userIds = table.selectRows.map(w => w.id);
   dialog.editSubjectLevel.visible = true;
 };
 
@@ -724,7 +734,7 @@ const importData = () => {
 };
 
 const readerBlob = (data: Blob): Promise<any> => {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     const reader = new FileReader();
     reader.readAsText(data, "utf-8");
     reader.onload = function () {
diff --git a/src/views/teacher/index.vue b/src/views/teacher/index.vue
index 9ac9837..24f5d5d 100644
--- a/src/views/teacher/index.vue
+++ b/src/views/teacher/index.vue
@@ -25,14 +25,18 @@
         </el-form-item> -->
 
         <el-form-item v-show="search.userType === 1" style="width: 100px">
-          <el-select v-model="search.level" placeholder="学生层次" clearable filterable>
+          <el-select
+            v-model="search.level"
+            placeholder="学生层次"
+            clearable
+            filterable
+          >
             <el-option
               v-for="item in userLevelList"
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
@@ -49,8 +53,7 @@
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
@@ -67,49 +70,59 @@
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item v-show="search.schoolId" style="width: 100px">
-          <el-select v-model="search.classId" placeholder="班级" clearable filterable>
+          <el-select
+            v-model="search.classId"
+            placeholder="班级"
+            clearable
+            filterable
+          >
             <el-option
               v-for="item in classList"
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item v-show="search.schoolId" style="width: 100px">
-          <el-select v-model="search.subjectId" placeholder="科目" clearable filterable>
+          <el-select
+            v-model="search.subjectId"
+            placeholder="科目"
+            clearable
+            filterable
+          >
             <el-option
               v-for="item in subjectList"
               :key="item.value"
               :label="item.text"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="handleReloadPaged" :icon="Search"
+          <el-button type="primary" :icon="Search" @click="handleReloadPaged"
             >查询</el-button
           >
           <el-button type="default" @click="searchReload">重置</el-button>
         </el-form-item>
         <el-form-item v-show="selectUser">
-          <el-button type="success" @click="selectUserCallBack()" icon="el-icon-check"
+          <el-button
+            type="success"
+            icon="el-icon-check"
+            @click="selectUserCallBack()"
             >选择用户</el-button
           >
         </el-form-item>
       </el-form>
     </div>
-    <div class="toolbar-container" v-show="!selectUser">
+    <div v-show="!selectUser" class="toolbar-container">
       <!-- 按钮组 -->
       <el-button type="success" @click="importData">导入用户</el-button>
       <el-button type="default" @click="downLoadImportUsersTemplate"
@@ -119,23 +132,23 @@
         >导出用户</el-button
       > -->
     </div>
-    <div class="toolbar-container" v-show="!selectUser">
+    <div v-show="!selectUser" class="toolbar-container">
       <!-- 按钮组 -->
-      <el-button type="success" @click="AddDialog" plain>新增</el-button>
+      <el-button type="success" plain @click="AddDialog">新增</el-button>
     </div>
     <el-table
-      @row-dblclick="setCurrent"
-      @row-click="selectUserClick"
       ref="selectUserTable"
       :data="table.data"
-      @selection-change="handleSelectionChange"
       style="width: 100%"
       :max-height="maxTableHeight"
+      @row-dblclick="setCurrent"
+      @row-click="selectUserClick"
+      @selection-change="handleSelectionChange"
     >
       <!-- <el-table-column type="selection" width="40" /> -->
       <el-table-column label="操作" width="100">
         <template #default="scope">
-          <el-button text type="primary" @click="EditDialog(scope.row)" plain
+          <el-button text type="primary" plain @click="EditDialog(scope.row)"
             >修改</el-button
           >
         </template>
@@ -144,9 +157,13 @@
       <el-table-column prop="id" label="用户Id" width="100" />
       <el-table-column label="用户信息" width="200">
         <template #default="scope">
-          <el-tag :type="getUserTypeTag(scope.row.userType)" style="margin-right: 5px">{{
-            userTypeList.find((s) => s.value == scope.row.userType)?.text
-          }}</el-tag>
+          <el-tag
+            :type="getUserTypeTag(scope.row.userType)"
+            style="margin-right: 5px"
+            >{{
+              userTypeList.find(s => s.value == scope.row.userType)?.text
+            }}</el-tag
+          >
           <span>{{ scope.row.realName }} </span>
         </template>
       </el-table-column>
@@ -163,8 +180,10 @@
         <template #default="scope">
           <div
             v-for="(position, index) in scope.row.positions"
+            v-show="
+              index < 3 || (index >= 3 && showAllPosition.includes(scope.row))
+            "
             :key="'Position' + index"
-            v-show="index < 3 || (index >= 3 && showAllPosition.includes(scope.row))"
           >
             <div class="subjectTagEnableDiv">
               <el-tag>{{ position.schoolName || "-" }}</el-tag>
@@ -183,14 +202,16 @@
             </div>
           </div>
           <div
-            v-if="scope.row.positions != undefined && scope.row.positions.length > 3"
-            @click="showPosition(scope.row)"
+            v-if="
+              scope.row.positions != undefined && scope.row.positions.length > 3
+            "
             class="userTagRow"
+            @click="showPosition(scope.row)"
           >
             <el-icon
+              v-if="showAllPosition.includes(scope.row)"
               title="折叠职位"
               class="userTagRowItop"
-              v-if="showAllPosition.includes(scope.row)"
               ><ArrowDownBold
             /></el-icon>
             <el-icon v-else title="展开更多职位"><ArrowDownBold /></el-icon>
@@ -200,20 +221,20 @@
     </el-table>
     <el-pagination
       style="display: flex; justify-content: center"
-      @size-change="pageSizeChange"
-      @current-change="pageIndexChange"
       :current-page="pagination.now"
       :page-sizes="[10, 20, 40, 80, 100]"
       :page-size="pagination.size"
       layout="prev, pager, next,sizes, total"
       :total="pagination.total"
+      @size-change="pageSizeChange"
+      @current-change="pageIndexChange"
     />
     <div class="dialog-container">
       <el-dialog
         v-if="dialog.update.visible"
         ref="UserEditFromDialog"
-        :title="dialog.update.title"
         v-model="dialog.update.visible"
+        :title="dialog.update.title"
         :width="dialog.update.width"
         :close-on-click-modal="dialog.close"
         :close-on-press-escape="dialog.close"
@@ -237,7 +258,7 @@ import {
   getSubjectData,
   getPageUserList,
   UserDetail,
-  Position,
+  Position
 } from "@/api/userCenter";
 import { getenum } from "@/api/enum";
 import { hTableAPI } from "@/api/hTable";
@@ -249,7 +270,7 @@ import {
   Message,
   ArrowDownBold,
   Search,
-  Star,
+  Star
 } from "@element-plus/icons-vue";
 import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
 import { ImportTeacher } from "@/api/student";
@@ -319,20 +340,20 @@ interface DialogData {
 const props = defineProps({
   selectUser: {
     type: Boolean,
-    default: false,
+    default: false
   },
   selectCallBack: {
     type: Function,
-    default: () => {},
+    default: () => {}
   },
   maxTableHeight: {
     type: Number,
-    default: 580,
+    default: 580
   },
   searchData: {
     type: Object as () => SearchParams,
-    default: undefined,
-  },
+    default: undefined
+  }
 });
 
 const baseUrl = import.meta.env.VITE_API_USERCENTER_URL;
@@ -354,13 +375,13 @@ const search = reactive<SearchParams>({
   grade: "",
   classId: "",
   subjectId: "",
-  positionId: "",
+  positionId: ""
 });
 
 const userTypeList = ref<ComboModel[]>([
   { value: 1, text: "学生" },
   { value: 2, text: "教师" },
-  { value: 3, text: "管理员" },
+  { value: 3, text: "管理员" }
 ]);
 
 const userLevelList = ref<ComboModel[]>([]);
@@ -375,13 +396,13 @@ const table = reactive<TableData>({
   data: [],
   selectRows: [],
   sort: "",
-  border: true,
+  border: true
 });
 
 const pagination = reactive<PaginationData>({
   index: 1,
   size: 10,
-  total: 0,
+  total: 0
 });
 
 const dialog = reactive<DialogData>({
@@ -389,32 +410,32 @@ const dialog = reactive<DialogData>({
   update: {
     title: "",
     visible: false,
-    width: "1000px",
+    width: "1000px"
   },
   editLevel: {
     userIds: [],
     title: "",
     visible: false,
-    width: "400px",
+    width: "400px"
   },
   editSubjectLevel: {
     userIds: [],
     title: "",
     visible: false,
-    width: "450px",
+    width: "450px"
   },
   bindUser: {
     title: "分配权限码",
     visible: false,
     width: "1150px",
-    height: "",
+    height: ""
   },
   userBindInfo: {
     title: "用户权限码",
     visible: false,
     width: "1150px",
-    height: "",
-  },
+    height: ""
+  }
 });
 
 const checkUserBindInfo = () => {
@@ -477,7 +498,7 @@ const exportUser = async () => {
     SubjectId: search.subjectId || 0,
     PositionId: search.positionId || 0,
     PageIndex: pagination.index,
-    PageSize: pagination.size,
+    PageSize: pagination.size
   };
 
   // const res = await exportUserApi(data);
@@ -538,9 +559,9 @@ const getClass = () => {
   const data = {
     schoolId: search.schoolId || 0,
     graduationYear: search.graduationYear || 0,
-    grade: search.grade,
+    grade: search.grade
   };
-  getClassCombo(data).then((res) => {
+  getClassCombo(data).then(res => {
     if (res.code === 200) {
       classList.value = res.data;
     }
@@ -560,12 +581,12 @@ const fetchPagedData = (searchUnUse = false) => {
     PositionId: search.positionId || 0,
     PageIndex: pagination.index,
     PageSize: pagination.size,
-    UnUsed: searchUnUse,
+    UnUsed: searchUnUse
   };
-  getPageUserList(data).then((res) => {
+  getPageUserList(data).then(res => {
     if (res.code === 200) {
       pagination.total = res.data.total;
-      res.data.data.forEach((item) => {
+      res.data.data.forEach(item => {
         if (item.positions) {
           item.positions = PositionsSort(item.positions);
         }
@@ -587,14 +608,14 @@ const getUserLevelTag = (level: number) => {
   return level === 0
     ? "info"
     : level === 1
-    ? "success"
-    : level === 2
-    ? "warning"
-    : "error";
+      ? "success"
+      : level === 2
+        ? "warning"
+        : "error";
 };
 
 const getUserLevelText = (level: number) => {
-  const r = userLevelList.value.filter((w) => w.value === level);
+  const r = userLevelList.value.filter(w => w.value === level);
   if (r.length > 0) {
     return r[0].text;
   }
@@ -611,7 +632,7 @@ const PositionsSort = (arr: Position[]) => {
       return 1;
     }
   });
-  return arr;
+  return arr.filter(s => s.enable);
 };
 
 function searchReload() {
@@ -661,7 +682,7 @@ const handleEditLevel = () => {
     return;
   }
   dialog.editLevel.title = "修改学生层次";
-  dialog.editLevel.userIds = table.selectRows.map((w) => w.id);
+  dialog.editLevel.userIds = table.selectRows.map(w => w.id);
   dialog.editLevel.visible = true;
 };
 
@@ -676,7 +697,7 @@ const handleEditSubjectLevel = () => {
     return;
   }
   dialog.editSubjectLevel.title = "修改学生科目层次";
-  dialog.editSubjectLevel.userIds = table.selectRows.map((w) => w.id);
+  dialog.editSubjectLevel.userIds = table.selectRows.map(w => w.id);
   dialog.editSubjectLevel.visible = true;
 };
 
@@ -694,6 +715,7 @@ const importData = () => {
   fileE.onchange = async function () {
     formData.append("file", fileE.files[0]);
     let res = await ImportTeacher(fileE.files[0]);
+    debugger;
     if (res.code != undefined) {
       if (res.code !== 200) return ElMessage.error(res.message);
       else return ElMessage.success("所有数据录入成功");
@@ -701,7 +723,7 @@ const importData = () => {
       let json = JSON.parse(await res.text());
       let code = json.code || json.Code;
       if (json !== undefined && code !== 200) {
-        return ElMessage.error(json.Message);
+        return ElMessage.error(json.message);
       } else {
         return ElMessage.success("操所有数据录入成功作成功");
       }