Merge pull request 'staging' (#23) from staging into master

Reviewed-on: #23

.env.development

@@ -7,8 +7,12 @@ VITE_PUBLIC_PATH = /
 # 开发环境路由历史模式（Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数"）
 VITE_ROUTER_HISTORY = "hash"
 
-VITE_API_BASEURL = "http://192.168.2.33:5199/api"
 # 接口地址
-# VITE_API_BASEURL = "http://localhost:5199/api"
+VITE_API_BASEURL = "http://192.168.2.33:5199/api"
 #数据中心后台地址
 VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"
+
+# # 接口地址
+# VITE_API_BASEURL = "https://learn-archives-admin-dev.23544.com/api"
+# #数据中心后台地址
+# VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"

src/api/admin.ts

@@ -0,0 +1,25 @@
+import { http } from "@/utils/http";
+import { Res } from "@/utils/http/types";
+// import type { Res } from "@/utils/http/types";
+
+/**
+ * @description 导入表单
+ * @return {object}
+ */
+export function ImportAdminInfo( file: File) {
+  let formData = new FormData();
+  formData.append("file", file);
+  return http.request<any>(
+    "post",
+    `Admin/Import`,
+    {
+      data: formData
+    },
+    {
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      responseType: "blob"
+    }
+  );
+}

src/api/exam.ts

@@ -1,4 +1,5 @@
 import { http } from "@/utils/http";
+import { Res } from "@/utils/http/types";
 // import type { Res } from "@/utils/http/types";
 
 /**
@@ -29,7 +30,31 @@ export function ImportExamInfo(id: number, file: File) {
  * @return {object}
  */
 export function DeleteExamInfo(data: { classId: number; examId: number }) {
-  return http.request<any>("post", `ExamClassInfo/DeleteExamInfo`, {
+  return http.request<Res<any>>("post", `ExamClassInfo/DeleteExamInfo`, {
     data
   });
 }
+
+/**
+ * @description 重算考试排名
+ * @return {object}
+ */
+export function RecalculateExamRankings(examId: Number) {
+  return http.request<Res<any>>(
+    "get",
+    `ExamClassInfo/RecalculateExamRankings`,
+    {
+      params: { examId }
+    }
+  );
+}
+
+/**
+ * @description 获取班级考试分段排名
+ * @return {object}
+ */
+export function ClassRanking(examId: Number,classId: Number) {
+  return http.request<Res<any>>("get", `ExamClassInfo/ClassRanking`, {
+    params: { examId, classId }
+  });
+}

src/api/hTable.ts

@@ -22,7 +22,7 @@ export class hTableAPI {
   delete(data) {
     return http.request<Res<any>>("post", `${this.url}/Del`, { data });
   }
-  querycombo(data) {
+  querycombo(data = {}) {
     return http.request<Res<ComboModel[]>>("post", `${this.url}/QueryCombo`, {
       data
     });

src/api/student.ts

@@ -72,3 +72,13 @@ export function PageList(data) {
 export function StudentInfo(uid) {
   return http.request<Res<any>>("get", `Student/Info?uid=${uid}`);
 }
+
+/**
+ * @description 通过职位信息获取职位id
+ * @return {object}
+ */
+export function PosititonIds(data:any[]) {
+  return http.request<Res<number[]>>("post", `Student/PosititonIds`, {
+    data
+  });
+}

src/api/userCenter.ts

@@ -1,6 +1,7 @@
 import { ComboModel } from "@/components/hTable/hTable";
 import { http } from "@/utils/http";
 import type { Res, ResPage } from "@/utils/http/types";
+import { Ref } from "vue";
 /**
  * @description 获取枚举下拉
  * @param {string} type 枚举类型 type=StatusEnum
@@ -151,12 +152,14 @@ export interface Position {
   graduationYear: number;
   grade: string;
   classId: number;
+  gradeLevel: string;
   className: string;
   subjectId: number;
   subjectName: string;
   positionType: number;
   positionLevel: number;
   status: boolean;
+  classList?: ComboModel[];
 }
 
 /**

src/components/hTable/hTable.ts

@@ -1,3 +1,5 @@
+import { array } from "vue-types";
+
 export interface Dialog {
   /** 对话框是否可见 */
   visible: boolean;
@@ -93,13 +95,18 @@ export enum ConditionalType {
 }
 
 /** 字段设置项 */
-export interface FieldSetting {
+export class FieldSetting {
+
+  constructor() {
+    this.datasource = [];
+    this.mapValue= "value",
+    this.maplabel= "text" 
+
+   }
   /**map 时Value的取值的属性 */
   mapValue?: string;
   /**map 时label的取值的属性 */
   maplabel?: string;
-  /** 数据源 请求方式 */
-  datasourceStr?: string;
   /**
    * 图片地址 获取方式
    * @param value 当前值
@@ -116,44 +123,152 @@ export interface ComboModel {
   value: any;
   text: string;
 }
-/** 表格列配置 */
+/** 新增修改的配置 */
-export interface TableColumn {
+export class TableColumnEdit {
-  /** 显示标签 */
+  /**
-  label: string;
+   *
-  /** 是否可搜索 */
+   * @param add 字段可以添加
-  search: boolean;
+   * @param edit 字段可以修改
-  /** 搜索类型 */
+   * @param multiple [type=dropdown]是否多选
-  searchType?: ConditionalType;
+   * @param editShow 编辑时显示列
+   * @param editRows [type=textarea]编辑时的行数
+   * @param rules 校验规则
+   */
+  constructor(
+    add: boolean = false,
+    edit: boolean = false,
+    multiple: boolean = false,
+    editShow: boolean = true,
+    editRows: number = 3,
+    editDefault: any = "",
+    rules: any | Array<any> = null,
+    change: () => void = null
+  ) {
+    this.add = add;
+    this.edit = edit;
+    this.multiple = multiple;
+    this.editShow = editShow;
+    this.editRows = editRows;
+    this.editDefault = editDefault;
+    this.rules = rules;
+    this.change = change;
+  }
   /** 是否允许添加  [false]*/
   add?: boolean;
   /** 是否允许修改  [false]*/
   edit?: boolean;
-  /** 列宽度 [auto]*/
+  /** [type=dropdown]是否多选 */
-  width?: string;
-  /** 字段类型 */
-  type?: "string" | "dropdown" | "switch" | "img" | "datetime" | "textarea";
-  /** 是否多选 */
   multiple?: boolean;
   /** 编辑时显示列 */
   editShow?: boolean;
   /**校验规则 */
   rules?: any | Array<any>;
-  /** 显示列 */
+  /** [type=textarea]编辑时的行数 */
+  editRows?: number;
+
+  /** 新增编辑时的缓存值 */
+  valueE?: Array<string> | string | number | boolean | Date;
+  /** 新增编辑时的默认 */
+  editDefault?: Array<string> | string | number | boolean | Date;
+
+  /**编辑时值发生变化 */
+  change?: () => void;
+}
+/** 查询的配置 */
+export class TableColumnSearch {
+  /**
+   * 
+   * @param yes 列是否可以查询
+   * @param sort 列是否可以排序
+   * @param searchType 查询时候的值比较类型
+   */
+  constructor(yes: boolean = false, 
+    searchType: ConditionalType = ConditionalType.Like,sort: boolean = false){
+      this.yes = yes;
+      this.sort = sort;
+      this.searchType = searchType;
+  }
+  /**可以查询   [false] */
+  yes?: boolean;
+  /** 可以排序 [false]*/
+  sort?: boolean;
+  /** 搜索类型 */
+  searchType?: ConditionalType;
+  /** 查询缓存值 */
+  value?: Array<string> | string | number | boolean | Date;
+}
+
+/** 表格列配置 */
+export class TableColumn {
+  constructor() {
+    this.type = "string";
+    this.show = true;
+    this.search = new TableColumnSearch();
+    this.edit = new TableColumnEdit();
+    this.fixed = false;
+    this.setting = {};
+  }
+
+  /** 显示标签 */
+  label: string;
+  fixed?: 'left' | 'right'| boolean;
+  /** 查询配置 */
+  search?: TableColumnSearch;
+  /** 编辑配置 */
+  edit?: TableColumnEdit;
+  /** Table中展示宽度 [auto]*/
+  width?: string;
+  /** 字段类型 */
+  type?: "string" | "dropdown" | "switch" | "img" | "datetime" | "textarea";
+  /** 显示列 [不会动态计算]*/
   show?: boolean;
   /** 字段设置 */
   setting?: FieldSetting;
-  /** 修改时的编辑值 */
-  valueE?: Array<string> | string | number | boolean | Date;
-  /** 查询值 */
-  value?: Array<string> | string | number | boolean | Date;
-  /** textarea编辑时的行数 */
-  editRows?: number;
-  /**编辑时值发生变化 */
-  change?: () => void;
   /**列值初始化时 如何获取默认取对应列*/
   custom?: (row: any) => string;
 }
 
+
+
+/** 表格列配置 */
+// export interface TableColumn {
+//   /** 显示标签 */
+//   label: string;
+
+//   /** 是否可搜索 */
+//   search: boolean;
+//   /** 搜索类型 */
+//   searchType?: ConditionalType;
+//   /** 是否允许添加  [false]*/
+//   add?: boolean;
+//   /** 是否允许修改  [false]*/
+//   edit?: boolean;
+//   /** Table中展示宽度 [auto]*/
+//   width?: string;
+//   /** 字段类型 */
+//   type?: "string" | "dropdown" | "switch" | "img" | "datetime" | "textarea";
+//   /** 是否多选 */
+//   multiple?: boolean;
+//   /** 编辑时显示列 */
+//   editShow?: boolean;
+//   /**校验规则 */
+//   rules?: any | Array<any>;
+//   /** 显示列 */
+//   show?: boolean;
+//   /** 字段设置 */
+//   setting?: FieldSetting;
+//   /** 修改时的编辑值 */
+//   valueE?: Array<string> | string | number | boolean | Date;
+//   /** 查询值 */
+//   value?: Array<string> | string | number | boolean | Date;
+//   /** textarea编辑时的行数 */
+//   editRows?: number;
+//   /**编辑时值发生变化 */
+//   change?: () => void;
+//   /**列值初始化时 如何获取默认取对应列*/
+//   custom?: (row: any) => string;
+// }
+
 /** 分页数据 */
 export interface PageData {
   /** 总条数 */
@@ -173,24 +288,39 @@ export interface ConditionalModel {
 }
 
 /** 搜索条件 */
-export interface SearchConditions {
+export class SearchConditions {
+  /**
+   *
+   */
+  constructor() {
+    this.show = true;
+    this.showPage = true;
+    this.PageIndex = 0;
+    this.PageSize = 20;
+    this.OrderBy = "Id";
+    this.OrderByType = 1;
+    this.defaultConditions = [];
+    this.Conditions = [];
+  }
   /** 是否显示搜索 */
-  show: boolean;
+  show?: boolean;
+  /**  显示分页器 */
+  showPage?:boolean;
   /** 当前页码 */
-  PageIndex: number;
+  PageIndex?: number;
   /** 每页大小 */
-  PageSize: number;
+  PageSize?: number;
   /** 排序字段 */
-  OrderBy: string;
+  OrderBy?: string;
   /**排序顺序
    * @tips 0:升序 1:降序
    * @默认 = 1
    */
   OrderByType?: 0 | 1;
   /** 默认查询条件 */
-  defaultConditions: ConditionalModel[];
+  defaultConditions?: ConditionalModel[];
   /** 查询条件 */
-  Conditions: any[];
+  Conditions?: any[];
 }
 
 /** 表格配置 */
@@ -199,6 +329,8 @@ export interface TableConfig {
   searchCallback?: (s: SearchConditions) => void;
   /** 新增/修改回调函数 */
   editCallback?: (from: any) => void;
+  /** 展开行的回调 */
+  expandChange?: (row: any, expandedRows: any[]) => void;
   /** API地址 */
   apiUrl: string;
   /** 是否显示选择列 */
@@ -207,6 +339,10 @@ export interface TableConfig {
   search: SearchConditions;
   /** 是否显示操作列 */
   operationColumn: boolean;
+  /** 操作列是否固定列 */
+  operationColumnFixed?: "left" | "right" | boolean;
+  /** 是否允许展开列 */
+  expandColumn?: boolean;
   /** 操作按钮配置 */
   operationColumnData: OperationButton[];
   /** 列配置 */
@@ -224,3 +360,92 @@ export interface TableConfig {
   /**是否显示 */
   show?: boolean;
 }
+/** 初始化表格数据 */
+export function intTableData(tValue: TableConfig): TableConfig {
+  if (!tValue.data) tValue.data = [];
+  if (!tValue.selectRows) tValue.selectRows = [];
+  if (tValue.border == null) tValue.border = true;
+  if (tValue.operationColumnFixed == null) tValue.operationColumnFixed = false;
+  if (tValue.expandColumn == null) tValue.expandColumn = false;
+  if (!tValue.pageData) tValue.pageData = { total: 0 };
+  if (tValue.operationTop === undefined) tValue.operationTop = true;
+
+  //分页查询配置
+  tValue.search= { ...new SearchConditions(), ...tValue.search };
+
+  // 处理 column 的属性
+  for (const key in tValue.column) {
+    tValue.column[key] = { ...new TableColumn(), ...tValue.column[key] };
+    const element = tValue.column[key];
+
+    element.edit = { ...new TableColumnEdit(), ...element.edit };
+    element.search = { ...new TableColumnSearch(), ...element.search };
+    element.setting = { ...new FieldSetting(), ...element.setting };
+
+    //已有的情况下以 传入为主
+    if (element.custom != undefined) continue;
+    switch (element.type) {
+      case "switch":
+      case "dropdown": {
+        element.custom = row => {
+          const value = Array.isArray(row[key]) ? row[key] : [row[key]];
+          const res = value.map(item => {
+            const sc = element.setting.datasource.find(
+              s => s[element.setting.mapValue] + "" == item + ""
+            );
+            return !sc ? item : sc[element.setting.maplabel];
+          });
+          return res.join(",");
+        };
+        break;
+      }
+
+      case "string":
+      case undefined: {
+        element.custom = row => row[key];
+        break;
+      }
+      default: {
+        element.custom = row => row[key];
+        break;
+      }
+    }
+  }
+
+  // 处理 operationColumnData 的属性
+  for (const key in tValue.operationColumnData) {
+    const element = tValue.operationColumnData[key];
+    if (element.show === undefined) element.show = true;
+  }
+  return tValue;
+}
+
+/**
+ * 生成 毕业届下拉
+ */
+export function gradeComboModel(): ComboModel[] {
+  const now = new Date();
+  const currentYear = now.getFullYear();
+  const currentMonth = now.getMonth() + 1;
+
+  const isAfterAugust = currentMonth >= 9;
+  const baseYear = isAfterAugust ? currentYear : currentYear - 1;
+
+  const gradeOffsets = [
+    { baseGradeName: "初", yearOffset: 0, grade: "初一" }, // 初一
+    { baseGradeName: "初", yearOffset: 1, grade: "初二" }, // 初二
+    { baseGradeName: "初", yearOffset: 2, grade: "初三" }, // 初三
+    { baseGradeName: "高", yearOffset: 0, grade: "高一" }, // 高一
+    { baseGradeName: "高", yearOffset: 1, grade: "高二" }, // 高二
+    { baseGradeName: "高", yearOffset: 2, grade: "高三" }, // 高三
+  ];
+
+  return gradeOffsets.map(
+    (item): ComboModel => {
+      const entranceYear = baseYear - item.yearOffset;
+      const graduationYear = entranceYear + 3;
+      let v = `${item.baseGradeName}${graduationYear}届`;
+      return { text: v + ` [${item.grade}]`, value: v };
+    }
+  );
+}

src/components/hTable/hTableEdit.vue

@@ -55,11 +55,11 @@ function intiColumn() {
   for (const key in editData.value.table.column) {
     const element = editData.value.table.column[key];
     if (editData.value.isedit) {
-      if (element.edit) {
+      if (element.edit.edit) {
         column.value[key] = element;
       }
     } else {
-      if (element.add) {
+      if (element.edit.add) {
         column.value[key] = element;
       }
     }
@@ -81,8 +81,8 @@ function handleSubmitForm() {
     } else form.id = 0;
     for (const key in column.value) {
       const element = column.value[key];
-      if (element.valueE !== null && element.valueE !== "") {
+      if (element.edit.valueE !== null && element.edit.valueE !== "") {
-        form[key] = element.valueE;
+        form[key] = element.edit.valueE;
       }
     }
     if (editData.value.table.editCallback) {
@@ -102,28 +102,29 @@ function handleSubmitForm() {
 function handleResetForm() {
   for (const key in column.value) {
     let item = column.value[key];
-    if (Array.isArray(item.valueE)) {
+    if (item.edit.editDefault != null) item.edit.valueE = item.edit.editDefault;
-      item.valueE = [];
+    else if (Array.isArray(item.edit.valueE)) {
-    } else if (typeof item.valueE === "number") {
+      item.edit.valueE = [];
-      item.valueE = "";
+    } else if (typeof item.edit.valueE === "number") {
-    } else if (typeof item.valueE === "boolean") {
+      item.edit.valueE = "";
-      item.valueE = false;
+    } else if (typeof item.edit.valueE === "boolean") {
+      item.edit.valueE = false;
     } else {
-      item.valueE = "";
+      item.edit.valueE = "";
     }
   }
 }
 function fetchInitData() {}
 function fetchFormData() {
   editData.value.loading = false;
-  if (editData.value.isedit) {
   handleResetForm();
+  if (editData.value.isedit) {
     Api.Info(props.id).then((res) => {
       if (res.code === 200) {
         editData.value.frorm = res.data;
         for (const key in column.value) {
           const element = column.value[key];
-          element.valueE = res.data[key];
+          element.edit.valueE = res.data[key];
         }
       }
       editData.value.loading = true;
@@ -145,32 +146,32 @@ function fetchFormData() {
     >
       <el-form-item
         v-for="(o, k, i) in column"
-        v-show="execute(o['editShow'], o)"
+        v-show="execute(o.edit['editShow'], o)"
         :key="i"
-        :rules="o.rules"
+        :rules="o.edit.rules"
-        :prop="'' + k + '.valueE'"
+        :prop="'' + k + '.edit.valueE'"
         :label="o.label"
       >
         <div v-if="o.type.trim() == 'datetime'">
           <el-date-picker
-            v-model="o.valueE as Date"
+            v-model="o.edit.valueE as Date"
             type="date"
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD"
             :placeholder="o.label"
             class="elWidth"
-            @change="o.change"
+            @change="o.edit.change"
           />
         </div>
         <div v-else-if="o.type.trim() == 'dropdown'">
           <el-select
-            v-model="o.valueE"
+            v-model="o.edit.valueE"
-            :multiple="o.multiple"
+            :multiple="o.edit.multiple"
             clearable
             filterable
             :placeholder="o.label"
             class="elWidth"
-            @change="o.change"
+            @change="o.edit.change"
           >
             <el-option
               v-for="item in o.setting.datasource"
@@ -183,25 +184,29 @@ function fetchFormData() {
         </div>
         <div v-else-if="o.type.trim() == 'textarea'">
           <el-input
-            v-model="o.valueE as string"
+            v-model="o.edit.valueE as string"
-            :rows="o.editRows || 4"
+            :rows="o.edit.editRows || 4"
             type="textarea"
             :placeholder="o.label"
             class="elWidth"
-            @change="o.change"
+            @change="o.edit.change"
           />
         </div>
         <div v-else-if="o.type.trim() == 'switch'">
           <el-switch
-            v-model="o.valueE as boolean"
+            v-model="o.edit.valueE as boolean"
             active-text="启用"
             inactive-text="禁用"
             class="elWidth"
-            @change="o.change"
+            @change="o.edit.change"
           />
         </div>
         <div v-else>
-          <el-input v-model="o.valueE as string" class="elWidth" :placeholder="o.label" />
+          <el-input
+            v-model="o.edit.valueE as string"
+            class="elWidth"
+            :placeholder="o.label"
+          />
         </div>
       </el-form-item>
 

src/components/hTable/index.vue

@@ -15,13 +15,16 @@ import {
 } from "vue";
 
 import { Search } from "@element-plus/icons-vue";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessage, ElMessageBox, TableColumnCtx } from "element-plus";
 import { defineAsyncComponent, AsyncComponentLoader } from "vue";
 import {
   ButtonCustomConfig,
   ConditionalType,
   Dialog,
+  intTableData,
   TableColumn,
+  TableColumnEdit,
+  TableColumnSearch,
   TableConfig,
 } from "./hTable";
 import hTableEdit from "./hTableEdit.vue";
@@ -41,7 +44,7 @@ const props = defineProps({
     default: () => ({}),
   },
 });
-
+const expands = ref<any[]>();
 const table = ref<TableConfig>(props.tableConfig);
 const tableShowColumn = ref<Record<string, TableColumn>>();
 onBeforeMount(() => {
@@ -74,6 +77,7 @@ let Api: hTableAPI = null;
 
 const init = ref(false);
 const tableHeight = ref(0);
+let defaultOrderBy = null;
 
 const dialog = ref<Dialog>({
   visible: false,
@@ -107,36 +111,7 @@ function appStyle() {
 }
 
 function intdata() {
-  if (!table.value.data) table.value.data = [];
+  intTableData(table.value);
-  if (!table.value.selectRows) table.value.selectRows = [];
-  if (table.value.border == null) table.value.border = true;
-  if (!table.value.pageData) table.value.pageData = { total: 0 };
-  if (table.value.operationTop === undefined) table.value.operationTop = true;
-
-  // 处理 column 的属性
-  for (const key in table.value.column) {
-    const element = table.value.column[key];
-    if (element.add === undefined) element.add = false;
-    if (element.edit === undefined) element.edit = false;
-    // Vue 3 中直接赋值即可，不需要 $set
-    if (element.valueE === undefined) element.valueE = element.multiple ? [] : "";
-    if (element.value === undefined) element.value = element.multiple ? [] : "";
-    if (!element.type) element.type = "string";
-    if (element.show === undefined) element.show = true;
-    if (element.editShow === undefined) element.editShow = true;
-    if (!element.setting)
-      element.setting = { datasource: [], mapValue: "value", maplabel: "text" };
-    if (!element.setting.mapValue) element.setting.mapValue = "value";
-    if (!element.setting.maplabel) element.setting.maplabel = "text";
-
-    if (!element.change) element.change = () => {};
-  }
-
-  // 处理 operationColumnData 的属性
-  for (const key in table.value.operationColumnData) {
-    const element = table.value.operationColumnData[key];
-    if (element.show === undefined) element.show = true;
-  }
 }
 
 function rowKeyFun(row) {
@@ -232,7 +207,8 @@ function handleDelete(obj, row) {
   row.forEach((it) => {
     ids.push(it.id);
   });
-  ElMessageBox.confirm("此操作将永久删除勾选记录, 是否继续?").then(() => {
+  ElMessageBox.confirm("此操作将永久删除勾选记录, 是否继续?")
+    .then(() => {
       Api.delete(ids).then((res) => {
         if (res.code === 200) {
           handleReloadPaged();
@@ -241,6 +217,9 @@ function handleDelete(obj, row) {
           ElMessage.error(res.message);
         }
       });
+    })
+    .catch(() => {
+      ElMessage.info("取消删除");
     });
 }
 // 页面完成回调
@@ -256,13 +235,13 @@ function handleAddCallback() {
 function handleResetForm() {
   for (const key in table.value.column) {
     let item = table.value.column[key];
-    if (Array.isArray(item.valueE)) {
+    if (Array.isArray(item.edit.valueE)) {
-      item.valueE = [];
+      item.edit.valueE = [];
-    } else if (typeof item.valueE === "number") {
+    } else if (typeof item.edit.valueE === "number") {
-      item.valueE = "";
+      item.edit.valueE = "";
-    } else if (typeof item.valueE === "boolean") {
+    } else if (typeof item.edit.valueE === "boolean") {
     } else {
-      item.valueE = "";
+      item.edit.valueE = "";
     }
   }
 }
@@ -277,6 +256,21 @@ function pageIndexChange(o) {
   table.value.search.PageIndex = o - 1;
   fetchPagedData();
 }
+
+/**
+ * 排序变化时
+ * @param selection
+ */
+function sortChange(data: { column: TableColumnCtx<any>; prop: string; order: any }) {
+  if (data.order == undefined) {
+    table.value.search.OrderBy = defaultOrderBy.OrderBy;
+    table.value.search.OrderByType = defaultOrderBy.OrderByType;
+  } else {
+    table.value.search.OrderBy = data.prop;
+    table.value.search.OrderByType = data.order === "ascending" ? 1 : 0;
+  }
+  handleReloadPaged();
+}
 // 勾选
 function handleSelectionChange(selection) {
   console.log("selection-change", selection);
@@ -287,17 +281,23 @@ function searchReload() {
   for (let name in table.value.column) {
     if (
       !table.value.column[name].search ||
-      table.value.column[name].value === undefined ||
+      table.value.column[name].search.value === undefined ||
-      table.value.column[name].value === null ||
+      table.value.column[name].search.value === null ||
-      table.value.column[name].value === ""
+      table.value.column[name].search.value === ""
     ) {
       continue;
     }
-    table.value.column[name].value = "";
+    table.value.column[name].search.value = "";
   }
 }
 // 查询
 function handleReloadPaged(reload = true) {
+  if (defaultOrderBy == null) {
+    defaultOrderBy = {
+      OrderBy: table.value.search.OrderBy,
+      OrderByType: table.value.search.OrderByType,
+    };
+  }
   if (table.value.search === undefined || table.value.search.PageIndex === undefined) {
     table.value.search.PageIndex = 0;
     table.value.search.PageSize = 20;
@@ -306,9 +306,9 @@ function handleReloadPaged(reload = true) {
   for (let name in table.value.column) {
     if (
       !table.value.column[name].search ||
-      table.value.column[name].value === undefined ||
+      table.value.column[name].search.value === undefined ||
-      table.value.column[name].value === null ||
+      table.value.column[name].search.value === null ||
-      table.value.column[name].value === ""
+      table.value.column[name].search.value === ""
     ) {
       continue;
     }
@@ -323,10 +323,10 @@ function handleReloadPaged(reload = true) {
     } else data.ConditionalType = ConditionalType.Equal;
 
     data.FieldName = name.charAt(0).toUpperCase() + name.slice(1);
-    data.FieldValue = table.value.column[name].value.toString();
+    data.FieldValue = table.value.column[name].search.value.toString();
 
-    if (table.value.column[name].searchType != undefined) {
+    if (table.value.column[name].search.searchType != undefined) {
-      let v: number = table.value.column[name].searchType || 0;
+      let v: number = table.value.column[name].search.searchType || 0;
       data.ConditionalType = v;
     }
     table.value.search.Conditions.push(data);
@@ -338,41 +338,12 @@ function handleReloadPaged(reload = true) {
   if (table.value.searchCallback) {
     table.value.searchCallback(table.value.search);
   }
+  //如果有展开行 则全部收回
+  if (table.value.expandColumn) expands.value = [];
   fetchPagedData();
 }
 // 加载前置数据（如查询条件的下拉选择数据）
 async function fetchInitData() {
-  for (const key in table.value.column) {
-    const element = table.value.column[key];
-    if (element.type === "dropdown") {
-      if (!element.setting.datasource) {
-        // 不安全取消 存在值就不处理
-        // let rdata = await eval(element.setting.datasourceStr);
-        // element.setting.datasource = rdata.data;
-        // console.log(key + " " + element.setting.datasourceStr, rdata);
-      }
-    }
-    if (
-      element.custom == undefined &&
-      (element.type === "switch" ||
-        element.type === "dropdown" ||
-        element.type === "string" ||
-        element.type === undefined)
-    ) {
-      if (element.type === "string" || element.type === undefined)
-        element.custom = (row) => row[key];
-      else {
-        element.custom = (row) => {
-          let sc = element.setting.datasource.find(
-            (s) => s[element.setting.mapValue] + "" == row[key] + ""
-          );
-          return !sc ? row[key] : sc[element.setting.maplabel];
-        };
-      }
-    } else if (element.custom == undefined) {
-      element.custom = (row) => row[key];
-    }
-  }
   setTimeout(() => {
     init.value = true;
     appStyle();
@@ -415,10 +386,10 @@ function fetchPagedData() {
     <div ref="appB_S" class="search-container1">
       <!-- 搜索项目 -->
       <el-form v-if="table.search.show" :inline="true" :model="table.search">
-        <el-form-item v-for="(o, n, i) in table.column" v-show="o.search" :key="i">
+        <el-form-item v-for="(o, n, i) in table.column" v-show="o.search.yes" :key="i">
           <el-date-picker
             v-if="o.type.trim() == 'datetime'"
-            v-model="o.value as Date"
+            v-model="o.search.value as Date"
             type="date"
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD"
@@ -427,8 +398,8 @@ function fetchPagedData() {
           />
           <el-select
             v-else-if="o.type.trim() == 'dropdown'"
-            v-model="o.value"
+            v-model="o.search.value"
-            :multiple="o.multiple"
+            :multiple="o.edit.multiple"
             clearable
             filterable
             :placeholder="o.label"
@@ -444,7 +415,7 @@ function fetchPagedData() {
           </el-select>
           <el-select
             v-else-if="o.type.trim() == 'switch'"
-            v-model="o.value"
+            v-model="o.search.value"
             clearable
             filterable
             :placeholder="o.label"
@@ -454,7 +425,7 @@ function fetchPagedData() {
             <el-option autocomplete="off" :label="'禁用'" :value="false" />
           </el-select>
           <div v-else-if="o.type.trim() == 'img'" v-show="false" />
-          <el-input v-else v-model="o.value as string" :placeholder="o.label" />
+          <el-input v-else v-model="o.search.value as string" :placeholder="o.label" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" :icon="Search" @click="handleReloadPaged(false)"
@@ -464,39 +435,6 @@ function fetchPagedData() {
           <el-button type="default" @click="searchReload()">重置</el-button>
         </el-form-item>
       </el-form>
-
-      <div class="dialog-container">
-        <el-dialog
-          v-if="dialog.visible"
-          v-model="dialog.visible"
-          :class="dialog.title ? '' : 'noHeader'"
-          :title="dialog.title"
-          :width="dialog.width"
-          :close-on-click-modal="false"
-          :close-on-press-escape="dialog.close"
-          :before-close="tableClose"
-          append-to-body
-        >
-          <hTableEdit
-            v-if="dialog.edit.visible"
-            :id="dialog.edit.id"
-            :tableData="table"
-            :row="dialog.edit.row"
-            :tagData="dialog.edit.tagData"
-            @handlePagedCallback="handleAddCallback"
-          />
-          <component
-            :is="dialog.custom.component"
-            v-if="dialog.custom.visible"
-            :style="{ height: 'calc( ' + dialog.custom.height + ' - 84px )' }"
-            :iscomponent="true"
-            :custom="dialog.custom.custom"
-            :CancelCallback="handleAddCallback"
-            :data="dialog.custom.data"
-            @handlePagedCallback="handleAddCallback"
-          />
-        </el-dialog>
-      </div>
     </div>
 
     <div v-if="table.operationTop" class="toolbar-container">
@@ -519,9 +457,11 @@ function fetchPagedData() {
       :data="table.data"
       :border="table.border"
       :highlight-current-row="true"
-      style="width: 100%"
       :row-key="rowKeyFun"
       @selection-change="handleSelectionChange"
+      @sort-change="sortChange"
+      @expand-change="table.expandChange"
+      :expand-row-keys="expands"
     >
       <el-table-column v-if="table.selectColumn" type="selection" width="40" />
       <el-table-column
@@ -529,6 +469,7 @@ function fetchPagedData() {
           table.operationColumn &&
           table.operationColumnData.filter((s) => !s.topBtn).length > 0
         "
+        :fixed="table.operationColumnFixed"
         label="操作"
         :width="getOperationColumnWidth()"
       >
@@ -551,12 +492,22 @@ function fetchPagedData() {
           <!-- 行内按钮组 -->
         </template>
       </el-table-column>
+
+      <!-- 拓展列 -->
+      <el-table-column v-if="table.expandColumn" type="expand">
+        <template #default="props">
+          <slot name="expandSlot" :props="props"></slot>
+        </template>
+      </el-table-column>
+
       <el-table-column
         v-for="(item, name, i) of tableShowColumn"
         :key="i"
         :prop="name"
         :label="item.label"
         :width="item.width"
+        :fixed="item.fixed"
+        :sortable="item.search.sort ? `custom` : false"
       >
         <template v-slot="scope">
           <div class="columnTemplate">
@@ -596,6 +547,7 @@ function fetchPagedData() {
       </el-table-column>
     </el-table>
     <div
+      v-if="table.search.showPage"
       style="
         padding-top: 15px;
         display: flex;
@@ -613,6 +565,40 @@ function fetchPagedData() {
         @current-change="pageIndexChange"
       />
     </div>
+
+    <div class="dialog-container">
+      <el-dialog
+        v-if="dialog.visible"
+        v-model="dialog.visible"
+        :class="dialog.title ? '' : 'noHeader'"
+        :title="dialog.title"
+        :width="dialog.width"
+        :close-on-click-modal="false"
+        :close-on-press-escape="dialog.close"
+        :before-close="tableClose"
+        class="max-w-[95vw] overflow-x-auto"
+        append-to-body
+      >
+        <hTableEdit
+          v-if="dialog.edit.visible"
+          :id="dialog.edit.id"
+          :tableData="table"
+          :row="dialog.edit.row"
+          :tagData="dialog.edit.tagData"
+          @handlePagedCallback="handleAddCallback"
+        />
+        <component
+          :is="dialog.custom.component"
+          v-if="dialog.custom.visible"
+          :style="{ height: 'calc( ' + dialog.custom.height + ' - 84px )' }"
+          :iscomponent="true"
+          :custom="dialog.custom.custom"
+          :CancelCallback="handleAddCallback"
+          :data="dialog.custom.data"
+          @handlePagedCallback="handleAddCallback"
+        />
+      </el-dialog>
+    </div>
   </div>
 </template>
 

src/utils/http/index.ts

@@ -76,7 +76,7 @@ const convertKeysToCamelCase = <T>(data: any): T => {
 const defaultConfig: AxiosRequestConfig = {
   baseURL: import.meta.env.VITE_API_BASEURL,
   // 请求超时时间
-  timeout: 20 * 1000,
+  timeout: 30 * 1000,
   headers: {
     Accept: "application/json, text/plain, */*",
     "Content-Type": "application/json",

src/utils/rules.ts

@@ -40,6 +40,14 @@ export const ruleNumber = [
     trigger: "blur"
   }
 ];
+export const ruleClassName = [
+  {
+    pattern: /^[1-9]\d*班$/,
+    message: "请输入正确班级名称[例:101班]",
+    trigger: "blur"
+  },
+  ...ruleRequired
+];
 export const ruleRequiredNumber = [
   { required: true, message: "不能为空", trigger: "blur" },
   {

src/views/admin/index.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import { ConditionalType, intTableData, TableConfig } from "@/components/hTable/hTable";
 import { onMounted, ref, defineOptions } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
+import { ElMessage } from "element-plus";
+import { ImportAdminInfo } from "@/api/admin";
 import {
   ruleAccount,
   rulePassword,
@@ -29,7 +31,7 @@ function searchCallback(data) {
 }
 const RoleApi = new hTableAPI("AdminRole");
 const table = ref<{ initTable: (config: TableConfig) => void }>(null);
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -60,73 +62,62 @@ const tableData: TableConfig = {
     },
     {
       topBtn: false, // 头部按钮
-      show: true,
       label: "删除",
       btnType: "del", // 按钮类型 add edit del 不设置则 自定义按钮
       btnStyle: "danger", // topBtn: true才生效 success danger
     },
+    {
+      topBtn: true, // 头部按钮
+      label: "导入",
+      click:entryAdminnfo,
+      btnStyle: "info", // topBtn: true才生效 success danger
+    },
+    {
+      topBtn: true, // 头部按钮
+      label: "导入模板",
+      click:DwImportTemplate,
+      btnStyle: "info", // topBtn: true才生效 success danger
+    },
   ],
   column: {
     // 行数据
     id: {
       label: "编号",
-      search: true,
+      search: { yes: true, searchType: ConditionalType.Equal },
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "150px",
     },
     name: {
       label: "名称",
       width: "180px",
-      rules: ruleRequiredI(12, 2),
+      search: { yes: true, searchType: ConditionalType.Like },
-      search: true,
+      edit: { add: true, edit: true, rules: ruleRequiredI(12, 2) },
-      searchType: ConditionalType.Like,
-      add: true, // 字段允许添加
-      edit: true, // 字段允许修改
     },
     phone: {
       label: "手机号",
-      rules: rulePhone,
       width: "200px",
-      search: true,
+      search: { yes: true, searchType: ConditionalType.Like },
-      add: true, // 字段允许添加
+      edit: { add: true, edit: true, rules: rulePhone },
-      edit: true, // 字段允许修改
     },
     account: {
       label: "账号",
-      rules: ruleRequiredI(20, 8),
+      search: { yes: true },
-      search: true,
+      edit: { add: true, edit: false, rules: ruleRequiredI(20, 8) },
-      add: true, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     password: {
       label: "密码",
       show: false,
-      /**长度必须大于6 */
+      edit: { add: true, edit: false, rules: ruleRequiredI(32, 6) },
-      rules: ruleRequiredI(32, 6),
-      search: false,
-      add: true, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     enable: {
       label: "启用",
       type: "switch",
-      search: false,
+      edit: { add: true, edit: true, editDefault: true },
-
-      add: true, // 字段允许添加
-      edit: true, // 字段允许修改
-      valueE: true, // 编辑时的默认值
     },
     roleId: {
       label: "角色",
       type: "dropdown",
-      rules: ruleRequired,
+      search: { yes: true },
-      search: true,
+      edit: { add: true, edit: false, rules: ruleRequired },
-      add: true, // 字段允许添加
-      edit: false, // 字段允许修改
-      setting: {
-        datasource: [],
-      },
     },
   },
   data: [],
@@ -134,8 +125,46 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
+function entryAdminnfo(eid: number) {
+  let fileE = document.createElement("input");
+  fileE.type = "file";
+  var formData = new window.FormData();
+  fileE.onchange = async function () {
+    formData.append("File", fileE.files[0]);
+    let res = await ImportAdminInfo(fileE.files[0]);
+    if (res.code != undefined) {
+      if (res.code !== 200) return ElMessage.error(res.message);
+      else return ElMessage.success("所有数据录入成功");
+    } else if (res.type === "application/json") {
+      let json = JSON.parse(await res.text());
+      if (json !== undefined && json.code !== 200) {
+        return ElMessage.error(json.message);
+      } else {
+        return ElMessage.success("操所有数据录入成功作成功");
+      }
+    } else if (res === undefined || res.size === 0)
+      return ElMessage.success("所有数据录入成功");
+    const url = res && window.URL.createObjectURL(res);
+    const link = document.createElement("a");
+    link.href = url;
+    link.setAttribute("download","导入失败管理员信息.xlsx");
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    ElMessage.warning("导入失败,已导出错误数据");
+  };
+  
+  try {
+    fileE.click();
+  } catch (error) { }
+}
+function DwImportTemplate(obj, row, callBack) {
+  const baseUrl = import.meta.env.VITE_API_BASEURL;
+  const excelImportUsersUrl = `${baseUrl}/Admin/DwImportTemplate`;
+  window.open(excelImportUsersUrl, "_blank");
+}
 const showTable = ref(false);
 onMounted(async () => {
   //初始化数据原

src/views/class/edit.vue

@@ -261,7 +261,6 @@ const handlePagedCallback = () => {
 };
 
 const handleSubmitForm = async () => {
-  debugger;
   if (props.id <= 0 || ClassNames.value.length < 1) {
     ElMessage.error("班级列表为空！");
     return;

src/views/class/index.vue

@@ -1,11 +1,21 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ComboModel,
+  ConditionalType,
+  gradeComboModel,
+  intTableData,
+  TableColumn,
+  TableColumnEdit,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref, defineOptions } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
 import { getenum } from "@/api/enum";
-import { ruleRequired } from "@/utils/rules";
+import { ruleClassName, ruleRequired } from "@/utils/rules";
+import { text } from "node:stream/consumers";
 const ControllerName = "classes";
 
 defineOptions({
@@ -16,7 +26,7 @@ const SchoolApi = new hTableAPI("usercenter/back/schools");
 function searchCallback(data) {}
 
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: "usercenter/back/classes",
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -66,117 +76,63 @@ const tableData: TableConfig = {
     // 行数据
     id: {
       label: "编号",
-      search: true,
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "150px",
     },
     schoolId: {
       label: "学校",
-      rules: ruleRequired,
       width: "180px",
-      search: true,
       type: "dropdown",
-      add: true, // 字段允许添加
+      search: new TableColumnSearch(true),
-      edit: true, // 字段允许修改
+      edit: {
-      setting: {},
-    },
-    name: {
-      label: "名称",
         rules: ruleRequired,
-      width: "180px",
+      },
-      search: true,
-      searchType: ConditionalType.Like, // 搜索类型
-      add: true, // 字段允许添加
-      edit: true, // 字段允许修改
     },
     Grade: {
       label: "年级",
-      rules: ruleRequired,
+      width: "220px",
-      width: "180px",
       type: "dropdown",
-      custom: (row) => `${row.grade ?? ""}`,
+      custom: (row) => `${row.gradeLevel + row.graduationYear}届 [${row.grade ?? ""}]`,
-      // `${row.grade ?? ""} ${row.gradeLevel + row.graduationYear}`,
+      search: new TableColumnSearch(true),
-      search: true,
+      edit: { add: true, edit: false, rules: ruleRequired },
-      setting: {},
+    },
-      add: true, // 字段允许添加
+    name: {
-      edit: false, // 字段允许修改
+      label: "名称",
+      width: "180px",
+      search: {
+        yes: true,
+        searchType: ConditionalType.Like, // 搜索类型
+      },
+      edit: {
+        add: true,
+        edit: true,
+        rules: ruleClassName,
+      },
     },
-    // GradeLevel: {
-    //   label: "年级",
-    //   search: false,
-    //   type: "dropdown",
-    //   searchType: ConditionalType.Like,
-    //   add: true, // 字段允许添加
-    //   edit: true, // 字段允许修改
-    //   width: "70px",
-    //   setting: {
-    //     datasource: [
-    //       { text: "初", value: "初" },
-    //       { text: "高", value: "高" },
-    //       { text: "小", value: "小" }
-    //     ]
-    //   }
-    // },
-    // GraduationYear: {
-    //   label: "届",
-    //   search: false,
-    //   add: true, // 字段允许添加
-    //   edit: true, // 字段允许修改
-    //   width: "80px"
-    // },
     type: {
       label: "类型",
-      rules: ruleRequired,
-      // width: "150px",
       type: "dropdown",
-      search: true,
+      search: {
-      add: true, // 字段允许添加
+        yes: true,
-      edit: true, // 字段允许修改
+      },
-      setting: {},
+      edit: {
+        add: true,
+        edit: true,
+        rules: ruleRequired,
+      },
     },
-    // createTime: {
-    //   label: "创建时间",
-    //   width: "180px",
-    //   type: "datetime",
-    //   search: true,
-    //   add: false, // 字段允许添加
-    //   edit: false // 字段允许修改
-    // },
-    // remark: {
-    //   label: "备注",
-    //   type: "textarea",
-    //   editRows: 3,
-    //   search: false,
-    //   add: true, // 字段允许添加
-    //   edit: true // 字段允许修改
-    // }
   },
   data: [],
   pageData: {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 const showTable = ref(false);
 onMounted(async () => {
   //初始化数据原
 
-  tableData.column.Grade.setting.datasource = [
+  tableData.column.Grade.setting.datasource = gradeComboModel();
-    { text: "初一", value: "初一" },
-    { text: "初二", value: "初二" },
-    { text: "初三", value: "初三" },
-    { text: "高一", value: "高一" },
-    { text: "高二", value: "高二" },
-    { text: "高三", value: "高三" },
-    { text: "一年级", value: "一年级" },
-    { text: "二年级", value: "二年级" },
-    { text: "三年级", value: "三年级" },
-    { text: "四年级", value: "四年级" },
-    { text: "五年级", value: "五年级" },
-    { text: "六年级", value: "六年级" },
-  ];
   tableData.column.type.setting.datasource = (await getenum("ClassTypeEnum")).data;
   tableData.column.schoolId.setting.datasource = (
     await SchoolApi.querycombo({ TextName: "Name", ValueName: "Id" })

src/views/exam/classDetails.vue

@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref, defineOptions } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
@@ -21,7 +26,7 @@ const props = defineProps<{
 
 function searchCallback(data) {}
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -48,7 +53,7 @@ const tableData: TableConfig = {
       show: true,
       label: "删除",
       click: deleteInfo,
-      btnStyle: "danger", // topBtn: true才生效 success danger
+      btnStyle: "warning", // topBtn: true才生效 success danger
     },
     {
       topBtn: false, // 头部按钮
@@ -75,33 +80,23 @@ const tableData: TableConfig = {
     // 行数据
     schoolName: {
       label: "学校",
-      search: true,
-      searchType: ConditionalType.Like, // 搜索类型
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "180px",
+      search: new TableColumnSearch(true, ConditionalType.Like),
     },
     grade: {
       label: "年级",
       width: "100px",
-      search: true,
+      custom: (row) => row.gradeLevel + row.gradeYear + "届",
-      add: false, // 字段允许添加
+      search: new TableColumnSearch(true),
-      edit: false, // 字段允许修改
     },
     className: {
       label: "班级",
       width: "150px",
-      search: true,
+      search: new TableColumnSearch(true, ConditionalType.Like),
-      searchType: ConditionalType.Like, // 搜索类型
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     peopleCount: {
       label: "参考人数",
       width: "100px",
-      search: false,
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     // entryPerson: {
     //   label: "录入人",
@@ -113,9 +108,6 @@ const tableData: TableConfig = {
     createTime: {
       label: "录入时间",
       width: "200px",
-      search: false,
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
   },
   data: [],
@@ -123,7 +115,7 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 async function deleteInfo(o, row, c) {
   try {

src/views/exam/classExam.vue

@@ -1,11 +1,18 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
 import { getenum } from "@/api/enum";
 import { ruleRequired, ruleRequiredNumber } from "@/utils/rules";
+import { ClassRanking } from "@/api/exam";
+import { ElMessage } from "element-plus";
 const ControllerName = "ExamClassInfo";
 
 defineOptions({
@@ -18,20 +25,17 @@ const props = defineProps<{
 
 function searchCallback(data) {}
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
+  expandColumn: true,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
   searchCallback: searchCallback,
+  expandChange: expandChange,
   search: {
     // 查询条件
     show: true,
-    PageIndex: 0,
+    PageSize: 999,
-    PageSize: 20,
-    OrderBy: "Id", // 排序
-    OrderByType: 1, // 排序方式
-    defaultConditions: [], // 默认查询条件
-    Conditions: [],
   },
   operationColumn: true, // 显示操作按钮
   operationColumnData: [
@@ -42,7 +46,7 @@ const tableData: TableConfig = {
       btnType: "custom",
       btnStyle: "primary",
       custom: {
-        title: "考试学生班级详情", // 弹出框title
+        title: "考试班级详情", // 弹出框title
         src: "exam/classExamRecord", // 组件路径
         width: "1600px", // 弹框宽度
         height: "800px", // 弹框高度
@@ -53,52 +57,26 @@ const tableData: TableConfig = {
     // 行数据
     schoolName: {
       label: "学校",
-      search: true,
-      searchType: ConditionalType.Like, // 搜索类型
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "180px",
+      search: new TableColumnSearch(true, ConditionalType.Like),
     },
     grade: {
       label: "年级",
       width: "120px",
-      // custom: (s) => `${s.gradeLevel}${s.gradeYear}`,
+      custom: (row) => row.gradeLevel + row.gradeYear + "届",
-      search: true,
+      search: new TableColumnSearch(true),
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     className: {
       label: "班级",
       width: "80px",
-      search: true,
+      search: new TableColumnSearch(true, ConditionalType.Like),
-      searchType: ConditionalType.Like, // 搜索类型
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     examName: {
       label: "最近考试",
       width: "200px",
-      search: false,
     },
     peopleCount: {
       label: "参考人数",
-      width: "100px",
-      search: false,
-    },
-    onLineCount: {
-      label: "重本人数",
-      width: "100px",
-      search: false,
-    },
-    onLineRate: {
-      label: "重本率",
-      width: "100px",
-      custom: (row) => `${row.onLineRate * 100}%`,
-      search: false,
-    },
-    onLineRanking: {
-      label: "重本率排名",
-      search: false,
     },
   },
   data: [],
@@ -106,7 +84,7 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 const showTable = ref(false);
 onMounted(async () => {
@@ -114,8 +92,275 @@ onMounted(async () => {
 
   showTable.value = true;
 });
+// types/exam.ts 或直接在组件中定义
+export interface ExamClassTag {
+  Name: string; // 标签名称
+  SubjectStr?: string; // 学科枚举，可空（总分则为 null）
+  OnLineRanking: number; // 上线考试排名
+  OnLineRate: number; // 上线率（注意：C#中是 decimal，TS里用 number）
+  OnLineCount: number; // 上线人数
+}
+
+async function expandChange(row: any, expandedRows: any[]) {
+  if (row.rankingList != null) return;
+  let res = await ClassRanking(row.examId, row.classId);
+  if (res.code != 200) return ElMessage.error(res.message || "获取数据失败");
+  row.rankingList = res.data;
+}
+// 根据学科获取CSS类名
+const getSubjectClass = (subjectStr) => {
+  if (!subjectStr) return "";
+
+  const subjectMap = {
+    总分: "total",
+    数学: "math",
+    英语: "english",
+    物理: "physics",
+    化学: "chemistry",
+    生物: "biology",
+  };
+
+  return subjectMap[subjectStr] || "";
+};
 </script>
 
 <template>
-  <div><ahTable v-if="showTable" ref="table" :tableConfig="tableData" /></div>
+  <div>
+    <ahTable v-if="showTable" ref="table" :tableConfig="tableData">
+      <template #expandSlot="{ props }">
+        <!-- 拓展内容 -->
+        <div class="expanded-content expandSlot">
+          <div
+            v-if="props.row.rankingList && props.row.rankingList.length > 0"
+            class="ranking-list"
+          >
+            <div
+              v-for="(tag, tagIndex) in props.row.rankingList"
+              :key="tagIndex"
+              class="tag-card"
+              :class="getSubjectClass(tag.subjectStr)"
+            >
+              <div class="tag-name">
+                <span>{{ tag.name }}</span>
+                <span class="subject-badge">{{ tag.subjectStr || "总分" }}</span>
+              </div>
+
+              <div class="tag-details">
+                <div class="detail-item">
+                  <span class="detail-label">上线排名:</span>
+                  <span class="detail-value">第 {{ tag.onLineRanking }} 名</span>
+                </div>
+
+                <div class="detail-item">
+                  <span class="detail-label">上线人数:</span>
+                  <span class="detail-value">{{ tag.onLineCount }} 人</span>
+                </div>
+
+                <div class="detail-item">
+                  <span class="detail-label">上线率:</span>
+                  <span class="detail-value"
+                    >{{ (tag.onLineRate * 100).toFixed(0) }}%</span
+                  >
+                </div>
+
+                <div class="progress-container">
+                  <div
+                    class="progress-bar"
+                    :style="{ width: tag.onLineRate * 100 + '%' }"
+                  ></div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div v-else class="empty-state">
+            <i class="fas fa-inbox" style="font-size: 3rem; margin-bottom: 15px"></i>
+            <p>暂无标签数据</p>
+          </div>
+        </div>
+      </template>
+    </ahTable>
+  </div>
 </template>
+<style>
+.expandSlot {
+  padding: 10px 20px;
+  background: #f5f7fa;
+}
+.container {
+  width: 100%;
+  max-width: 1200px;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+}
+
+.header {
+  background: linear-gradient(90deg, #3498db, #2c3e50);
+  color: white;
+  padding: 20px 30px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.header h1 {
+  font-weight: 600;
+  font-size: 1.8rem;
+}
+
+.header .subtitle {
+  opacity: 0.9;
+  font-size: 1rem;
+}
+
+.table-container {
+  padding: 20px;
+}
+
+.main-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 20px;
+}
+
+.main-table th {
+  background-color: #f8f9fa;
+  padding: 15px;
+  text-align: left;
+  font-weight: 600;
+  color: #2c3e50;
+  border-bottom: 2px solid #e9ecef;
+}
+
+.main-table td {
+  padding: 15px;
+  border-bottom: 1px solid #e9ecef;
+  vertical-align: top;
+}
+
+.main-table tr:hover {
+  background-color: #f8f9fa;
+}
+
+.expand-btn {
+  background: #3498db;
+  color: white;
+  border: none;
+  padding: 6px 12px;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 0.85rem;
+  transition: all 0.3s;
+}
+
+.expand-btn:hover {
+  background: #2980b9;
+  transform: translateY(-2px);
+}
+
+.ranking-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+  gap: 15px;
+  margin-top: 10px;
+}
+
+.tag-card {
+  background: white;
+  border-radius: 8px;
+  padding: 15px;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
+  border-left: 4px solid #3498db;
+  transition: transform 0.3s, box-shadow 0.3s;
+}
+
+.tag-card:hover {
+  transform: translateY(-5px);
+  box-shadow: 0 6px 15px rgba(0, 0, 0, 0.1);
+}
+
+.tag-card.total {
+  border-left-color: #777f8a;
+}
+.tag-card.math {
+  border-left-color: #e74c3c;
+}
+
+.tag-card.english {
+  border-left-color: #f39c12;
+}
+
+.tag-card.physics {
+  border-left-color: #9b59b6;
+}
+
+.tag-card.chemistry {
+  border-left-color: #1abc9c;
+}
+
+.tag-card.biology {
+  border-left-color: #2ecc71;
+}
+
+.tag-name {
+  font-weight: 600;
+  font-size: 1.1rem;
+  color: #2c3e50;
+  margin-bottom: 8px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.subject-badge {
+  padding: 3px 8px;
+  border-radius: 12px;
+  font-size: 0.75rem;
+  font-weight: 600;
+  background: #ecf0f1;
+}
+
+.tag-details {
+  margin-top: 10px;
+}
+
+.detail-item {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 0px;
+  font-size: 0.9rem;
+}
+
+.detail-label {
+  color: #7f8c8d;
+}
+
+.detail-value {
+  font-weight: 500;
+  color: #2c3e50;
+}
+
+.progress-container {
+  height: 8px;
+  background: #ecf0f1;
+  border-radius: 4px;
+  margin-top: 5px;
+  overflow: hidden;
+}
+
+.progress-bar {
+  height: 100%;
+  background: linear-gradient(90deg, #3498db, #2ecc71);
+  border-radius: 4px;
+  transition: width 0.5s ease;
+}
+
+.empty-state {
+  text-align: center;
+  padding: 30px;
+  color: #7f8c8d;
+  font-style: italic;
+}
+</style>

src/views/exam/classExamRecord.vue

@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref, defineOptions } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
@@ -22,7 +27,7 @@ const props = defineProps<{
 
 function searchCallback(data) {}
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: `ExamClassInfo`,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -31,7 +36,7 @@ const tableData: TableConfig = {
     // 查询条件
     show: true,
     PageIndex: 0,
-    PageSize: 20,
+    PageSize: 999,
     OrderByType: 1, // 排序方式
     OrderBy: "Id", // 排序
     defaultConditions: [
@@ -63,77 +68,64 @@ const tableData: TableConfig = {
     // 行数据
     examName: {
       label: "考试名称",
-      search: true,
       width: "150px",
+      search: new TableColumnSearch(true),
     },
     type: {
       label: "考试类型",
-      search: true,
-      type: "dropdown",
-      setting: {},
       width: "80px",
+      type: "dropdown",
+      search: new TableColumnSearch(true),
     },
     testPaperType: {
       label: "试卷类型",
-      search: true,
-      type: "dropdown",
-      setting: {},
       width: "80px",
+      type: "dropdown",
+      search: new TableColumnSearch(true),
     },
     grade: {
       label: "年级",
-      search: true,
+      width: "90px",
-      // type: "dropdown",
+      custom: (row) => row.gradeLevel + row.gradeYear + "届",
-      // setting: {},
+      search: new TableColumnSearch(true),
-      width: "60px",
     },
 
-    onLineCount: {
+    // onLineCount: {
-      label: "重本人数",
+    //   label: "重本人数",
-      search: false,
+    //   width: "80px",
-      width: "80px",
+    // },
-    },
+    // onLineRate: {
-    onLineRate: {
+    //   label: "重本率",
-      label: "重本率",
+    //   custom: (row) => `${Math.round(row.onLineRate * 100)}%`,
-      search: false,
+    //   width: "80px",
-      custom: (row) => `${Math.round(row.onLineRate * 100)}%`,
+    // },
-      width: "80px",
+    // onLineRanking: {
-    },
+    //   label: "重本率排名",
-    onLineRanking: {
+    //   width: "100px",
-      label: "重本率排名",
+    // },
-      search: false,
-      width: "100px",
-    },
     maxScore: {
       label: "最高分[赋分]",
-      search: false,
+      width: "130px",
-      width: "140px",
     },
     minScore: {
       label: "最低分[赋分]",
-      search: false,
+      width: "130px",
-      width: "140px",
     },
     average: {
       label: "总平均分[赋分]",
-      search: false,
       custom: (row) => `${Math.round(row.average)}`,
-      width: "140px",
+      width: "130px",
     },
     average1: {
       label: "资源校平均分[赋分]",
-      search: false,
+      width: "100px",
-      width: "160px",
     },
     averageRank: {
       label: "总平均分排名",
-      search: false,
       width: "110px",
     },
     rank: {
       label: "远端平均/资源校平均",
-      search: false,
-      width: "95px",
       custom: (row) =>
         `${
           row.baseSchoolScore == 0
@@ -147,7 +139,7 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 const showTable = ref(false);
 onMounted(async () => {

src/views/exam/examTags.vue

@@ -0,0 +1,188 @@
+<script setup lang="ts">
+import ahTable from "@/components/hTable/index.vue";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
+import { onMounted, ref } from "vue";
+import { fa } from "element-plus/es/locales.mjs";
+import { hTableAPI } from "@/api/hTable";
+import { getenum } from "@/api/enum";
+import {
+  ruleNumber,
+  ruleRequired,
+  ruleRequiredGrade,
+  ruleRequiredI,
+  ruleRequiredNumber,
+} from "@/utils/rules";
+import { ImportExamInfo, RecalculateExamRankings } from "@/api/exam";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { entryExamInfo } from "./examFun";
+const ControllerName = "ExamTags";
+
+defineOptions({
+  name: ControllerName,
+});
+
+const props = defineProps<{
+  data: any;
+}>();
+function searchCallback(data) {}
+
+const table = ref<{ initTable: (config: TableConfig) => void }>();
+const tableData: TableConfig = intTableData({
+  apiUrl: ControllerName,
+  selectColumn: false, // 列表选择
+  border: false, // 是否显示表格边框
+  searchCallback: searchCallback,
+  editCallback: async (from) => {
+    if (from.subjectId == -1) from.subjectId = null;
+    from.examId = props.data[0].id;
+  },
+  search: {
+    // 查询条件
+    show: false,
+    showPage: false,
+    PageIndex: 0,
+    PageSize: 1000,
+    OrderBy: "Id", // 排序
+    defaultConditions: [
+      {
+        FieldName: "ExamId",
+        FieldValue: props.data[0].id + "",
+        ConditionalType: ConditionalType.Equal,
+      },
+    ], // 默认查询条件
+    Conditions: [],
+  },
+  operationColumn: true, // 显示操作按钮
+  operationColumnData: [
+    // {
+    //   // 操作按钮
+    //   topBtn: false, // 是头部按钮
+    //   label: "修改",
+    //   btnType: "edit", // 按钮类型 add edit del custom
+    // },
+    {
+      // 操作按钮
+      topBtn: true, // 是头部按钮
+      label: "添加",
+      btnStyle: "success",
+      btnType: "add", // 按钮类型 add edit del custom
+    },
+    {
+      topBtn: false,
+      label: "删除",
+      btnType: "del",
+      btnStyle: "danger",
+    },
+    {
+      topBtn: true,
+      label: "重新计算考试上线数据",
+      click: RExamRankings,
+      btnStyle: "info",
+    },
+  ],
+  column: {
+    examId: {
+      label: "考试",
+      width: "180px",
+      search: new TableColumnSearch(true, ConditionalType.Equal), // 搜索
+      type: "dropdown",
+    },
+    tagName: {
+      label: "分段名称",
+      width: "180px",
+      edit: {
+        add: true,
+        rules: ruleRequiredI(20, 1),
+      },
+    },
+    subjectId: {
+      label: "学科",
+      width: "100px",
+      search: new TableColumnSearch(true),
+      type: "dropdown",
+      custom: (row) =>
+        row.subjectId
+          ? tableData.column.subjectId.setting.datasource.find(
+              (s) => s.value == row.subjectId
+            )?.text ?? "--"
+          : "总分",
+      edit: {
+        add: true,
+        rules: ruleRequired,
+        editDefault: -1,
+      },
+    },
+    maxScore: {
+      label: "最大分数",
+      width: "120px",
+      edit: {
+        add: true,
+        rules: ruleRequiredNumber,
+      },
+    },
+    minScore: {
+      label: "最小分数",
+      width: "120px",
+      edit: {
+        add: true,
+        rules: ruleRequiredNumber,
+      },
+    },
+    createTime: {
+      label: "创建时间",
+      type: "datetime",
+      custom: (row) => row.createTime?.replace("T", " ").substring(0, 10) ?? "",
+    },
+  },
+  data: [],
+  pageData: {
+    total: 0,
+  },
+  selectRows: [],
+});
+
+const Api = new hTableAPI(`Exam`);
+const showTable = ref(false);
+onMounted(async () => {
+  //初始化数据原
+
+  tableData.column.examId.setting.datasource = (await Api.querycombo()).data;
+  tableData.column.subjectId.setting.datasource = [
+    { text: "总分", value: -1 },
+    ...(await getenum("SubjectEnum")).data,
+  ];
+
+  showTable.value = true;
+});
+
+async function RExamRankings() {
+  try {
+    await ElMessageBox.confirm(
+      `重新计算考试上线数据，可能需要较长时间，是否继续？`,
+      "确认",
+      {
+        confirmButtonText: "继续",
+        cancelButtonText: "取消",
+        type: "warning",
+      }
+    );
+    const res = await RecalculateExamRankings(props.data[0].id);
+    if (res.code == 200) {
+      ElMessage.success("操作成功");
+    } else {
+      ElMessage.error(res.message || "操作失败");
+    }
+  } catch (error) {
+    ElMessage.info("取消操作");
+  }
+}
+</script>
+
+<template>
+  <div><ahTable v-if="showTable" ref="table" :tableConfig="tableData" /></div>
+</template>

src/views/exam/index.vue

@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
@@ -24,7 +29,7 @@ defineOptions({
 function searchCallback(data) {}
 
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -73,12 +78,25 @@ const tableData: TableConfig = {
         height: "800px", // 弹框高度
       },
     },
+    {
+      topBtn: false, // 头部按钮
+      show: true,
+      label: "分段",
+      btnType: "custom", // 按钮类型 add edit del 不设置则 自定义按钮
+      btnStyle: "info",
+      custom: {
+        title: "考试分段", // 弹出框title
+        src: "exam/examTags", // 组件路径
+        width: "1200px", // 弹框宽度
+        height: "800px", // 弹框高度
+      },
+    },
     {
       topBtn: false, // 头部按钮
       show: true,
       label: "录入成绩",
       click: entryExam,
-      btnStyle: "primary", // topBtn: true才生效 success danger
+      btnStyle: "warning", // topBtn: true才生效 success danger
     },
     {
       topBtn: true, // 头部按钮
@@ -92,81 +110,98 @@ const tableData: TableConfig = {
     // 行数据
     id: {
       label: "编号",
-      search: true,
+      search: new TableColumnSearch(true),
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "150px",
     },
     name: {
       label: "考试名称",
-      rules: ruleRequired,
       width: "200px",
-      search: true,
+      search: new TableColumnSearch(true, ConditionalType.Like), // 搜索
-      searchType: ConditionalType.Like, // 搜索类型
+      edit: {
-      add: true, // 字段允许添加
+        add: true,
-      edit: true, // 字段允许修改
+        edit: true,
-      setting: {},
+        rules: ruleRequiredI(20, 2),
       },
-    grade: {
+    },
+    gradeLevel: {
       label: "年级",
-      rules: ruleRequiredGrade,
       width: "100px",
-      search: true,
+      type: "dropdown",
-      add: true, // 字段允许添加
+      custom: (row) => row.gradeLevel + row.gradeYear + "届",
-      edit: false, // 字段允许修改
+      search: new TableColumnSearch(true),
+      edit: {
+        add: true,
+        edit: false,
+        rules: ruleRequired,
+      },
+    },
+    gradeYear: {
+      label: "毕业年份",
+      width: "100px",
+      show: false,
+      search: new TableColumnSearch(true),
+      edit: {
+        add: true,
+        edit: false,
+        rules: ruleRequiredNumber,
+      },
     },
     testPaperType: {
       label: "试卷类型",
-      rules: ruleRequired,
       width: "100px",
       type: "dropdown",
-      setting: {},
+      search: new TableColumnSearch(true),
-      search: true,
+      edit: {
-      add: true, // 字段允许添加
+        add: true,
-      edit: true, // 字段允许修改
+        edit: true,
+        rules: ruleRequired,
+      },
     },
     type: {
       label: "考试类型",
-      rules: ruleRequired,
       width: "100px",
       type: "dropdown",
-      setting: {},
+      search: new TableColumnSearch(true),
-      search: true,
+      edit: {
-      add: true, // 字段允许添加
+        add: true,
-      edit: true, // 字段允许修改
+        edit: true,
+        rules: ruleRequired,
+      },
     },
     scoreLine: {
       label: "划线分数",
-      rules: ruleNumber,
-      search: false,
       width: "100px",
-      add: true, // 字段允许添加
+      edit: {
-      edit: true, // 字段允许修改
+        add: true,
+        edit: true,
+        rules: ruleNumber,
+      },
     },
     baseSchoolScore: {
       label: "资源校平均分",
-      rules: ruleNumber,
-      search: false,
       width: "150px",
-      add: true, // 字段允许添加
+      edit: {
-      edit: true, // 字段允许修改
+        add: true,
+        edit: true,
+        rules: ruleNumber,
+      },
     },
     startTime: {
       label: "考试时间",
-      width: "210px",
+      width: "180px",
-      rules: ruleRequired,
-      search: true,
       type: "datetime",
-      setting: {},
+      custom: (row) => row.startTime?.replace("T", " ").substring(0, 10) ?? "",
-      add: true, // 字段允许添加
+      search: new TableColumnSearch(true),
-      edit: true, // 字段允许修改
+      edit: {
+        add: true,
+        edit: true,
+        rules: ruleRequired,
+      },
     },
     createTime: {
       label: "创建时间",
       type: "datetime",
-      search: false,
+      custom: (row) => row.startTime?.replace("T", " ").substring(0, 10) ?? "",
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
   },
   data: [],
@@ -174,7 +209,7 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 function DwImportTemplate(obj, row, callBack) {
   const baseUrl = import.meta.env.VITE_API_BASEURL;
@@ -188,7 +223,11 @@ const showTable = ref(false);
 onMounted(async () => {
   //初始化数据原
 
-  // tableData.column.level.setting.datasource = (await getenum("GradeEnum")).data;
+  tableData.column.gradeLevel.setting.datasource = (
+    await getenum("GradeLevelEnum")
+  ).data.map((s) => {
+    return { value: s.text, text: s.text };
+  });
 
   tableData.column.testPaperType.setting.datasource = (
     await getenum("TestPaperTypeEnum")

src/views/exam/userDetails.vue

@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
@@ -18,7 +23,7 @@ const props = defineProps<{
 
 function searchCallback(data) {}
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -26,8 +31,8 @@ const tableData: TableConfig = {
   search: {
     // 查询条件
     show: true,
-    PageIndex: 0,
+    showPage: false,
-    PageSize: 60,
+    PageSize: 9999,
     OrderBy: "AssignRanking", // 排序
     OrderByType: 0,
     defaultConditions: [
@@ -44,26 +49,6 @@ const tableData: TableConfig = {
   },
   operationColumn: true, // 显示操作按钮
   operationColumnData: [
-    {
-      // 操作按钮
-      topBtn: true, // 是头部按钮
-      label: "成绩升序",
-      btnStyle: "primary",
-      click: (o, r, c) => {
-        tableData.search.OrderByType = 1;
-        c();
-      },
-    },
-    {
-      // 操作按钮
-      topBtn: true, // 是头部按钮
-      label: "成绩降序",
-      btnStyle: "primary",
-      click: (o, r, c) => {
-        tableData.search.OrderByType = 0;
-        c();
-      },
-    },
     {
       topBtn: false, // 头部按钮
       label: "个人详情",
@@ -81,73 +66,72 @@ const tableData: TableConfig = {
     // 行数据
     userName: {
       label: "姓名",
-      search: true,
-      searchType: ConditionalType.Like, // 搜索类型
       width: "180px",
+      search: new TableColumnSearch(true, ConditionalType.Like),
     },
     语文: {
       label: "语文",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.语文,
+      search: { sort: true },
     },
     数学: {
       label: "数学",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.数学,
+      search: { sort: true },
     },
     英语: {
       label: "英语",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.英语,
+      search: { sort: true },
     },
     物理: {
       label: "物理",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.物理,
+      search: { sort: true },
     },
     化学: {
       label: "化学",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.化学,
+      search: { sort: true },
     },
     生物: {
       label: "生物",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.生物,
+      search: { sort: true },
     },
     政治: {
       label: "政治",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.政治,
+      search: { sort: true },
     },
     历史: {
       label: "历史",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.历史,
+      search: { sort: true },
     },
     地理: {
       label: "地理",
-      search: false,
       width: "100px",
       custom: (row) => row.subjectDic.地理 ?? "--",
+      search: { sort: true },
     },
     assignScore: {
       label: "赋分总分",
-      search: false,
       width: "180px",
+      search: { sort: true },
     },
     assignRanking: {
       label: "赋分后的排名",
-      search: false,
       width: "200px",
+      search: { sort: true },
     },
   },
   data: [],
@@ -155,12 +139,11 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 const showTable = ref(false);
 onMounted(async () => {
   //初始化数据原
-
   showTable.value = true;
 });
 const exam = props.data[0];
@@ -170,7 +153,7 @@ const exam = props.data[0];
   <div>
     <div class="p-[10px] text-[1.5rem]">
       <strong>学校：</strong>{{ exam.schoolName }}&nbsp;&nbsp; <strong>年级：</strong
-      >{{ exam.gradeLevel + exam.gradeYear }}&nbsp;&nbsp; <strong>班级：</strong
+      >{{ exam.gradeLevel + exam.gradeYear }}届&nbsp;&nbsp; <strong>班级：</strong
       >{{ exam.className }}&nbsp;&nbsp; <strong>考试名称：</strong
       >{{ exam.examName }}&nbsp;&nbsp;
       <!-- <strong>考试类型：</strong>{{exam.className}}&nbsp;&nbsp;

src/views/exam/userExam.vue

@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
@@ -19,7 +24,7 @@ const props = defineProps<{
 
 function searchCallback(data) {}
 const table = ref<{ initTable: (config: TableConfig) => void }>();
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -27,8 +32,9 @@ const tableData: TableConfig = {
   search: {
     // 查询条件
     show: true,
+    showPage:false,
     PageIndex: 0,
-    PageSize: 60,
+    PageSize: 9999,
     OrderBy: "Id", // 排序
     OrderByType: 1,
     defaultConditions: [
@@ -45,95 +51,91 @@ const tableData: TableConfig = {
     // 行数据
     examName: {
       label: "考试名称",
-      search: true,
+      search: new TableColumnSearch(true, ConditionalType.Like),
-      searchType: ConditionalType.Like, // 搜索类型
       width: "180px",
     },
     // 行数据
     type: {
       label: "考试类型",
-      search: true,
-      type: "dropdown",
-      setting: {},
       width: "150px",
+      type: "dropdown",
+      search: new TableColumnSearch(true),
     },
     // 行数据
     grade: {
       label: "考试阶段",
-      search: true,
-      searchType: ConditionalType.Like, // 搜索类型
       width: "120px",
+      search: new TableColumnSearch(true, ConditionalType.Like),
     }, // 行数据
     testPaperType: {
       label: "试卷类型",
-      search: true,
-      type: "dropdown",
-      setting: {},
       width: "150px",
+      type: "dropdown",
+      search: new TableColumnSearch(true),
     },
     语文: {
       label: "语文",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.语文 ?? "--",
+      search: { sort: true },
     },
     数学: {
       label: "数学",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.数学 ?? "--",
+      search: { sort: true },
     },
     英语: {
       label: "英语",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.英语 ?? "--",
+      search: { sort: true },
     },
     物理: {
       label: "物理",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.物理 ?? "--",
+      search: { sort: true },
     },
     化学: {
       label: "化学",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.化学 ?? "--",
+      search: { sort: true },
     },
     生物: {
       label: "生物",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.生物 ?? "--",
+      search: { sort: true },
     },
     政治: {
       label: "政治",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.政治 ?? "--",
+      search: { sort: true },
     },
     历史: {
       label: "历史",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.历史 ?? "--",
+      search: { sort: true },
     },
     地理: {
       label: "地理",
-      search: false,
       width: "80px",
       custom: (row) => row.subjectDic.地理 ?? "--",
+      search: { sort: true },
     },
     assignScore: {
       label: "赋分总分",
-      search: false,
       width: "80px",
+      search: { sort: true },
     },
     assignRanking: {
       label: "赋分后的排名",
-      search: false,
       width: "120px",
+      search: { sort: true },
     },
   },
   data: [],
@@ -141,7 +143,7 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 const showTable = ref(false);
 const exam = props.data[0];

src/views/grade/index.vue

@@ -9,7 +9,7 @@ import { ruleRequired } from "@/utils/rules";
 const ControllerName = "Grade";
 
 defineOptions({
-  name: ControllerName
+  name: ControllerName,
 });
 
 const SchoolApi = new hTableAPI("usercenter/back/schools");
@@ -28,7 +28,7 @@ const tableData: TableConfig = {
     PageSize: 20,
     OrderBy: "CreateTime", // 排序
     defaultConditions: [], // 默认查询条件
-    Conditions: []
+    Conditions: [],
   },
   operationColumn: true, // 显示操作按钮
   operationColumnData: [
@@ -36,92 +36,90 @@ const tableData: TableConfig = {
       // 操作按钮
       topBtn: false, // 是头部按钮
       label: "修改",
-      btnType: "edit" // 按钮类型 add edit del custom
+      btnType: "edit", // 按钮类型 add edit del custom
     },
     {
       // 操作按钮
       topBtn: true, // 是头部按钮
       label: "添加",
       btnStyle: "success",
-      btnType: "add" // 按钮类型 add edit del custom
+      btnType: "add", // 按钮类型 add edit del custom
     },
     {
       topBtn: false, // 头部按钮
       show: true,
       label: "删除",
       btnType: "del", // 按钮类型 add edit del 不设置则 自定义按钮
-      btnStyle: "danger" // topBtn: true才生效 success danger
+      btnStyle: "danger", // topBtn: true才生效 success danger
-    }
+    },
   ],
   column: {
-    // 行数据
+    // // 行数据
-    id: {
+    // id: {
-      label: "编号",
+    //   label: "编号",
-      search: true,
+    //   search: true,
-      add: false, // 字段允许添加
+    //   add: false, // 字段允许添加
-      edit: false, // 字段允许修改
+    //   edit: false, // 字段允许修改
-      width: "150px"
+    //   width: "150px"
-    },
+    // },
-    schoolId: {
+    // schoolId: {
-      label: "学校",
+    //   label: "学校",
-      rules: ruleRequired,
+    //   rules: ruleRequired,
-      width: "200px",
+    //   width: "200px",
-      search: true,
+    //   search: true,
-      type: "dropdown",
+    //   type: "dropdown",
-      add: true, // 字段允许添加
+    //   add: true, // 字段允许添加
-      edit: true, // 字段允许修改
+    //   edit: true, // 字段允许修改
-      setting: {}
+    //   setting: {}
-    },
+    // },
-    name: {
+    // name: {
-      label: "名称[动态]",
+    //   label: "名称[动态]",
-      rules: ruleRequired,
+    //   rules: ruleRequired,
-      width: "100px",
+    //   width: "100px",
-      search: false,
+    //   search: false,
-      searchType: ConditionalType.Like,
+    //   searchType: ConditionalType.Like,
-      add: false, // 字段允许添加
+    //   add: false, // 字段允许添加
-      edit: false // 字段允许修改
+    //   edit: false // 字段允许修改
-    },
+    // },
-    level: {
+    // level: {
-      label: "年级",
+    //   label: "年级",
-      rules: ruleRequired,
+    //   rules: ruleRequired,
-      width: "80px",
+    //   width: "80px",
-      type: "dropdown",
+    //   type: "dropdown",
-      search: true,
+    //   search: true,
-      setting: {},
+    //   setting: {},
-      add: true, // 字段允许添加
+    //   add: true, // 字段允许添加
-      edit: true // 字段允许修改
+    //   edit: true // 字段允许修改
-    },
+    // },
-    year: {
+    // year: {
-      label: "毕业届",
+    //   label: "毕业届",
-      width: "80px",
+    //   width: "80px",
-      rules: ruleRequired,
+    //   rules: ruleRequired,
-      search: true,
+    //   search: true,
-      setting: {},
+    //   setting: {},
-      add: true, // 字段允许添加
+    //   add: true, // 字段允许添加
-      edit: true // 字段允许修改
+    //   edit: true // 字段允许修改
-    },
+    // },
-    createTime: {
+    // createTime: {
-      label: "创建时间",
+    //   label: "创建时间",
-      type: "datetime",
+    //   type: "datetime",
-      search: true,
+    //   search: true,
-      add: false, // 字段允许添加
+    //   add: false, // 字段允许添加
-      edit: false // 字段允许修改
+    //   edit: false // 字段允许修改
-    }
+    // }
   },
   data: [],
   pageData: {
-    total: 0
+    total: 0,
   },
-  selectRows: []
+  selectRows: [],
 };
 
 const showTable = ref(false);
 onMounted(async () => {
   //初始化数据原
 
-  tableData.column.level.setting.datasource = (
+  tableData.column.level.setting.datasource = (await getenum("GradeLevelEnum")).data;
-    await getenum("GradeLevelEnum")
-  ).data;
 
   tableData.column.schoolId.setting.datasource = (
     await SchoolApi.querycombo({ TextName: "Name", ValueName: "Id" })

src/views/school/index.vue

@@ -1,22 +1,28 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
+import { getenum } from "@/api/enum";
 defineOptions({
   name: "School",
 });
 
-onMounted(() => {});
 function searchCallback(data) {
   //let c = data.Conditions.find((s) => s.FieldName == "Pname");
 }
 const table = ref<{ initTable: (config: TableConfig) => void }>(null);
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: "usercenter/back/schools",
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
   searchCallback: searchCallback,
+  editCallback: function (from) {},
   search: {
     // 查询条件
     show: true,
@@ -32,11 +38,13 @@ const tableData: TableConfig = {
       // 操作按钮
       topBtn: false, // 是头部按钮
       label: "修改",
+      perms: "学校修改",
       btnType: "edit", // 按钮类型 add edit del custom
     },
     {
       topBtn: true, // 头部按钮
       label: "新增学校",
+      perms: "学校新增",
       btnType: "custom", // 按钮类型 add edit del custom
       btnStyle: "success", // topBtn: true才生效 success danger
       custom: {
@@ -52,34 +60,41 @@ const tableData: TableConfig = {
     // 行数据
     id: {
       label: "编号",
-      search: true,
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "150px",
+      search: new TableColumnSearch(true),
     },
     name: {
       label: "学校名称",
       width: "300px",
-      search: true,
+      search: new TableColumnSearch(true),
-      searchType: ConditionalType.Like,
+      edit: {
-      add: true, // 字段允许添加
+        add: true,
-      edit: true, // 字段允许修改
+        edit: true,
+      },
     },
     pname: {
       label: "地区",
       width: "300px",
-      search: false,
       custom: (row) => `${row.pname}-${row.cname}-${row.rname}`,
-      add: false, // 字段允许添加
+    },
-      edit: false, // 字段允许修改
+    projectType: {
+      label: "学校项目",
+      width: "200px",
+      type: "dropdown",
+      edit: {
+        multiple: true,
+        edit: true,
+      },
     },
     enable: {
       label: "启用",
       type: "switch",
-      search: true,
       custom: (row) => (row.enable ? "启用" : "禁用"),
-      add: true, // 字段允许添加
+      search: new TableColumnSearch(true),
-      edit: true, // 字段允许修改
+      edit: {
+        add: true,
+        edit: true,
+      },
     },
   },
   data: [],
@@ -87,11 +102,19 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
+const showTable = ref(false);
+onMounted(async () => {
+  let res = await getenum("SchoolProjectEnum");
+  tableData.column.projectType.setting.datasource = res.data;
+
+  //初始化数据完成后显示页面
+  showTable.value = true;
+});
 </script>
 
 <template>
   <div>
-    <ahTable ref="table" :tableConfig="tableData" />
+    <ahTable v-if="showTable" ref="table" :tableConfig="tableData" />
   </div>
 </template>

src/views/school/preview.vue

@@ -1,79 +0,0 @@
-<script setup lang="ts">
-import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
-import { onMounted, ref } from "vue";
-import { fa } from "element-plus/es/locales.mjs";
-defineOptions({
-  name: "SchoolPreview",
-});
-
-const showTable = ref(false);
-onMounted(() => {
-  showTable.value = true;
-});
-function searchCallback(data) {
-  //let c = data.Conditions.find((s) => s.FieldName == "Pname");
-}
-const table = ref<{ initTable: (config: TableConfig) => void }>(null);
-const tableData: TableConfig = {
-  apiUrl: "usercenter/back/schools",
-  selectColumn: false, // 列表选择
-  border: false, // 是否显示表格边框
-  searchCallback: searchCallback,
-  search: {
-    // 查询条件
-    show: true,
-    PageIndex: 0,
-    PageSize: 20,
-    OrderBy: "CreateTime", // 排序
-    defaultConditions: [], // 默认查询条件
-    Conditions: [],
-  },
-  operationColumn: true, // 显示操作按钮
-  operationColumnData: [],
-  column: {
-    // 行数据
-    id: {
-      label: "编号",
-      search: true,
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
-      width: "150px",
-    },
-    name: {
-      label: "学校名称",
-      width: "300px",
-      search: true,
-      searchType: ConditionalType.Like,
-      add: true, // 字段允许添加
-      edit: true, // 字段允许修改
-    },
-    pname: {
-      label: "地区",
-      width: "300px",
-      search: false,
-      custom: (row) => `${row.pname}-${row.cname}-${row.rname}`,
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
-    },
-    enable: {
-      label: "启用",
-      type: "switch",
-      search: true,
-      custom: (row) => (row.enable ? "启用" : "禁用"),
-      add: true, // 字段允许添加
-      edit: true, // 字段允许修改
-    },
-  },
-  data: [],
-  pageData: {
-    total: 0,
-  },
-  selectRows: [],
-};
-</script>
-<template>
-  <div>
-    <ahTable v-if="showTable" ref="table" :tableConfig="tableData" />
-  </div>
-</template>

src/views/student/edit.vue

@@ -19,7 +19,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row>
         <el-col :span="12">
           <el-form-item label="入班时间：" prop="joinTime">
@@ -185,41 +184,94 @@
       </el-row>
       <el-row class="pt-4">
         <el-col :span="24">
-          <el-form-item label="就读班级：" prop="positionIds" :rules="ruleRequired">
+          <el-form-item label="就读班级：" prop="positionList" :rules="ruleRequired">
-            <el-button type="success" @click="CheckPosition()">选择就读班级</el-button>
+            <el-button type="success" @click="AddPosition()">添加就读班级</el-button>
           </el-form-item>
         </el-col>
       </el-row>
-
+      <div class="max-h-[300px] overflow-auto pb-1">
+        <span class="pl-[120px]"
+          >提示:就读信息所有项值<span class="text-red-500">必填</span>,
+          如若查询不到对应班级,请先添加
+        </span>
+        <el-form :model="positionList" inline ref="positionEditForm">
           <div
             v-for="(position, index) in positionList"
             :key="index"
-        style="padding-left: 120px; padding-bottom: 20px"
+            class="subjectTagEnableDiv"
+            style=""
           >
-        <div class="subjectTagEnableDiv" v-if="position.enable === false">
+            <el-form-item>
-          <el-tag type="info">{{ "禁用" }}</el-tag>
+              <el-button
-          <el-tag type="info">{{ position.schoolName || "-" }}</el-tag>
+                title="删除就读班级"
-          <el-tag type="info">{{
+                class="mr-[5px]!"
-            position.graduationYear ? position.graduationYear + "届" : "-"
+                type="danger"
-          }}</el-tag>
+                :icon="Delete"
-          <el-tag type="info">{{ position.grade || "-" }}</el-tag>
+                @click="positionClose(position)"
-          <el-tag type="info">{{ position.className || "-" }}</el-tag>
+                circle
-          <el-tag type="info">{{ position.subjectName || "-" }}</el-tag>
+              />
-          <el-tag type="info">{{ position.name || "-" }}</el-tag>
+            </el-form-item>
-          <el-tag type="info">{{ position.endTime }}</el-tag>
+
-        </div>
+            <el-form-item :prop="`${index}.schoolId`" :rules="ruleRequired">
-        <div class="subjectTagEnableDiv" v-else>
+              <el-select
-          <el-tag>{{ position.schoolName || "-" }}</el-tag>
+                :disabled="position.id != undefined"
-          <el-tag type="warning">{{
+                class="w-[250px]!"
-            position.graduationYear ? position.graduationYear + "届" : "-"
+                v-model="position.schoolId"
-          }}</el-tag>
+                placeholder="学校"
-          <el-tag type="success">{{ position.grade || "-" }}</el-tag>
+                clearable
-          <el-tag type="primary" class="classTag">{{ position.className || "-" }}</el-tag>
+                filterable
-          <el-tag type="info" class="subjectTag">{{
+                @change="() => schoolChange(position)"
-            position.subjectName || "-"
+              >
-          }}</el-tag>
+                <el-option
-          <el-tag type="danger">{{ position.name || "-" }}</el-tag>
+                  v-for="item in schoolList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item :prop="`${index}.grade`" :rules="ruleRequired">
+              <el-select
+                :disabled="position.id != undefined"
+                class="w-[150px]!"
+                v-model="position.grade"
+                placeholder="年级"
+                clearable
+                filterable
+                @change="() => gradeChange(position)"
+              >
+                <el-option
+                  v-for="item in gradeList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item :prop="`${index}.classId`" :rules="ruleRequired">
+              <el-select
+                :disabled="position.id != undefined"
+                class="w-[120px]!"
+                v-model="position.classId"
+                placeholder="班级"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in position.classList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
           </div>
+        </el-form>
       </div>
       <el-form-item>
         <el-button type="primary" :loading="loading" @click="handleSubmitForm()"
@@ -228,35 +280,27 @@
         <el-button @click="handleResetForm()">重置</el-button>
       </el-form-item>
     </el-form>
-    <div class="dialog-container">
-      <el-dialog
-        v-if="dialog.visible"
-        ref="PositionCheckFromDialog"
-        :title="dialog.title"
-        v-model="dialog.visible"
-        :width="dialog.width"
-        :close-on-click-modal="dialog.close"
-        :close-on-press-escape="dialog.close"
-        append-to-body
-      >
-        <PositionForm
-          :userType="form.userType"
-          :positions="PositionFormIds"
-          @handleCheckCallback="handleCheckCallback"
-        />
-      </el-dialog>
-    </div>
   </div>
 </template>
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
 import { EditStudent, StudentInfo } from "@/api/student";
-import { cloudSchoolCombo, getUserInfo, editUser, Position } from "@/api/userCenter";
+import {
+  cloudSchoolCombo,
+  getUserInfo,
+  editUser,
+  Position,
+  getClassCombo,
+  getSchoolData,
+} from "@/api/userCenter";
 import PositionForm from "../teacher/positionForm.vue";
 import { getenum, getenumDic } from "@/api/enum";
 import { ruleRequired, rulePhone } from "@/utils/rules";
 import { ElMessage, FormInstance } from "element-plus";
-import { ComboModel } from "@/components/hTable/hTable";
+import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
+import { Check, Delete, Edit, Message, Search, Star } from "@element-plus/icons-vue";
+
+import { PosititonIds } from "@/api/student";
 
 interface FormData {
   id: number;
@@ -273,6 +317,7 @@ interface FormData {
   subjectLevels: any[];
   subjectLevel: Record<string, any>;
   positionIds: number[];
+  positionList: Position[];
   positionFormIds?: number[];
   gLSubject?: number;
   gSubject1?: number;
@@ -286,7 +331,7 @@ interface FormData {
   amountRelief?: number;
   reliefSubTime?: number;
   reliefType?: number;
-  reliefApplication?: number;
+  reliefApplication?: boolean;
 }
 
 interface DialogConfig {
@@ -330,6 +375,37 @@ const positionList = ref<Position[]>([]);
 const CloudSchoolArr = ref<ComboModel[]>([]);
 const Template = ref<any[]>([]);
 const PositionFormIds = ref<number[]>([]);
+const positionEditForm = ref<FormInstance>();
+
+const schoolList = ref<ComboModel[]>([]);
+const classList = ref<ComboModel[]>([]);
+const gradeList = ref<ComboModel[]>(gradeComboModel());
+const subjectList = ref<ComboModel[]>([]);
+function schoolChange(p: Position) {
+  p.graduationYear = null;
+  p.grade = "";
+  p.classId = null;
+  p.subjectId = null;
+  getClass(p);
+}
+function gradeChange(p: Position) {
+  p.classId = null;
+  p.subjectId = null;
+  getClass(p);
+}
+
+function getClass(p: Position) {
+  const data = {
+    schoolId: p.schoolId || 0,
+    graduationYear: p.graduationYear || 0,
+    grade: p.grade,
+  };
+  getClassCombo(data).then((res) => {
+    if (res.code === 200) {
+      p.classList = res.data;
+    }
+  });
+}
 
 const defaultSubjectLevel = reactive({
   UserId: 0,
@@ -349,7 +425,7 @@ const defaultSubjectLevel = reactive({
 const form = ref<FormData>({
   id: props.id,
   account: "",
-  userType: 1,
+  userType: 2,
   level: 0,
   passWord: "",
   realName: "",
@@ -357,6 +433,7 @@ const form = ref<FormData>({
   templateId: 0,
   phone: "",
   cloudSchoolId: 0,
+  positionList: [],
   subjectLevels: [],
   subjectLevel: { ...defaultSubjectLevel },
   positionIds: [],
@@ -381,29 +458,74 @@ const customeRules = reactive({
   ],
 });
 
-const getUserSubjectLevel = (obj: Record<string, any>) => {
+function positionClose(p: Position) {
-  if (!obj.id) {
+  positionList.value = positionList.value.filter((s) => s != p);
-    form.value.subjectLevel = { ...defaultSubjectLevel };
+}
-    obj = form.value.subjectLevel;
-  }
-  return Object.entries(obj).filter((s) => s[0].includes("Subject"));
-};
 
-const userLevel2subject = (str: string) => {
+const AddPositionArr: Position[] = [];
-  const name = str.match(/[0-9]+/)?.[0] || "";
+function AddPosition() {
-  return subjectLEnum.value[name];
+  let p = {
-};
+    userId: form.value.id,
+    schoolId: null,
+    enable: false,
+    graduationYear: null,
+    gradeLevel: "",
+    classId: null,
+    subjectId: null,
+    positionType: 1,
+    positionLevel: 4,
+    status: true,
+  };
+  let p1 = (p as unknown) as Position;
+  form.value.positionList.push(p1);
+  AddPositionArr.push(p1);
+  positionList.value.push(p1);
+}
 const emit = defineEmits(["handlePagedCallback"]);
 const handlePagedCallback = () => {
   // Emit event to parent if needed
   emit("handlePagedCallback");
 };
 
-const handleSubmitForm = () => {
+const handleSubmitForm = async () => {
-  userEditForm.value.validate(async (valid) => {
+  try {
-    if (valid) {
+    const valid1 = await userEditForm.value.validate();
+    const valid = await positionEditForm.value.validate();
+    if (!valid || !valid1) return;
+  } catch (error) {
+    ElMessage.warning("表单验证未通过,请检查!");
+    return;
+  }
+  try {
     loading.value = true;
-      let ac = form.value.account || new Date().getTime() + "";
+
+    const postIdArr = positionList.value.map((s) => s.id).filter((s) => s != null);
+    const addPArr = positionList.value
+      .filter((s) => s.id == null)
+      .map((s) => {
+        return {
+          positionType: 1,
+          positionLevel: 4,
+          subjectId: s.subjectId,
+          schoolId: s.schoolId,
+          classId: s.classId,
+          gradeLevel: s.grade[0],
+          graduationYear: parseInt(s.grade.slice(1, 5)),
+        };
+      });
+    if (addPArr.length > 0) {
+      const resPId = await PosititonIds(addPArr);
+      if (
+        resPId.code != 200 ||
+        resPId.data.length == 0 ||
+        resPId.data.length != addPArr.length
+      ) {
+        ElMessage.warning("校验添加的职位数据异常,请删除后重新选择!");
+        return;
+      }
+      postIdArr.push(...resPId.data);
+    }
+
     const formData = {
       id: form.value.uId || 0,
       userType: form.value.userType || 1,
@@ -415,13 +537,13 @@ const handleSubmitForm = () => {
       templateId: form.value.templateId || 0,
       subjectLevels: form.value.subjectLevels || [],
       subjectLevel: form.value.subjectLevel || { ...defaultSubjectLevel },
-        positionIds: form.value.positionIds || [],
       gLSubject: form.value.gLSubject,
       gSubject1: form.value.gSubject1,
       gSubject2: form.value.gSubject2,
       idCard: form.value.idCard,
       cloudSchoolId: form.value.cloudSchoolId,
       phone: form.value.phone,
+      positionIds: postIdArr,
     };
 
     let res = await editUser(formData);
@@ -444,13 +566,13 @@ const handleSubmitForm = () => {
     ElMessage.success("操作成功");
     handlePagedCallback();
     //edit info
-    }
+  } catch (error) {}
-  });
+
   // Form validation and submission logic
 };
 
 const handleResetForm = () => {
-  Object.assign(form, {
+  form.value = {
     id: props.id,
     account: "",
     userType: 1,
@@ -458,14 +580,24 @@ const handleResetForm = () => {
     passWord: "",
     realName: "",
     studentId: "",
+    templateId: 0,
+    phone: "",
+    cloudSchoolId: 0,
+    positionList: [],
     subjectLevels: [],
     subjectLevel: { ...defaultSubjectLevel },
     positionIds: [],
     idCard: "",
-    phone: "",
+    exitTime: null,
-    cloudSchoolId: "",
+    joinTime: null,
-    pointPenSN: "",
+    remark: null,
-  });
+    studentType: null,
+    status: null,
+    amountRelief: null,
+    reliefSubTime: null,
+    reliefType: null,
+    reliefApplication: false,
+  };
   positionList.value = [];
 };
 
@@ -500,6 +632,12 @@ const fetchInitData = async () => {
       const [value, text] = s.trim().split(".");
       return { value: parseInt(value.trim()), text: text.trim() };
     });
+
+  const typeRes = await getenum("UserTypeEnum");
+  userTypeList.value = typeRes.data;
+
+  schoolList.value = (await getSchoolData()).data;
+  subjectList.value = (await getenum("SubjectEnum")).data;
 };
 
 const fetchFormData = async () => {
@@ -510,6 +648,13 @@ const fetchFormData = async () => {
       delete res.data.SubjectLevel.CreatePositionId;
     }
     let sInfo = await StudentInfo(props.id);
+    positionList.value = res.data.positions
+      .filter((s: Position) => s.enable)
+      .map((s: Position) => {
+        if (s.positionLevel > 2)
+          s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
+        return s;
+      });
     Object.assign(form.value, {
       id: res.data.id,
       uId: res.data.id,
@@ -532,13 +677,21 @@ const fetchFormData = async () => {
       phone: res.data.phone,
       cloudSchoolId: res.data.cloudSchoolId,
       pointPenSN: res.data.pointPenSN,
+      positionList: positionList.value,
       ...sInfo.data,
     });
-
+    positionList.value = res.data.positions
-    positionList.value = res.data.positions;
+      .filter((s: Position) => s.enable)
+      .map((s: Position) => {
+        s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
+        return s;
+      });
     PositionFormIds.value = res.data.positions
-      .filter((s: any) => s.Enable !== false)
+      .filter((s: Position) => s.enable)
       .map((s: any) => s.id);
+    for (const element of positionList.value) {
+      getClass(element);
+    }
   }
 };
 
@@ -582,9 +735,14 @@ onMounted(async () => {
 
 .subjectTagEnableDiv {
   margin-top: 5px;
+  padding-left: 120px !important;
 }
 
-.subjectTagEnableDiv .el-tag {
+.subjectTagEnableDiv .el-form-item {
+  margin-right: 0px !important;
+  margin-bottom: 10px !important;
+}
+.subjectTagEnableDiv .el-select {
   margin-right: 5px;
 }
 

src/views/student/index.vue

@@ -25,7 +25,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item v-show="search.schoolId != 0" style="width: 100px">
+        <el-form-item v-show="search.schoolId != 0" style="width: 145px">
           <el-select
             v-model="search.grade"
             placeholder="年级"
@@ -109,7 +109,11 @@
                 <div class="subjectTagEnableDiv">
                   <el-tag v-if="position.enable === false" type="info">已禁用</el-tag>
                   <el-tag>{{ position.schoolName || "-" }}</el-tag>
-                  <el-tag type="success">{{ position.grade || "-" }}</el-tag>
+                  <el-tag type="success">{{
+                    position.graduationYear
+                      ? position.gradeLevel + position.graduationYear + "届"
+                      : "-"
+                  }}</el-tag>
                   <el-tag type="primary" class="classTag">{{
                     position.className || "-"
                   }}</el-tag>
@@ -199,7 +203,7 @@ import {
   Search,
   Star,
 } from "@element-plus/icons-vue";
-import { ComboModel } from "@/components/hTable/hTable";
+import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
 import { ImportStudent, PageList } from "@/api/student";
 
 const classAPI = new hTableAPI("usercenter/back/classes");
@@ -312,14 +316,7 @@ const userTypeList = ref<ComboModel[]>([
 
 const userLevelList = ref<ComboModel[]>([]);
 const schoolList = ref<ComboModel[]>([]);
-const gradeList = ref<ComboModel[]>([
+const gradeList = ref<ComboModel[]>(gradeComboModel());
-  { value: "初一", text: "初一" },
-  { value: "初二", text: "初二" },
-  { value: "初三", text: "初三" },
-  { value: "高一", text: "高一" },
-  { value: "高二", text: "高二" },
-  { value: "高三", text: "高三" },
-]);
 const classList = ref<ComboModel[]>([]);
 const subjectList = ref<ComboModel[]>([]);
 const positionList = ref<any[]>([]);
@@ -342,7 +339,7 @@ const dialog = reactive<DialogData>({
   update: {
     title: "",
     visible: false,
-    width: "800px",
+    width: "1000px",
   },
   editLevel: {
     userIds: [],

src/views/teacher/edit.vue

@@ -35,33 +35,139 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="任教信息：" prop="positionIds" :rules="ruleRequired">
+          <el-form-item label="任教信息：" prop="positionList" :rules="ruleRequired">
-            <el-button type="success" @click="CheckPosition()">分配职位</el-button>
+            <el-button type="success" @click="AddPosition()">添加职位</el-button>
           </el-form-item>
         </el-col>
       </el-row>
       <div class="max-h-[400px] overflow-auto pb-1">
+        <span class="pl-[120px]"
+          >提示:任职信息所有项值<span class="text-red-500">必填</span>,
+          如若查询不到对应班级,请先添加
+        </span>
+        <el-form :model="positionList" inline ref="positionEditForm">
           <div
             v-for="(position, index) in positionList"
             :key="index"
-          style="padding-left: 120px; padding-bottom: 20px"
+            class="subjectTagEnableDiv"
+            style=""
           >
-          <div class="subjectTagEnableDiv">
+            <el-form-item>
-            <el-tag v-if="!position.enable" type="info">已禁用</el-tag>
+              <el-button
-            <el-tag>{{ position.schoolName || "-" }}</el-tag>
+                title="删除职位"
-            <el-tag type="warning">{{
+                class="mr-[5px]!"
-              position.graduationYear ? position.graduationYear + "届" : "-"
+                type="danger"
-            }}</el-tag>
+                :icon="Delete"
-            <el-tag type="success" v-show="position.grade">{{ position.grade }}</el-tag>
+                @click="positionClose(position)"
-            <el-tag type="primary" v-show="position.className" class="classTag">{{
+                circle
-              position.className
+              />
-            }}</el-tag>
+            </el-form-item>
-            <el-tag type="info" v-show="position.subjectName" class="subjectTag">{{
+            <el-form-item :prop="`${index}.positionLevel`" :rules="ruleRequired">
-              position.subjectName
+              <el-select
-            }}</el-tag>
+                :disabled="position.id != undefined"
-            <el-tag type="danger">{{ position.name || "-" }}</el-tag>
+                class="w-[100px]!"
-          </div>
+                v-model="position.positionLevel"
+                placeholder="类型"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in positionEnumList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item :prop="`${index}.schoolId`" :rules="ruleRequired">
+              <el-select
+                :disabled="position.id != undefined"
+                class="w-[250px]!"
+                v-model="position.schoolId"
+                placeholder="学校"
+                clearable
+                filterable
+                @change="() => schoolChange(position)"
+              >
+                <el-option
+                  v-for="item in schoolList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item :prop="`${index}.grade`" :rules="ruleRequired">
+              <el-select
+                :disabled="position.id != undefined"
+                class="w-[150px]!"
+                v-model="position.grade"
+                placeholder="年级"
+                clearable
+                filterable
+                @change="() => gradeChange(position)"
+              >
+                <el-option
+                  v-for="item in gradeList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              :prop="`${index}.classId`"
+              :rules="position.positionLevel > 3 ? ruleRequired : []"
+            >
+              <el-select
+                :disabled="position.id != undefined"
+                v-show="position.positionLevel > 3"
+                class="w-[120px]!"
+                v-model="position.classId"
+                placeholder="班级"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in position.classList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              :prop="`${index}.subjectId`"
+              :rules="position.positionLevel == 5 ? ruleRequired : []"
+            >
+              <el-select
+                :disabled="position.id != undefined"
+                v-show="position.positionLevel == 5"
+                class="w-[100px]!"
+                v-model="position.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>
           </div>
+        </el-form>
       </div>
       <el-form-item>
         <el-button type="primary" :loading="loading" @click="handleSubmitForm()"
@@ -70,36 +176,27 @@
         <el-button @click="handleResetForm()">重置</el-button>
       </el-form-item>
     </el-form>
-    <div class="dialog-container">
-      <el-dialog
-        v-if="dialog.visible"
-        ref="PositionCheckFromDialog"
-        :title="dialog.title"
-        v-model="dialog.visible"
-        :width="dialog.width"
-        :close-on-click-modal="dialog.close"
-        :close-on-press-escape="dialog.close"
-        append-to-body
-      >
-        <PositionForm
-          :userType="form.userType"
-          :positions="PositionFormIds"
-          @handleCheckCallback="handleCheckCallback"
-        />
-      </el-dialog>
-    </div>
   </div>
 </template>
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
 import {} from "@/api/user";
-import { cloudSchoolCombo, getUserInfo, editUser, Position } from "@/api/userCenter";
+import {
+  cloudSchoolCombo,
+  getUserInfo,
+  editUser,
+  Position,
+  getSchoolData,
+  getClassCombo,
+} from "@/api/userCenter";
 import PositionForm from "./positionForm.vue";
 import { getenum, getenumDic } from "@/api/enum";
+import { PosititonIds } from "@/api/student";
 import { ruleRequired, rulePhone } from "@/utils/rules";
 import { ElMessage, FormInstance } from "element-plus";
-import { ComboModel } from "@/components/hTable/hTable";
+import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
-import { InformationEvent } from "http";
+import { Check, Delete, Edit, Message, Search, Star } from "@element-plus/icons-vue";
+import { de } from "element-plus/es/locales.mjs";
 
 interface FormData {
   id: number;
@@ -115,6 +212,7 @@ interface FormData {
   subjectLevels: any[];
   subjectLevel: Record<string, any>;
   positionIds: number[];
+  positionList: Position[];
   positionFormIds?: number[];
   gLSubject?: number;
   gSubject1?: number;
@@ -161,6 +259,42 @@ const positionList = ref<Position[]>([]);
 const CloudSchoolArr = ref<ComboModel[]>([]);
 const Template = ref<any[]>([]);
 const PositionFormIds = ref<number[]>([]);
+const positionEditForm = ref<FormInstance>();
+
+const schoolList = ref<ComboModel[]>([]);
+const classList = ref<ComboModel[]>([]);
+const gradeList = ref<ComboModel[]>(gradeComboModel());
+const subjectList = ref<ComboModel[]>([]);
+const positionEnumList = ref<ComboModel[]>([
+  { text: "年级主任", value: 3 },
+  { text: "班主任", value: 4 },
+  { text: "科任老师", value: 5 },
+]);
+function schoolChange(p: Position) {
+  p.graduationYear = null;
+  p.grade = "";
+  p.classId = null;
+  p.subjectId = null;
+  getClass(p);
+}
+function gradeChange(p: Position) {
+  p.classId = null;
+  p.subjectId = null;
+  getClass(p);
+}
+
+function getClass(p: Position) {
+  const data = {
+    schoolId: p.schoolId || 0,
+    graduationYear: p.graduationYear || 0,
+    grade: p.grade,
+  };
+  getClassCombo(data).then((res) => {
+    if (res.code === 200) {
+      p.classList = res.data;
+    }
+  });
+}
 
 const defaultSubjectLevel = reactive({
   UserId: 0,
@@ -188,6 +322,7 @@ const form = ref<FormData>({
   templateId: 0,
   phone: "",
   cloudSchoolId: 0,
+  positionList: [],
   subjectLevels: [],
   subjectLevel: { ...defaultSubjectLevel },
   positionIds: [],
@@ -212,34 +347,80 @@ const customeRules = reactive({
   ],
 });
 
-const getUserSubjectLevel = (obj: Record<string, any>) => {
+function positionClose(p: Position) {
-  if (!obj.id) {
+  positionList.value = positionList.value.filter((s) => s != p);
-    form.value.subjectLevel = { ...defaultSubjectLevel };
+}
-    obj = form.value.subjectLevel;
-  }
-  return Object.entries(obj).filter((s) => s[0].includes("Subject"));
-};
 
-const userLevel2subject = (str: string) => {
+const AddPositionArr: Position[] = [];
-  const name = str.match(/[0-9]+/)?.[0] || "";
+function AddPosition() {
-  return subjectLEnum.value[name];
+  let p = {
-};
+    userId: form.value.id,
+    schoolId: null,
+    enable: false,
+    graduationYear: null,
+    gradeLevel: "",
+    classId: null,
+    subjectId: null,
+    positionType: 2,
+    positionLevel: null,
+    status: true,
+  };
+  let p1 = (p as unknown) as Position;
+  form.value.positionList.push(p1);
+  AddPositionArr.push(p1);
+  positionList.value.push(p1);
+}
 
 const handlePagedCallback = () => {
   emit("handlePagedCallback");
 };
 const userEditForm = ref<FormInstance>();
-const handleSubmitForm = () => {
+const handleSubmitForm = async () => {
-  userEditForm.value.validate((valid) => {
+  try {
-    if (valid) {
+    const valid1 = await userEditForm.value.validate();
+    const valid = await positionEditForm.value.validate();
+    if (!valid || !valid1) return;
+  } catch (error) {
+    ElMessage.warning("表单验证未通过,请检查!");
+    return;
+  }
+  try {
     loading.value = true;
+    const postIdArr = positionList.value.map((s) => s.id).filter((s) => s != null);
+
+    const addPArr = positionList.value
+      .filter((s) => s.id == null)
+      .map((s) => {
+        return {
+          positionLevel: s.positionLevel,
+          subjectId: s.subjectId,
+          schoolId: s.schoolId,
+          classId: s.classId,
+          positionType: 2,
+          gradeLevel: s.grade[0],
+          graduationYear: parseInt(s.grade.slice(1, 5)),
+        };
+      });
+    if (addPArr.length > 0) {
+      const resPId = await PosititonIds(addPArr);
+      if (
+        resPId.code != 200 ||
+        resPId.data.length == 0 ||
+        resPId.data.length != addPArr.length
+      ) {
+        ElMessage.warning("校验添加的职位数据异常,请删除后重新选择!");
+        return;
+      }
+      postIdArr.push(...resPId.data);
+    }
+
     const formData = {
       ...form.value,
       account: form.value.phone || "",
-        positionIds: form.value.positionIds || [],
+      positionIds: postIdArr,
     };
 
-      editUser(formData).then((res) => {
+    const res = await editUser(formData);
     loading.value = false;
     if (res.code === 200) {
       ElMessage.success("操作成功");
@@ -247,11 +428,10 @@ const handleSubmitForm = () => {
     } else {
       ElMessage.error(res.message);
     }
-      });
+  } catch (error) {
+    ElMessage.error("请求失败!" + (error.message ?? JSON.stringify(error)));
+    loading.value = false;
   }
-  });
-
-  // Form validation and submission logic
 };
 
 const handleResetForm = () => {
@@ -273,7 +453,6 @@ const handleResetForm = () => {
   });
   positionList.value = [];
 };
-
 const fetchInitData = async () => {
   // 用户层次
   const levelRes = await getenum("StudentLevelEnum");
@@ -282,6 +461,9 @@ const fetchInitData = async () => {
   const typeRes = await getenum("UserTypeEnum");
   userTypeList.value = typeRes.data;
 
+  schoolList.value = (await getSchoolData()).data;
+  subjectList.value = (await getenum("SubjectEnum")).data.filter((s) => s.value < 10);
+
   // // 云校
   // const schoolRes = await cloudSchoolCombo();
   // if (schoolRes.code === 200) {
@@ -301,6 +483,13 @@ const fetchFormData = () => {
           delete res.data.SubjectLevel.CreatePositionId;
         }
 
+        positionList.value = res.data.positions
+          .filter((s: Position) => s.enable)
+          .map((s: Position) => {
+            if (s.positionLevel > 2)
+              s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
+            return s;
+          });
         Object.assign(form.value, {
           id: res.data.id,
           userType: res.data.userType,
@@ -322,12 +511,21 @@ const fetchFormData = () => {
           phone: res.data.phone,
           cloudSchoolId: res.data.cloudSchoolId,
           pointPenSN: res.data.pointPenSN,
+          positionList: positionList.value ?? [],
+        });
+        positionList.value = res.data.positions
+          .filter((s: Position) => s.enable)
+          .map((s: Position) => {
+            if (s.positionLevel > 2)
+              s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
+            return s;
           });
-
-        positionList.value = res.data.positions;
         PositionFormIds.value = res.data.positions
-          .filter((s: any) => s.Enable !== false)
+          .filter((s: Position) => s.enable)
           .map((s: any) => s.id);
+        for (const element of positionList.value) {
+          if (element.positionLevel > 3) getClass(element);
+        }
       }
     });
   }
@@ -376,9 +574,14 @@ onMounted(async () => {
 
 .subjectTagEnableDiv {
   margin-top: 5px;
+  padding-left: 120px !important;
 }
 
-.subjectTagEnableDiv .el-tag {
+.subjectTagEnableDiv .el-form-item {
+  margin-right: 0px !important;
+  margin-bottom: 10px !important;
+}
+.subjectTagEnableDiv .el-select {
   margin-right: 5px;
 }
 

src/views/teacher/index.vue

@@ -54,7 +54,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item v-show="search.schoolId != 0" style="width: 100px">
+        <el-form-item v-show="search.schoolId != 0" style="width: 145px">
           <el-select
             v-model="search.grade"
             placeholder="年级"
@@ -159,29 +159,20 @@
 
       <el-table-column prop="studentId" label="职务" width="120" />
 
-      <el-table-column label="任教信息">
+      <el-table-column label="任教信息" min-width="500">
         <template #default="scope">
           <div
             v-for="(position, index) in scope.row.positions"
             :key="'Position' + index"
             v-show="index < 3 || (index >= 3 && showAllPosition.includes(scope.row))"
           >
-            <div v-if="position.enable === false">
+            <div class="subjectTagEnableDiv">
-              <el-tag type="info">{{ position.schoolName || "-" }}</el-tag>
-              <el-tag type="info">{{
-                position.graduationYear ? position.graduationYear + "届" : "-"
-              }}</el-tag>
-              <el-tag type="info">{{ position.grade || "-" }}</el-tag>
-              <el-tag type="info">{{ position.className || "-" }}</el-tag>
-              <el-tag type="info">{{ position.subjectName || "-" }}</el-tag>
-              <el-tag type="info">{{ position.name || "-" }}</el-tag>
-            </div>
-            <div class="subjectTagEnableDiv" v-else>
               <el-tag>{{ position.schoolName || "-" }}</el-tag>
               <el-tag type="warning">{{
-                position.graduationYear ? position.graduationYear + "届" : "-"
+                position.graduationYear
+                  ? position.gradeLevel + position.graduationYear + "届"
+                  : "-"
               }}</el-tag>
-              <el-tag type="success">{{ position.grade || "-" }}</el-tag>
               <el-tag type="primary" class="classTag">{{
                 position.className || "-"
               }}</el-tag>
@@ -260,7 +251,7 @@ import {
   Search,
   Star,
 } from "@element-plus/icons-vue";
-import { ComboModel } from "@/components/hTable/hTable";
+import { ComboModel, gradeComboModel } from "@/components/hTable/hTable";
 import { ImportTeacher } from "@/api/student";
 
 const classAPI = new hTableAPI("usercenter/back/classes");
@@ -374,14 +365,8 @@ const userTypeList = ref<ComboModel[]>([
 
 const userLevelList = ref<ComboModel[]>([]);
 const schoolList = ref<ComboModel[]>([]);
-const gradeList = ref<ComboModel[]>([
+
-  { value: "初一", text: "初一" },
+const gradeList = ref<ComboModel[]>(gradeComboModel());
-  { value: "初二", text: "初二" },
-  { value: "初三", text: "初三" },
-  { value: "高一", text: "高一" },
-  { value: "高二", text: "高二" },
-  { value: "高三", text: "高三" },
-]);
 const classList = ref<ComboModel[]>([]);
 const subjectList = ref<ComboModel[]>([]);
 const positionList = ref<any[]>([]);

src/views/teacher/positionForm.vue

@@ -163,20 +163,20 @@
         </el-table-column>
       </el-table>
       <el-card class="box-card">
-        <div class="clearfix clearfixCss">
+        <div class="flex justify-between clearfixCss">
           <span style="line-height: 32px; font-weight: 600"
             >{{ userType == 1 ? "就读班级" : "已选职位" }}[{{
               selectPositions.length
             }}]</span
           >
-          <el-button
+
-            style="float: right"
+          <div>
-            type="success"
+            <el-button @click="reload">重置</el-button>
-            @click="handleConfirm"
+            <el-button type="success" @click="handleConfirm" :icon="Check"
-            :icon="Check"
               >提交分配职位</el-button
             >
           </div>
+        </div>
         <div class="positionGap">
           <el-tag
             v-for="(p, o) in selectPositions"
@@ -433,6 +433,9 @@ const fetchPagedData = async () => {
   }
 };
 
+const reload = () => {
+  selectPositions.value = [];
+};
 const handleConfirm = () => {
   if (selectPositions.value.length === 0) {
     ElMessage.warning("请选择要分配的职位");

src/views/testxb/index.vue

@@ -1,11 +0,0 @@
-<script setup lang="ts" name="Testxb">
-import { ref } from "vue";
-// defineOptions({
-//   name: "Testxb"
-// });
-let name = ref("nihao");
-</script>
-
-<template>
-  <div>测试菜单</div>
-</template>

src/views/toschoolinfomanage/addModal.vue

@@ -28,8 +28,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="年级" prop="baseInfo.grade">
+          <el-form-item label="年级" prop="baseInfo.gradeLevel">
-            <el-select v-model="form.baseInfo.grade" placeholder="请选择年级" clearable>
+            <el-select
+              v-model="form.baseInfo.gradeLevel"
+              placeholder="请年级"
+              clearable
+              style="width: 120px"
+            >
               <el-option
                 v-for="g in gradeOptions"
                 :key="g.value"
@@ -37,6 +42,12 @@
                 :value="g.value"
               />
             </el-select>
+            <el-input-number
+              style="width: 120px"
+              v-model="form.baseInfo.gradeYear"
+              :min="2020"
+              :max="2100"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -69,6 +80,25 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="预计解决时间" prop="baseInfo.endTime">
+            <el-date-picker
+              v-model="form.baseInfo.endTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="请选预计解决时间"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <div>
+            提示:离赴校时间超过<span class="text-yellow-500">{ {{ warningDay }}天}</span
+            >黄色警告, 超过预计完成时间<span class="text-red-500"
+              >{ {{ errorDay }}天}</span
+            >红色警告
+          </div>
+        </el-col>
       </el-row>
 
       <el-divider>基础工作</el-divider>
@@ -154,6 +184,7 @@ import { ref, reactive, computed, defineProps, defineEmits, watch } from "vue";
 import type { FormInstance, FormRules } from "element-plus";
 import { ElMessage } from "element-plus";
 import { getSchoolData } from "@/api/userCenter";
+import { errorDay, warningDay } from "./config";
 import { getSchoolBusinessPeopleListApi, addOrEditApi } from "@/api/toschoolinfomanage";
 const props = defineProps<{ visible: boolean }>();
 // const emit = defineEmits<{ (e: "update:visible", value: boolean): void }>();
@@ -198,13 +229,11 @@ const getSchoolBusinessPeopleList = () => {
 };
 getSchoolDataFn();
 getSchoolBusinessPeopleList();
+
 const gradeOptions = [
-  { label: "初一", value: "初一" },
+  { label: "高", value: "高" },
-  { label: "初二", value: "初二" },
+  { label: "初", value: "初" },
-  { label: "初三", value: "初三" },
+  { label: "小", value: "小" },
-  { label: "高一", value: "高一" },
-  { label: "高二", value: "高二" },
-  { label: "高三", value: "高三" },
 ];
 
 type FeedbackKey = "leaders" | "classroom" | "equipment" | "students" | "others";
@@ -215,8 +244,10 @@ interface FeedbackItem {
 interface FormModel {
   baseInfo: {
     school?: string;
-    grade?: string;
+    gradeYear?: number;
+    gradeLevel?: string;
     date?: string;
+    endTime?: string;
     people: string[];
   };
   work: {
@@ -231,7 +262,8 @@ interface FormModel {
 const form = reactive<FormModel>({
   baseInfo: {
     school: undefined,
-    grade: undefined,
+    gradeLevel: "高",
+    gradeYear: 2025,
     date: undefined,
     people: [],
   },
@@ -263,7 +295,7 @@ watch(
 );
 const rules: FormRules = {
   "baseInfo.school": [{ required: true, message: "请选择学校", trigger: "change" }],
-  "baseInfo.grade": [{ required: true, message: "请选择年级", trigger: "change" }],
+  "baseInfo.gradeLevel": [{ required: true, message: "请选择年级", trigger: "change" }],
   "baseInfo.date": [{ required: true, message: "请选择赴校时间", trigger: "change" }],
   "baseInfo.people": [
     { required: true, message: "请选择赴校人员", trigger: "change" },
@@ -412,11 +444,12 @@ async function onSubmit() {
       id: 0, //id传0代表新增
       schoolId: form.baseInfo.school,
       schoolName: schoolOptions.value.find((i) => i.value == form.baseInfo.school).label,
-      grade: form.baseInfo.grade,
       // 固定传空字符串
-      gradeLevel: "",
+      gradeLevel: form.baseInfo.gradeLevel,
+      gradeYear: form.baseInfo.gradeYear,
       schoolBusinessUser: form.baseInfo.people,
       startTime: form.baseInfo.date,
+      endTime: form.baseInfo.endTime,
       isDiscussion: form.work.talk,
       discussion: form.work.talkDetail,
       isClassMeeting: form.work.classMeeting,
@@ -445,7 +478,7 @@ async function onSubmit() {
 
 function resetForm() {
   form.baseInfo.school = undefined;
-  form.baseInfo.grade = undefined;
+  form.baseInfo.gradeLevel = undefined;
   form.baseInfo.date = undefined;
   form.baseInfo.people = [];
   form.work.talk = false;

src/views/toschoolinfomanage/config.ts

@@ -0,0 +1,4 @@
+/** 赴校后超时时间 */
+export const warningDay = 8;
+/** 赴校任务过期时间 */
+export const errorDay = 2;

src/views/toschoolinfomanage/editModal.vue

@@ -29,7 +29,7 @@
           {{ safeDetail.schoolName || safeDetail.school || "-" }}
         </el-descriptions-item>
         <el-descriptions-item label="年级">
-          {{ safeDetail.grade || safeDetail.gradeLevel || "-" }}
+          {{ safeDetail.gradeLevel + safeDetail.gradeYear }}届
         </el-descriptions-item>
         <el-descriptions-item label="赴校人员">
           {{
@@ -41,6 +41,10 @@
         <el-descriptions-item label="赴校时间">
           {{ safeDetail.startTimeStr || safeDetail.startTime }}
         </el-descriptions-item>
+
+        <el-descriptions-item label="预计完结时间">
+          {{ safeDetail.endTime != null ? safeDetail.endTime.split("T")[0] : "--" }}
+        </el-descriptions-item>
       </el-descriptions>
 
       <el-divider />
@@ -76,34 +80,63 @@
         <span> 未解决问题：{{ unresolvedCount }} </span>
       </div>
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane
+        <el-tab-pane v-for="(i, idx) in questions" :key="idx" :name="idx">
-          v-for="(i, idx) in sortData(safeDetail.feedbackQuestions || [])"
+          <template #label>
-          :key="idx"
+            <span class="custom-tabs-label" :class="i.solution ? `text-[#67c23a]` : ``">
-          :label="'问题' + (idx + 1) + (i.solution ? '(✅已解决)' : '(未解决)')"
+              <span>问题{{ idx + 1 }}</span>
-          :name="idx"
+              <el-icon>
-        >
+                <Select v-if="i.solution" />
+              </el-icon>
+            </span>
+          </template>
           <div style="font-size: 12px; margin-bottom: 4px">
             <span>问题类型：</span> <span>{{ queType[i.questionType] }}</span>
           </div>
           <div style="padding: 10px; background-color: #f3f3f3">
             {{ i.question }}
           </div>
-          <div v-if="i.solution" style="font-size: 12px; margin-top: 10px">
+          <div
-            <span> 解决时间：{{ i.endTimeStr || i.endTime }} </span>
+            v-for="(rec, rIdx) in i.recordArr || []"
+            :key="rIdx"
+            style="margin-top: 10px"
+          >
+            <div>
+              执行记录{{ rIdx + 1 }}：{{ rec.operator || "" }} {{ rec.executionTimeStr }}
+            </div>
+            <div style="padding: 5px; background-color: #f3f3f3">
+              {{ rec.executionRecords }}
+            </div>
+          </div>
+
+          <div v-if="i.solution" style="font-size: 12px; margin-top: 20px">
+            <span class="text-amber-400 font-bold">
+              解决时间：{{ i.endTimeStr || i.endTime }}
+            </span>
             <div style="padding: 10px; background-color: #f3f3f3">
               {{ i.solution }}
             </div>
           </div>
+          <div v-else class="mt-1.5">
             <el-button
               v-show="!isDetail"
-            type="text"
+              link
-            v-else
+              :disabled="i.solution"
+              style="margin-top: 5px; font-size: 12px"
+              class="markTitle"
+              @click="addQRecord(i)"
+            >
+              添加执行记录
+            </el-button>
+            <el-button
+              v-show="!isDetail"
+              link
               style="margin-top: 5px; font-size: 12px"
               class="markTitle"
               @click="markTitle(i)"
             >
               标记已解决
             </el-button>
+          </div>
         </el-tab-pane>
       </el-tabs>
       <el-divider />
@@ -128,7 +161,7 @@
       <!-- 添加按钮区域 -->
       <div style="margin-top: 5px; display: flex; gap: 20px">
         <el-button
-          type="text"
+          link
           style="margin-top: 5px; font-size: 12px"
           class="markTitle"
           v-show="!isDetail"
@@ -139,8 +172,10 @@
         <el-button
           style="margin-top: 5px; font-size: 12px"
           class="markTitle"
-          type="text"
+          link
           v-show="!isDetail"
+          :disabled="unresolvedCount != 0"
+          title="请先解决所有问题后再添加完结情况"
           @click="addFinish"
         >
           {{ finishRecord ? "修改完结情况" : "添加完结情况" }}
@@ -160,7 +195,7 @@
             border-radius: 4px;
           "
         >
-          <div style="font-weight: bold; color: #409eff">
+          <div style="font-weight: bold; color: #67c23a">
             执行记录{{ index + 1 }}：{{ record.operator }} {{ record.time }}
           </div>
           <div style="margin-top: 5px; white-space: pre-wrap">
@@ -180,9 +215,7 @@
             border: 1px solid #b3d8ff;
           "
         >
-          <div style="font-weight: bold; color: #a69400">
+          <div class="text-amber-400 font-bold">完结情况：{{ finishRecord.time }}</div>
-            完结情况：{{ finishRecord.time }}
-          </div>
           <div style="margin-top: 5px; white-space: pre-wrap">
             {{ finishRecord.content }}
           </div>
@@ -230,7 +263,7 @@
 </template>
 
 <script setup lang="ts" name="EditModal">
-import { ref, reactive, computed, defineProps, defineEmits, watch } from "vue";
+import { ref, reactive, computed, defineProps, defineEmits, watch, onMounted } from "vue";
 import type { FormInstance, FormRules, TabsPaneContext } from "element-plus";
 import { ElMessage } from "element-plus";
 import { getSchoolData } from "@/api/userCenter";
@@ -238,13 +271,23 @@ import { getSchoolBusinessPeopleListApi, addOrEditApi } from "@/api/toschoolinfo
 import { setFips } from "crypto";
 import { useUserStoreHook } from "@/store/modules/user";
 import { isAllEmpty } from "@pureadmin/utils";
+import { Select, CloseBold } from "@element-plus/icons-vue";
 
 const activeName = ref<any>(0);
+onMounted(() => {
+  console.log("onMounted ");
 
+  questions = ref(sortData(safeDetail.value.feedbackQuestions));
+});
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab.props.name, event);
   activeName.value = tab.props.name;
 };
+const gradeOptions = [
+  { label: "高", value: "高" },
+  { label: "初", value: "初" },
+  { label: "小", value: "小" },
+];
 const props = defineProps<{
   visible: boolean;
   detailData: any;
@@ -305,6 +348,7 @@ const operationContentLabel = computed(() => {
     case "markSolved":
       return "解决情况";
     case "addRecord":
+    case "addQRecord":
       return "执行记录";
     case "addFinish":
       return "完结情况";
@@ -345,10 +389,12 @@ const queType = {
  * 获取未解决问题数量
  * @param data
  */
-const handleUnHandleQust = (data: Array<any>) => {
+const handleUnHandleQust = (data: Array<any>): number => {
   return (data || []).filter((i) => !i?.solution).length;
 };
+
 const sortData = (data: Array<any>) => {
+  if (data == null || data.length == 0) return [];
   const categorizedData = [
     ...data
       .filter((item) => item.questionType === 1)
@@ -373,6 +419,7 @@ const statusText = computed(() => (safeDetail.value?.solutionEnd ? "已完结" :
 const statusType = computed(() =>
   safeDetail.value?.solutionEnd ? "success" : "warning"
 );
+let questions = ref(sortData(safeDetail.value.feedbackQuestions));
 const solutionText = computed({
   get: () => safeDetail.value?.solutionRecord?.solution || "",
   set: (value: string) => {
@@ -388,6 +435,7 @@ const unresolvedCount = computed(() => {
   const list = (safeDetail.value?.feedbackQuestions as any[]) || [];
   return list.filter((item) => !item?.solution).length;
 });
+
 const markTitle = (data: any) => {
   console.log("标记已解决", data);
   operationType.value = "markSolved";
@@ -398,6 +446,14 @@ const markTitle = (data: any) => {
   operationFormRef.value?.clearValidate();
   operationDialogVisible.value = true;
 };
+const addQRecord = (data: any) => {
+  console.log("添加问题执行记录", data);
+  operationType.value = "addQRecord";
+  currentMarkedQuestion.value = data;
+  // 预填已有值
+  operationFormRef.value?.clearValidate();
+  operationDialogVisible.value = true;
+};
 const addRecord = () => {
   console.log("添加执行记录");
   operationType.value = "addRecord";
@@ -433,7 +489,11 @@ const closeOperationDialog = () => {
   // 重置当前标记项
   currentMarkedQuestion.value = null;
 };
-
+const userName = computed(() => {
+  return isAllEmpty(useUserStoreHook()?.nickName)
+    ? useUserStoreHook()?.userName
+    : useUserStoreHook()?.nickName;
+});
 const confirmOperation = async () => {
   if (!operationFormRef.value) return;
 
@@ -441,9 +501,21 @@ const confirmOperation = async () => {
     await operationFormRef.value.validate();
 
     const { operationTime, operationContent } = operationForm;
-
     // 根据操作类型处理数据
     switch (operationType.value) {
+      case "addQRecord":
+        // 添加执行记录
+        if (currentMarkedQuestion.value) {
+          if (currentMarkedQuestion.value.recordArr == undefined) {
+            currentMarkedQuestion.value.recordArr = [];
+          }
+          currentMarkedQuestion.value.recordArr.push({
+            executionTime: operationTime,
+            executionRecords: operationContent,
+            operator: userName.value,
+          });
+        }
+        break;
       case "addRecord":
         // 添加执行记录
         executionRecords.value.push({
@@ -454,11 +526,7 @@ const confirmOperation = async () => {
         if (!props.detailData.solutionRecord) props.detailData.solutionRecord = {} as any;
         if (!Array.isArray(props.detailData.solutionRecord.record))
           props.detailData.solutionRecord.record = [];
-        const userName = computed(() => {
+
-          return isAllEmpty(useUserStoreHook()?.nickName)
-            ? useUserStoreHook()?.userName
-            : useUserStoreHook()?.nickName;
-        });
         props.detailData.solutionRecord.record.push({
           executionTime: operationTime,
           executionRecords: operationContent,
@@ -532,6 +600,14 @@ function onClickSave() {
 </script>
 
 <style scoped lang="scss">
+.custom-tabs-label .el-icon {
+  vertical-align: middle;
+}
+.custom-tabs-label span {
+  vertical-align: middle;
+  margin-left: 4px;
+}
+
 .modal-header {
   display: flex;
   align-items: center;
@@ -555,7 +631,6 @@ function onClickSave() {
 }
 .markTitle:hover {
   text-decoration: underline;
-  cursor: pointer;
   user-select: none;
 }
 </style>

src/views/toschoolinfomanage/index.vue

@@ -23,7 +23,7 @@
           v-model="query.grade"
           placeholder="请选择年级"
           clearable
-          style="width: 140px"
+          style="width: 120px"
         >
           <el-option
             v-for="g in gradeOptions"
@@ -32,6 +32,12 @@
             :value="g.value"
           />
         </el-select>
+        <el-input-number
+          v-show="query.grade"
+          v-model="query.gradeYear"
+          :min="2020"
+          :max="2100"
+        />
       </el-form-item>
       <el-form-item label="赴校人员">
         <el-select
@@ -88,7 +94,12 @@
       <el-button type="info" @click="downLoadTpl">下载模版</el-button>
     </div>
     <!-- 表格区域 -->
-    <el-table :data="listData" style="width: 100%" :max-height="500">
+    <el-table
+      :data="listData"
+      style="width: 100%"
+      :max-height="500"
+      :row-class-name="tableRowClassName"
+    >
       <el-table-column label="操作" width="200">
         <template #default="{ row }">
           <!-- <el-button size="small" type="danger" plain @click="onDelete(row)"
@@ -127,9 +138,15 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="grade" label="年级" min-width="100" />
+      <el-table-column label="年级" min-width="100">
+        <template #default="{ row }"> {{ row.gradeLevel + row.gradeYear }}届 </template>
+      </el-table-column>
       <el-table-column prop="people" label="赴校人员" min-width="120" />
-      <el-table-column prop="times" label="赴校时间" min-width="140" />
+      <el-table-column label="赴校时间/解决时间" min-width="140">
+        <template #default="{ row }">
+          {{ row.times }}{{ row.endTime ? " / " + row.endTime : "" }}
+        </template>
+      </el-table-column>
       <el-table-column prop="feedbackTotals" label="反馈问题数量" min-width="140" />
       <el-table-column prop="solveTotals" label="解决问题数量" min-width="140" />
 
@@ -155,6 +172,7 @@
     <!-- 跟进 -->
     <EditModal
       v-model:visible="isShowEditModal"
+      v-if="isShowEditModal"
       :editModalLoading="editModalLoading"
       :detailData="detailData"
       :isDetail="isDetail"
@@ -180,13 +198,17 @@ import AddModal from "./addModal.vue";
 import { Check, Search } from "@element-plus/icons-vue";
 import EditModal from "./editModal.vue";
 import { message } from "@/utils/message";
+import { errorDay, warningDay } from "./config";
 interface TableItem {
   id: number;
   school: string;
   grade: string;
   people: string;
+  gradeLevel?: string;
+  gradeYear?: number;
   canOperate: boolean; // 是否可以跟进
   times: string; // YYYY-MM-DD
+  endTime: string; //预计解决时间
   feedbackTotals: number;
   solveTotals: number;
   solutionEnd: boolean; // true: 已完结, false: 跟进中
@@ -196,6 +218,22 @@ interface TableItem {
 const schoolOptions = ref([]);
 const peopleOptions = ref([]);
 const isDetail = ref(false);
+
+const tableRowClassName = ({ row, rowIndex }: { row: TableItem; rowIndex: number }) => {
+  if (row.endTime == null || row.endTime == "" || row.solutionEnd) return "";
+  const nD = new Date();
+  const d = new Date(row.endTime + " ");
+  const startTime = new Date(row.times + " ");
+  const daysDiff1 = (nD.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24);
+  const daysDiff = (d.getTime() - nD.getTime()) / (1000 * 60 * 60 * 24);
+  if (daysDiff <= -errorDay) {
+    return "error-row";
+  } else if (daysDiff1 >= warningDay) {
+    return "warning-row";
+  }
+  return "";
+};
+
 /**
  * 获取学校下拉数据
  */
@@ -236,12 +274,9 @@ onMounted(() => {
 });
 
 const gradeOptions = [
-  { label: "初一", value: "初一" },
+  { label: "高", value: "高" },
-  { label: "初二", value: "初二" },
+  { label: "初", value: "初" },
-  { label: "初三", value: "初三" },
+  { label: "小", value: "小" },
-  { label: "高一", value: "高一" },
-  { label: "高二", value: "高二" },
-  { label: "高三", value: "高三" },
 ];
 /**
  * 新建赴校信息提交
@@ -283,6 +318,7 @@ const addOrEdit = () => {
 const query = reactive({
   school: "" as string | undefined,
   grade: "" as string | undefined,
+  gradeYear: 2025 as number,
   people: "" as string | undefined,
   solutionEnd: undefined,
   times: [] as string[],
@@ -309,8 +345,11 @@ function mapApiItemToRow(item: any): TableItem {
     id: item.id,
     school: item.schoolName || "",
     grade: item.grade || "",
+    gradeYear: item.gradeYear || "",
+    gradeLevel: item.gradeLevel || "",
     people: peopleArr.join("，"),
     times: start,
+    endTime: item.endTime ? dayjs(item.endTime).format("YYYY-MM-DD") : "",
     canOperate: item.canOperate || false, // 是否可以跟进
     feedbackTotals: Number(item.feedbackCount) || 0,
     solveTotals: Number(item.solveFeedbackCount) || 0,
@@ -326,7 +365,7 @@ async function loadList() {
     orderBy: "startTime",
   };
   if (query.school) payload.schoolId = query.school;
-  if (query.grade) payload.grade = query.grade;
+  if (query.grade && query.gradeYear) payload.grade = query.grade + query.gradeYear;
   if (query.people) {
     payload.UserName = query.people;
   }
@@ -401,12 +440,12 @@ function onDelete(row: TableItem) {
  */
 function onDetailOrFollow(row: TableItem, disabled = false) {
   isDetail.value = disabled;
-  isShowEditModal.value = true;
   editModalLoading.value = true;
   getSchoolBusinessDetailApi(row.id)
     .then((res) => {
       if (res.code === 200 && res.data) {
         detailData.value = res.data;
+        isShowEditModal.value = true;
       }
     })
     .finally(() => {
@@ -504,4 +543,12 @@ function downLoadTpl() {
   justify-content: center;
   margin-top: 12px;
 }
+
+:deep(.el-table .warning-row) {
+  --el-table-tr-bg-color: rgb(253, 246, 236);
+}
+
+:deep(.el-table .error-row) {
+  --el-table-tr-bg-color: rgb(255, 227, 227);
+}
 </style>