diff --git a/web/config/config.ts b/web/config/config.ts index b8c7bde..6ad87b9 100644 --- a/web/config/config.ts +++ b/web/config/config.ts @@ -75,6 +75,7 @@ export default defineConfig({ { name: '考试报名', icon: 'dashboard', + hideInMenu: true, path: '/registration', routes: [ { diff --git a/web/src/pages/course/list/index.tsx b/web/src/pages/course/list/index.tsx index b8c48d6..6f3b105 100644 --- a/web/src/pages/course/list/index.tsx +++ b/web/src/pages/course/list/index.tsx @@ -95,7 +95,7 @@ const CardList = () => { onClick={() => { if (last_data) { const info = last_data.chapter_id + ',' + last_data.course_id + ',' + subject_data.subject_id; - window.open('/#/course/detail/' + info) + window.open(location.pathname+'#/course/detail/' + info) } }} @@ -156,7 +156,7 @@ const CardList = () => {
diff --git a/web/src/pages/dashboard/workplace/index.tsx b/web/src/pages/dashboard/workplace/index.tsx index 3606ca5..64570ec 100644 --- a/web/src/pages/dashboard/workplace/index.tsx +++ b/web/src/pages/dashboard/workplace/index.tsx @@ -82,17 +82,17 @@ const examinationColumns = [ render: (_, record, index, action) => { // return record?.status === 0 ? : switch (record.status_type) { - case 0: - return "待报名" + case 0://待报名 + return break; - case 1: - return "报名中" + case 1://报名中 + return //判断 break; - case 2: - return "待考试" + case 2://待考试 + return break; - case 3: - return + case 3://考试中 + return break; case 4: return "考试完成" @@ -100,6 +100,7 @@ const examinationColumns = [ default: break; } + }, }, ]; @@ -253,7 +254,7 @@ const Workplace: FC = () => { //responsive xField="learning_date" yField="learning_minutes" - //seriesField="type" + //seriesField="type" legend={{ position: 'top-center', }} diff --git a/web/src/pages/registration/index.tsx b/web/src/pages/registration/index.tsx index 6abf292..f758655 100644 --- a/web/src/pages/registration/index.tsx +++ b/web/src/pages/registration/index.tsx @@ -1,5 +1,5 @@ import React, { useRef,useState } from 'react'; -import { history,useRequest } from 'umi'; +import {history, useParams, useRequest} from 'umi'; import Base64 from 'base64-js'; import { ProFormInstance, ProFormRadio } from '@ant-design/pro-form'; import ProForm, { @@ -32,6 +32,8 @@ const waitTime = (time: number = 100) => { export default () => { + const params = useParams(); + console.log('params',params) const formRef = useRef(); const [baseInfo, setBaseInfo] = useState({}); const [testInfo, setTestInfo] = useState({}); @@ -123,7 +125,9 @@ export default () => { label="出生年月" fieldProps={{ format: 'YYYY-MM', + }} + rules={[{ required: true, message: '请选择出生年月' }]} /> @@ -219,12 +223,18 @@ export default () => { //actionRef={actionRef} request={async (value) => { const data = await queryExaminationRule({ - examination_id: 2 + examination_id: params.examination_id }); setTestInfo(data.bean); const dom=data.bean.examination_start_time+'-'+data.bean.examination_end_time; + if(data){ + data.bean.sum_score=data.bean.sum_score===null?'--':data.bean.sum_score + data.bean.pass_score=data.bean.pass_score===null?'--':data.bean.pass_score + } + return Promise.resolve({ + success: true, data: { id: data?.bean.id, object:data?.bean.examination_name, @@ -269,7 +279,7 @@ export default () => { district_id:backInfo?.district_id, district_name:backInfo?.district_name, education:baseInfo?.qualifications, - examination_id:2, + examination_id:params.examination_id, gender:baseInfo?.sex, id_code:baseInfo?.idCard, identity_id:backInfo?.identity_id, diff --git a/web/src/pages/registration/success/index.tsx b/web/src/pages/registration/success/index.tsx index f74828b..5a762c2 100644 --- a/web/src/pages/registration/success/index.tsx +++ b/web/src/pages/registration/success/index.tsx @@ -9,7 +9,9 @@ const { Step } = Steps; const extra = ( - + );