Merge branch 'new-1.0' of http://62.234.217.137:3000/Big-Data-Lab/CEES-manage into new-1.0

分支合并
2025-03-06 17:15:49 +08:00 · 2025-03-06 17:14:16 +08:00
4 changed files with 294 additions and 83 deletions
--- a/src/views/cees/localTeacher/CeesLocalTeacher.data.ts
+++ b/src/views/cees/localTeacher/CeesLocalTeacher.data.ts
@ -8,6 +8,11 @@ const filterMajor = (value, row) => {
  return row === value;
 };
 import { ref, onMounted,reactive } from 'vue';
+// 学科过滤方法
+const filterMajor = (value, row) => {
+  console.log(value, row); // 打印过滤值和行数据
+  return row === value;
+};

 const groupOptions=ref()
 // 创建一个简单的事件总线
@ -52,6 +57,15 @@ export const columns: BasicColumn[] = [
    filterMultiple: false, // 是否支持多选过滤
    //value: 用户选择的过滤值（如 1）。
    onFilter: (value, record) => filterMajor(value, record.majorId), // 过滤方法
+    filters: [
+      { text: '语文', value: 1 },
+      { text: '地理', value: 4 },
+      { text: '历史', value: 7 },
+      { text: '政治', value: 8 },
+    ],
+    filterMultiple: false, // 是否支持多选过滤
+    //value: 用户选择的过滤值（如 1）。
+    onFilter: (value, record) => filterMajor(value, record.majorId), // 过滤方法
  },
  {
    title: '所属分组',
@ -93,20 +107,23 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  //{
-  //  label: '用户id',
-  //  field: 'userId',
-  //  component: 'Input',
-  //  dynamicRules: ({ model, schema }) => {
-  //    return [{ required: true, message: '请输入用户id!' }];
-  //  },
-  //},
  {
+    label: '用户id',
+    field: 'userId',
+    component: 'Input',
+    show: false,
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入用户id!' }];
+    //},
+  },
+  {
+    label: '姓名',
    label: '姓名',
    field: 'userName',
    component: 'Input',
    dynamicRules: ({ model, schema }) => {
      return [{ required: true, message: '请输入姓名!' }];
+      return [{ required: true, message: '请输入姓名!' }];
    },
  },
  {
@ -116,6 +133,9 @@ export const formSchema: FormSchema[] = [
    //dynamicRules: ({ model, schema }) => {
    //  return [{ required: true, message: '请输入工号!' }];
    //},
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入工号!' }];
+    //},
  },
  {
    label: '手机号',
@ -157,9 +177,9 @@ export const formSchema: FormSchema[] = [
    componentProps: {
      options: groupOptions, // 动态设置分组选项
    },
-    dynamicRules: ({ model, schema }) => {
-      return [{ required: true, message: '请选择分组!' }];
-    },
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请选择分组!' }];
+    //},
  },
  //{
  //  label: '使用次数',
@ -169,6 +189,14 @@ export const formSchema: FormSchema[] = [
  //    return [{ required: true, message: '请输入使用次数!' }];
  //  },
  //},
+  //{
+  //  label: '使用次数',
+  //  field: 'numberuse',
+  //  component: 'InputNumber',
+  //  dynamicRules: ({ model, schema }) => {
+  //    return [{ required: true, message: '请输入使用次数!' }];
+  //  },
+  //},
  {
    label: '是否第一次阅卷',
    field: 'status',
@ -182,6 +210,9 @@ export const formSchema: FormSchema[] = [
    //dynamicRules: ({ model, schema }) => {
    //  return [{ required: true, message: '请选择是否第一次阅卷！' }];
    //},
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请选择是否第一次阅卷！' }];
+    //},
  },
  // TODO 主键隐藏字段，目前写死为ID
  //{
--- a/src/views/cees/student/Student.data.ts
+++ b/src/views/cees/student/Student.data.ts
@ -99,6 +99,16 @@ export const columns: BasicColumn[] = [
  //  align: 'center',
  //  dataIndex: 'status',
  //},
+  //{
+  //  title: '使用次数',
+  //  align: 'center',
+  //  dataIndex: 'numberuse',
+  //},
+  //{
+  //  title: '状态',
+  //  align: 'center',
+  //  dataIndex: 'status',
+  //},
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@ -111,6 +121,14 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  //{
+  //  label: '用户id',
+  //  field: 'userId',
+  //  component: 'Input',
+  //  dynamicRules: ({ model, schema }) => {
+  //    return [{ required: true, message: '请输入用户id!' }];
+  //  },
+  //},
  //{
  //  label: '用户id',
  //  field: 'userId',
@ -120,11 +138,29 @@ export const formSchema: FormSchema[] = [
  //  },
  //},
  {
+    label: '学生名',
    label: '学生名',
    field: 'userName',
    component: 'Input',
    dynamicRules: ({ model, schema }) => {
      return [{ required: true, message: '请输入学生名!' }];
+      return [{ required: true, message: '请输入学生名!' }];
+    },
+  },
+  {
+    label: '学科',
+    field: 'majorId',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '语文', value: 1 },
+        { label: '地理', value: 4 },
+        { label: '历史', value: 7 },
+        { label: '政治', value: 8 },
+      ],
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [{ required: true, message: '请选择学科!' }];
    },
  },
  {
@ -133,6 +169,7 @@ export const formSchema: FormSchema[] = [
    component: 'Input',
    dynamicRules: ({ model, schema }) => {
      return [{ required: true, message: '请输入学号!' }];
+      return [{ required: true, message: '请输入学号!' }];
    },
  },

@ -190,6 +227,9 @@ export const formSchema: FormSchema[] = [
    //dynamicRules: ({ model, schema }) => {
    //  return [{ required: true, message: '请选择是否第一次阅卷!' }];
    //},
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请选择是否第一次阅卷!' }];
+    //},
  },
  {
    label: '所属分组',
@ -198,9 +238,9 @@ export const formSchema: FormSchema[] = [
    componentProps: {
      options: groupOptions, // 动态设置分组选项
    },
-    dynamicRules: ({ model, schema }) => {
-      return [{ required: true, message: '请选择分组!' }];
-    },
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请选择分组!' }];
+    //},
  },
  //{
  //  label: '使用次数',
@ -224,13 +264,13 @@ export const formSchema: FormSchema[] = [
  //    return [{ required: true, message: '请选择状态!' }];
  //  },
  //},
-  //// TODO 主键隐藏字段，目前写死为ID
-  //{
-  //  label: '',
-  //  field: 'id',
-  //  component: 'Input',
-  //  show: false,
-  //},
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
 ];

 // 高级查询数据
--- a/src/views/cees/waiTeacher/CeesWaiTeacher.data.ts
+++ b/src/views/cees/waiTeacher/CeesWaiTeacher.data.ts
@ -10,6 +10,12 @@ const filterMajor = (value, row) => {
 };
 import { ref, onMounted,reactive } from 'vue';

+// 学科过滤方法
+const filterMajor = (value, row) => {
+  console.log(value, row); // 打印过滤值和行数据
+  return row === value;
+};
+
 const groupOptions=ref()

 // 创建一个简单的事件总线
@ -54,6 +60,15 @@ export const columns: BasicColumn[] = [
    filterMultiple: false, // 是否支持多选过滤
    //value: 用户选择的过滤值（如 1）。
    onFilter: (value, record) => filterMajor(value, record.majorId), // 过滤方法
+    filters: [
+      { text: '语文', value: 1 },
+      { text: '地理', value: 4 },
+      { text: '历史', value: 7 },
+      { text: '政治', value: 8 },
+    ],
+    filterMultiple: false, // 是否支持多选过滤
+    //value: 用户选择的过滤值（如 1）。
+    onFilter: (value, record) => filterMajor(value, record.majorId), // 过滤方法
  },
  {
    title: '手机号',
@ -87,6 +102,7 @@ export const columns: BasicColumn[] = [
    align: 'center',
    dataIndex: 'dormitory',
  },
+  
  //{
  //  title: '用户专业id',
  //  align: 'center',
@ -102,6 +118,7 @@ export const columns: BasicColumn[] = [
  //  align: 'center',
  //  dataIndex: 'mealCard',
  //},
+  
  //{
  //  title: '工作名称',
  //  align: 'center',
@ -155,6 +172,12 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+  //{
+  //  label: '学科',
+  //  field: 'majorId',
+  //  component: 'JRangeNumber',
+  //  //colProps: {span: 6},
+  //},
  //{
  //  label: '学科',
  //  field: 'majorId',
@ -198,6 +221,9 @@ export const formSchema: FormSchema[] = [
    label: '年龄',
    field: 'age',
    component: 'InputNumber',
+    label: '年龄',
+    field: 'age',
+    component: 'InputNumber',
  },
  {
    label: '性别',
@ -211,6 +237,9 @@ export const formSchema: FormSchema[] = [
    },
  },
  {
+    label: '学科',
+    field: 'majorId',
+    component: 'Select',
    label: '学科',
    field: 'majorId',
    component: 'Select',
@ -220,6 +249,10 @@ export const formSchema: FormSchema[] = [
        { label: '地理', value: 4 },
        { label: '历史', value: 7 },
        { label: '政治', value: 8 },
+        { label: '语文', value: 1 },
+        { label: '地理', value: 4 },
+        { label: '历史', value: 7 },
+        { label: '政治', value: 8 },
      ],
    },
    dynamicRules: ({ model, schema }) => {
@ -235,6 +268,25 @@ export const formSchema: FormSchema[] = [
  //  },
  //},

+  {
+    label: '手机号',
+    field: 'phone',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入手机号!' }];
+    //},
+      return [{ required: true, message: '请选择学科!' }];
+    },
+  },
+  //{
+  //  label: '用户专业id',
+  //  field: 'userMajorId',
+  //  component: 'Input',
+  //  dynamicRules: ({ model, schema }) => {
+  //    return [{ required: true, message: '请输入用户专业id!' }];
+  //  },
+  //},
+
  {
    label: '手机号',
    field: 'phone',
@ -302,8 +354,77 @@ export const formSchema: FormSchema[] = [
  {
    label: '车牌号',
    field: 'carNumber',
+    label: '职称',
+    field: 'jobTitle',
    component: 'Input',
    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入职称!' }];
+    //},
+  },
+  {
+    label: '职务',
+    field: 'office',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入办公位!' }];
+    //},
+  },
+  {
+    label: '单位名称',
+    field: 'workName',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入单位名称!' }];
+    //},
+  },
+  {
+    label: '单位电话',
+    field: 'workPhone',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入单位电话!' }];
+    //},
+  },
+  {
+    label: '银行卡号',
+    field: 'pyCard',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入银行卡号!' }];
+    //},
+  },
+  {
+    label: '开户地区',
+    field: 'bankAddress',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入开户地区（北京，哈尔滨）' }];
+    //},
+  },
+  {
+    label: '开户行',
+    field: 'bankName',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入开户行!' }];
+    //},
+  },
+  {
+    label: '车牌号',
+    field: 'carNumber',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入车牌号!' }];
+    //},
+  },
+  {
+    label: '饭卡',
+    field: 'mealCard',
+    component: 'Input',
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入饭卡!' }];
+    //},
+    //dynamicRules: ({ model, schema }) => {
    //  return [{ required: true, message: '请输入车牌号!' }];
    //},
  },
@ -328,18 +449,22 @@ export const formSchema: FormSchema[] = [
    //dynamicRules: ({ model, schema }) => {
    //  return [{ required: true, message: '请输入是否住宿!' }];
    //},
+    //dynamicRules: ({ model, schema }) => {
+    //  return [{ required: true, message: '请输入是否住宿!' }];
+    //},
  },
  {
    label: '所属分组',
    field: 'groupId',
    component: 'Select',
    componentProps: {
-      options: groupOptions, // 动态设置分组选项
+     options: groupOptions, // 动态设置分组选项
    },
    dynamicRules: ({ model, schema }) => {
-      return [{ required: true, message: '请选择分组!' }];
+     return [{ required: true, message: '请选择分组!' }];
    },
-  },
+     },
+    
  {
    label: '车辆是否入校',
    field: 'carStatus',
@ -350,11 +475,10 @@ export const formSchema: FormSchema[] = [
        { label: '否', value: 1 },
      ],
    },
-  }
    //dynamicRules: ({ model, schema }) => {
    //  return [{ required: true, message: '请输入车辆是否入校!' }];
    //},
-
+  },
  //{
  //  label: '住宿信息',
  //  field: 'dormitory',
@ -395,12 +519,12 @@ export const formSchema: FormSchema[] = [
  //  },
  //},
  //// TODO 主键隐藏字段，目前写死为ID
-  //{
-  //  label: '',
-  //  field: 'id',
-  //  component: 'Input',
-  //  show: false,
-  //},
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
 ];

 // 高级查询数据
--- a/src/views/cees/waiTeacher/CeesWaiTeacherList.vue
+++ b/src/views/cees/waiTeacher/CeesWaiTeacherList.vue
@ -3,67 +3,80 @@
    <!--引用表格-->
    <BasicTable @register="registerTable" :rowSelection="rowSelection" ref="tableRef" :expandedRowKeys="expandedKeys"
      rowKey="id" :expandedRowRender="renderExpandedRow" @expand="handleExpand">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined" />
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button>批量操作
-            <Icon icon="mdi:chevron-down" />
-          </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-      </template>
-      <!--字段回显插槽-->
-      <template #bodyCell="{ column, record, index, text }">
-        <span v-if="column.dataIndex === 'sex'">
-          <a-tag v-if="record.sex === 0" color="green">男</a-tag>
-          <a-tag v-else-if="record.sex !== 0" color="red">女</a-tag>
-        </span>
-        <span v-if="column.dataIndex === 'status'">
-          <a-tag v-if="record.status === 0" color="green">已报到</a-tag>
-          <a-tag v-else-if="record.status !== 0" color="red">未报到</a-tag>
-        </span>
-        <span v-if="column.dataIndex === 'carStatus'">
-          <a-tag v-if="record.carStatus === 0" color="green">是</a-tag>
-          <a-tag v-else-if="record.carStatus !== 0" color="red">否</a-tag>
-        </span>
-        <span v-if="column.dataIndex === 'dormitoryStatus'">
-          <a-tag v-if="record.dormitoryStatus === 0" color="green">是</a-tag>
-          <a-tag v-else-if="record.dormitoryStatus !== 0" color="red">否</a-tag>
-        </span>
-        <span v-if="column.dataIndex === 'majorId'">
-          <span>{{ record.majorIdDescription }}</span>
-        </span>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <CeesWaiTeacherModal @register="registerModal" @success="handleSuccess" />
+      <BasicTable @register="registerTable" :rowSelection="rowSelection" ref="tableRef" :expandedRowKeys="expandedKeys"
+        rowKey="id" :expandedRowRender="renderExpandedRow" @expand="handleExpand">
+        <!--插槽:table标题-->
+        <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+            <template #overlay>
+              <a-menu>
+                <a-menu-item key="1" @click="batchHandleDelete">
+                  <Icon icon="ant-design:delete-outlined" />
+                  删除
+                </a-menu-item>
+              </a-menu>
+            </template>
+            <a-button>批量操作
+              <Icon icon="mdi:chevron-down" />
+            </a-button>
+          </a-dropdown>
+          <!-- 高级查询 -->
+          <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+        </template>
+        <!--操作栏-->
+        <template #action="{ record }">
+          <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        </template>
+        <!--字段回显插槽-->
+        <template #bodyCell="{ column, record, index, text }">
+          <span v-if="column.dataIndex === 'sex'">
+            <a-tag v-if="record.sex === 0" color="green">男</a-tag>
+            <a-tag v-else-if="record.sex !== 0" color="red">女</a-tag>
+            <a-tag v-if="record.sex === 0" color="green">男</a-tag>
+            <a-tag v-else-if="record.sex !== 0" color="red">女</a-tag>
+          </span>
+          <span v-if="column.dataIndex === 'status'">
+            <a-tag v-if="record.status === 0" color="green">已报到</a-tag>
+            <a-tag v-else-if="record.status !== 0" color="red">未报到</a-tag>
+            <a-tag v-if="record.status === 0" color="green">已报到</a-tag>
+            <a-tag v-else-if="record.status !== 0" color="red">未报到</a-tag>
+          </span>
+          <span v-if="column.dataIndex === 'carStatus'">
+            <a-tag v-if="record.carStatus === 0" color="green">是</a-tag>
+            <a-tag v-else-if="record.carStatus !== 0" color="red">否</a-tag>
+          </span>
+          <span v-if="column.dataIndex === 'dormitoryStatus'">
+            <a-tag v-if="record.dormitoryStatus === 0" color="green">是</a-tag>
+            <a-tag v-else-if="record.dormitoryStatus !== 0" color="red">否</a-tag>
+          </span>
+          <span v-if="column.dataIndex === 'majorId'">
+            <span>{{ record.majorIdDescription }}</span>
+          </span>
+          <span v-if="column.dataIndex === 'majorId'">
+            <span>{{ record.majorIdDescription }}</span>
+          </span>
+        </template>
+      </BasicTable>
+      <!-- 表单区域 -->
+      <CeesWaiTeacherModal @register="registerModal" @success="handleSuccess" />
  </div>
 </template>

 <script lang="tsx" name="cees-ceesWaiTeacher" setup>
 import { ref, reactive, computed, unref, onMounted } from 'vue';
+<script lang="tsx" name = "cees-ceesWaiTeacher" setup >
+import { ref, reactive, computed, unref, onMounted } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useModal } from '/@/components/Modal';
 import { useListPage } from '/@/hooks/system/useListPage';
 import CeesWaiTeacherModal from './components/CeesWaiTeacherModal.vue';
 import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './CeesWaiTeacher.data';
 import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup } from './CeesWaiTeacher.api';
+import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './CeesWaiTeacher.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup } from './CeesWaiTeacher.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
 import { useUserStore } from '/@/store/modules/user';
 const queryParam = reactive<any>({});
@ -104,7 +117,6 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
    success: handleSuccess,
  },
 });
-
 // 指定默认展开的行（根据 rowKey 属性传入行的 key 值）
 const expandedKeys = ref<string[]>(['1']); // 默认展开第一行
 // 定义展开行内容的渲染函数
@ -129,8 +141,12 @@ const handleExpand = (expanded: boolean, record: Record<string, any>) => {
    if (!expandedKeys.value.includes(record.id)) {
      expandedKeys.value.push(record.id);
    }
+    if (!expandedKeys.value.includes(record.id)) {
+      expandedKeys.value.push(record.id);
+    }
  } else {
    expandedKeys.value = expandedKeys.value.filter((key) => key !== record.id);
+    expandedKeys.value = expandedKeys.value.filter((key) => key !== record.id);
  }
 };
 const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
Author	SHA1	Message	Date
Xubx	6465aefc6f	Merge branch 'new-1.0' of http://62.234.217.137:3000/Big-Data-Lab/CEES-manage into new-1.0	2025-03-06 17:15:49 +08:00
Xubx	ecbfbd5cad	分支合并	2025-03-06 17:14:16 +08:00