From 915a98f2eaca6531a88b75e99de18773d2994819 Mon Sep 17 00:00:00 2001 From: xialiang <1818147@qq.com> Date: Thu, 27 Jan 2022 16:16:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/pages/examination/option/index.tsx | 106 ++++++++++++++---- admin/src/pages/examination/service.ts | 18 ++- .../examinationrules/attestation/index.tsx | 4 +- 3 files changed, 102 insertions(+), 26 deletions(-) diff --git a/admin/src/pages/examination/option/index.tsx b/admin/src/pages/examination/option/index.tsx index 3d0f1ef..4350c66 100644 --- a/admin/src/pages/examination/option/index.tsx +++ b/admin/src/pages/examination/option/index.tsx @@ -11,9 +11,9 @@ import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions'; import ProDescriptions from '@ant-design/pro-descriptions'; import type { FormValueType } from './components/UpdateForm'; import UpdateForm from './components/UpdateForm'; -import { queryTagList, saveExamination, removeExamination, queryExaminationList } from '../service'; +import { querySubjectList, saveExamination, removeExamination, queryExaminationList } from '../service'; import type { TableListItem, TableListPagination } from './data'; -import { DataItem } from '@antv/data-set/lib/transform/tag-cloud'; +import type { DataItem } from '@antv/data-set/lib/transform/tag-cloud'; import RegistrationList from '../registration'; /** @@ -89,7 +89,7 @@ const ExaminationList: React.FC = () => { const [detailModalVisible, handleDetailModalVisible] = useState(false); const [updateModalVisible, handleUpdateModalVisible] = useState(false); //const [registrationModalVisible, handleRegistrationModalVisible] = useState(false); - + const actionRef = useRef(); const [currentRow, setCurrentRow] = useState(); const [selectedRowsState, setSelectedRows] = useState([]); @@ -99,7 +99,7 @@ const ExaminationList: React.FC = () => { { title: '序号', key: 'index', - valueType: 'indexBorder', + valueType: 'indexBorder', width: 48, }, { @@ -108,37 +108,63 @@ const ExaminationList: React.FC = () => { valueType: 'text', hideInTable: false, hideInForm: false, - hideInSearch: true, + hideInSearch: false, }, { title: '创建日期', dataIndex: 'create_time', - valueType: 'text', + valueType: 'text', sorter: false, hideInTable: false, - hideInForm: false, + hideInForm: true, hideInSearch: true, renderText: (val: string) => `${val}`, }, { - title: '报名开始日期', + title: '报名日期', dataIndex: 'apply_start_time', - valueType: 'text', + valueType: 'datetimeRange', sorter: false, hideInTable: false, hideInForm: false, hideInSearch: true, - renderText: (val: string) => `${val}`, + render: (dom, entity) => { + return entity.apply_start_time + " - " + entity.apply_end_time; + }, }, { - title: '考试开始时间', - valueType: 'text', + title: '考试时间', + valueType: 'datetimeRange', dataIndex: 'examination_start_time', sorter: false, hideInTable: false, hideInForm: false, hideInSearch: true, - renderText: (val: string) => `${val}`, + render: (dom, entity) => { + return entity.examination_start_time + " - " + entity.examination_end_time; + }, + }, + + { + title: '关联1主题', + dataIndex: 'subject_id', + valueType: 'text', + hideInTable: true, + hideInForm: false, + hideInSearch: true, + request: async () => { + const { data: Items } = await querySubjectList({}); + // console.log(Items, ')))'); + + const sinfo = [] + for (let i = 0; i < Items.list.length; i++) { + // console.log(Items.list[i], ">>>") + sinfo.push({ label: Items.list[i].subject_name, value: Items.list[i].subject_id }) + } + console.log(sinfo, 'sinfo'); + + return sinfo; + }, }, { title: '试卷数量', @@ -227,12 +253,26 @@ const ExaminationList: React.FC = () => { , ]} request={async (value) => { - const _data = await queryExaminationList(value); + const { create_time } = value; + if (create_time) { + value.start_time = create_time[0] + value.end_time = create_time[1] + } + + + const _data = await queryExaminationList( + { + ...value, + page_number: value.current, + page_size: value.pageSize + } + ); + console.log(_data, 'form _data') return { - current: _data?.page_number, - data: _data?.data?.list, - pageSize: _data?.page_size, - total: _data?.total_row || 0, + current: _data?.pageNumber, + data: _data?.table_List, + pageSize: _data?.pageSize, + total: _data?.totalRow || 0, }; }} // dataSource={list} @@ -277,16 +317,36 @@ const ExaminationList: React.FC = () => { }} footer={null} centered - >{ console.log('currentRow',currentRow)} + >{console.log('currentRow', currentRow)} {currentRow?.name && ( column={2} /* title={currentRow?.name} */ dataSource={currentRow} - /* - request={async () => ({ - data: currentRow || {}, - })}*/ + request={async (value) => { + console.log(value, 'form value') + const { create_time } = value; + if (create_time) { + value.start_time = create_time[0] + value.end_time = create_time[1] + } + const _data = await getExaminationList( + { + ...value, + rules_type: 0, + + page_number: value.current, + page_size: value.pageSize + } + ); + + return { + current: _data?.pageNumber, + data: _data?.table_List, + pageSize: _data?.pageSize, + total: _data?.totalRow || 0, + }; + }} params={{ id: currentRow?.examination_id, }} diff --git a/admin/src/pages/examination/service.ts b/admin/src/pages/examination/service.ts index b5f0a6e..aa34b5d 100644 --- a/admin/src/pages/examination/service.ts +++ b/admin/src/pages/examination/service.ts @@ -19,7 +19,7 @@ export async function queryExaminationList( /** 页面的容量 */ page_size?: number; success?: boolean; - }>('/api/zygh/training/examination/getExaminationList', { + }>('/dsideal_yy/zygh/training/examination/getExaminationList', { method: 'GET', params: { ...params, @@ -28,6 +28,22 @@ export async function queryExaminationList( }); } + +/** + * 获取主题列表 + * http://10.10.14.252:8080/workspace/myWorkspace.do?projectId=382#6426 + * @param params + * @returns + */ +export async function querySubjectList(params: { + page_size: number; + //count: number; +}): Promise<{ data: { list: CardListItemDataType[] } }> { + return request('/dsideal_yy/ypt/careerTraining/subject/listSubject', { + params, + }); +} + /** 获取证书列表 GET /dsideal_yy/zygh/training/examination/getExaminationList */ export async function queryCertificateList( params: { diff --git a/admin/src/pages/examinationrules/attestation/index.tsx b/admin/src/pages/examinationrules/attestation/index.tsx index c6841a6..67a96b6 100644 --- a/admin/src/pages/examinationrules/attestation/index.tsx +++ b/admin/src/pages/examinationrules/attestation/index.tsx @@ -110,8 +110,8 @@ const ExaminationRules: React.FC = () => { width: 48, }, { - title: '考试名称', - dataIndex: 'subject_name', + title: '规则名称', + dataIndex: 'rules_name', valueType: 'text', hideInTable: false, hideInForm: false,