Merge pull request 'dev' (#37) from dev into staging

Reviewed-on: #37

src/views/teacher/index.vue

@@ -28,12 +28,7 @@
         </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"
@@ -78,12 +73,7 @@
         </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"
@@ -94,12 +84,7 @@
         </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"
@@ -116,10 +101,7 @@
           <el-button type="default" @click="searchReload">重置</el-button>
         </el-form-item>
         <el-form-item v-show="selectUser">
-          <el-button
-            type="success"
-            icon="el-icon-check"
-            @click="selectUserCallBack()"
+          <el-button type="success" icon="el-icon-check" @click="selectUserCallBack()"
             >选择用户</el-button
           >
         </el-form-item>
@@ -160,13 +142,9 @@
       <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>
@@ -183,9 +161,7 @@
         <template #default="scope">
           <div
             v-for="(position, index) in scope.row.positions"
-            v-show="
-              index < 3 || (index >= 3 && showAllPosition.includes(scope.row))
-            "
+            v-show="index < 3 || (index >= 3 && showAllPosition.includes(scope.row))"
             :key="'Position' + index"
           >
             <div class="subjectTagEnableDiv">
@@ -205,9 +181,7 @@
             </div>
           </div>
           <div
-            v-if="
-              scope.row.positions != undefined && scope.row.positions.length > 3
-            "
+            v-if="scope.row.positions != undefined && scope.row.positions.length > 3"
             class="userTagRow"
             @click="showPosition(scope.row)"
           >
@@ -261,7 +235,7 @@ import {
   getSubjectData,
   getPageUserList,
   UserDetail,
-  Position
+  Position,
 } from "@/api/userCenter";
 import { getenum } from "@/api/enum";
 import { hTableAPI } from "@/api/hTable";
@@ -274,7 +248,7 @@ import {
   ArrowDownBold,
   Search,
   Star,
-  Phone
+  Phone,
 } from "@element-plus/icons-vue";
 import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
 import { ImportTeacher } from "@/api/student";
@@ -345,20 +319,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;
@@ -381,13 +355,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[]>([]);
@@ -402,13 +376,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>({
@@ -416,32 +390,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 = () => {
@@ -504,7 +478,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);
@@ -565,9 +539,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;
     }
@@ -588,12 +562,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);
         }
@@ -615,14 +589,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;
   }
@@ -639,7 +613,7 @@ const PositionsSort = (arr: Position[]) => {
       return 1;
     }
   });
-  return arr.filter(s => s.enable);
+  return arr.filter((s) => s.enable);
 };
 
 function searchReload() {
@@ -689,7 +663,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;
 };
 
@@ -704,7 +678,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;
 };
 
@@ -744,10 +718,10 @@ const importData = () => {
     document.body.removeChild(link);
     ElMessage({
       showClose: true,
-      type: 'warning',
-      message: '导入失败,已导出错误数据.',
+      type: "warning",
+      message: "导入失败,已导出错误数据.",
       duration: 0,
-    })
+    });
   };
   try {
     fileE.click();

src/views/toschoolinfomanage/editModal.vue

@@ -73,9 +73,9 @@
 
       <el-divider />
 
-      <el-descriptions title="基础工作" :column="1" border>
+      <el-descriptions v-if="!isDetail" title="基础工作" :column="1" border>
         <el-descriptions-item label="座谈">
-          <div v-if="!isDetail" class="flexCenterWrap">
+          <div class="flexCenterWrap">
             <el-tag :type="safeDetail.isDiscussion ? 'success' : 'info'">
               {{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
             </el-tag>
@@ -93,12 +93,9 @@
               placeholder="请输入座谈情况"
             />
           </div>
-          <div v-else>
-            {{ safeDetail.isDiscussion ? safeDetail.discussion : "未开展" }}
-          </div>
         </el-descriptions-item>
         <el-descriptions-item label="班会">
-          <div v-if="!isDetail" class="flexCenterWrap">
+          <div class="flexCenterWrap">
             <el-tag :type="safeDetail.isClassMeeting ? 'success' : 'info'">
               {{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
             </el-tag>
@@ -116,11 +113,22 @@
               placeholder="请输入班会情况"
             />
           </div>
-          <div v-else>
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <el-descriptions v-else title="基础工作" :column="1" border>
+        <el-descriptions-item label="座谈">
+          <div>
             {{ safeDetail.isDiscussion ? safeDetail.discussion : "未开展" }}
           </div>
         </el-descriptions-item>
+        <el-descriptions-item label="班会">
+          <div>
+            {{ safeDetail.isClassMeeting ? safeDetail.classMeeting : "未开展" }}
+          </div>
+        </el-descriptions-item>
       </el-descriptions>
+
       <el-divider />
       <el-descriptions title="反馈问题" :column="1" border> </el-descriptions>
       <div style="display: flex; gap: 40px; margin-bottom: 5px">