From 3fa57485f41453aad419f1306f1623a493211cb3 Mon Sep 17 00:00:00 2001 From: wangxi <123456> Date: Mon, 7 Mar 2022 14:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/config/config.ts | 2 +- .../dashboard/qualification/examAnser.ts | 9 ++++ .../dashboard/qualification/examAnswer.tsx | 46 +++++++++++++------ .../pages/dashboard/qualification/result.tsx | 31 ++++++++++++- .../pages/dashboard/qualification/service.ts | 10 ++++ web/src/pages/registration/success/index.tsx | 2 +- 6 files changed, 84 insertions(+), 16 deletions(-) diff --git a/web/config/config.ts b/web/config/config.ts index d7d8378..bcbe33b 100644 --- a/web/config/config.ts +++ b/web/config/config.ts @@ -120,7 +120,7 @@ export default defineConfig({ path: '/course', routes: [ { - name: '主题', + name: '课程学习', icon: 'smile', path: '/course/subject', component: './course/subject', diff --git a/web/src/pages/dashboard/qualification/examAnser.ts b/web/src/pages/dashboard/qualification/examAnser.ts index 6aee046..e2d1b08 100644 --- a/web/src/pages/dashboard/qualification/examAnser.ts +++ b/web/src/pages/dashboard/qualification/examAnser.ts @@ -124,3 +124,12 @@ export async function getPersonPaperId(params: { params, }); } + +//获取准考证号 +export async function getExaminationPersonApplyInfo(params: { + +}): Promise<{ data: { list: CardListItemDataType[] } }> { + return request('/dsideal_yy/zygh/training/person/getExaminationPersonApplyInfo', { + params, + }); +} diff --git a/web/src/pages/dashboard/qualification/examAnswer.tsx b/web/src/pages/dashboard/qualification/examAnswer.tsx index b7928ea..27324dd 100644 --- a/web/src/pages/dashboard/qualification/examAnswer.tsx +++ b/web/src/pages/dashboard/qualification/examAnswer.tsx @@ -5,7 +5,7 @@ import { PageContainer } from '@ant-design/pro-layout'; import { useParams, useRequest, history } from 'umi'; import { useEffect, useRef, useState } from 'react'; const { Text, Link } = Typography; -import { getRulesPaper, getPaperQuestionList, finishExamination, getPersonPaperId } from './examAnser'; +import { getRulesPaper, getPaperQuestionList, finishExamination, getPersonPaperId,getExaminationPersonApplyInfo } from './examAnser'; import type { CardListItemDataType } from '../data'; import styles from './style.less'; import cookie from 'react-cookies'; @@ -75,7 +75,7 @@ const CardList = () => { // 解析可见 const [parsingShow, setParsingShow] = useState(false) - + const [testInfo, setTestInfo] = useState({}) const [lastBtnShow, setLastBtnShow] = useState(true) const [nextBtnShow, setNextBtnShow] = useState(false) @@ -84,7 +84,7 @@ const CardList = () => { const [questionNum, setQuestioNum] = useState(0) const [timeData, setTimeData] = useState(0); - + const [num,setNum]=useState(0); useEffect(() => { let secondValue = params.time; // 秒 截至时间 - 服务器当前时间 @@ -120,6 +120,24 @@ const CardList = () => { } }); + const personInfo = useRequest(() => { + return getExaminationPersonApplyInfo({ + examination_id: params.examination_id, + person_id: cookie.load('person_id') + }); + }, + { + formatResult: (result) => { + return result; + }, + onSuccess: (result) => { + if (result.success) { + console.log('result准考证',result); + setTestInfo(result.bean); + } + } + }); + const { run } = useRequest(getPaperQuestionList, { refreshDeps: [rulesPaperInfo], @@ -137,7 +155,7 @@ const CardList = () => { const question_type_count = [ { count: 0, question_type: 0, type_name: '单选' }, { count: 0, question_type: 1, type_name: '多选' }, - { count: 0, question_type: 2, type_name: '填空' }, + { count: 0, question_type: 2, type_name: '判断' }, ]; if (result.question_list.length !== 0) { setRuleId(result.question_list[0].rules_id) @@ -211,7 +229,7 @@ const CardList = () => { // const timeDiff = params.duration / 1000 - time; const timeDiff=params.time-time; - console.log('timeDiff',timeDiff) + // console.log('timeDiff',timeDiff) history.push(`/dashboard/qualification/result/${result.data.pass_score}/${result.data.score}/${result.data.sum_score}/${params.examination_id}/${params.examination_name}/${timeDiff}`); } } @@ -221,7 +239,6 @@ const CardList = () => { - useEffect(() => { // 已选择题目回显 formRef?.current?.setFieldsValue({ note: questionNow.answerId }); @@ -315,6 +332,7 @@ const CardList = () => { bordered dataSource={e.children} renderItem={(item, index) => { + setNum(index+1); // console.log(item, 'list') return { - {questionNow?.question_stem} + {num}. {questionNow?.question_stem} + {/* {console.log(questionNow.answerId, 'answerId', questionNow.answerId)} */} @@ -366,15 +385,12 @@ const CardList = () => { ref={formRef} name="control-ref" > {/*{console.log('questionNow',questionNow)}*/} - + {questionNow.question_type === 0 ? - ( - {questionNow?.answers?.map((item, index) => { -s return { const qArr = [] @@ -492,6 +508,10 @@ s
+ 考生姓名： + {testInfo?.person_name} + 准考证号： + {testInfo?.admission_number} 剩余时间 {formatSeconds(timeData)} diff --git a/web/src/pages/dashboard/qualification/result.tsx b/web/src/pages/dashboard/qualification/result.tsx index a5bae19..c909913 100644 --- a/web/src/pages/dashboard/qualification/result.tsx +++ b/web/src/pages/dashboard/qualification/result.tsx @@ -7,7 +7,7 @@ import { PageContainer } from '@ant-design/pro-layout'; import moment from 'moment'; import EditableLinkGroup from './components/EditableLinkGroup'; import styles from './style.less'; -import {getExaminationById,getPersonPaperId } from './service'; +import {getExaminationPersonApplyInfo,getPersonPaperId } from './service'; import cookie from 'react-cookies'; import OfflineData from './components/OfflineData'; @@ -62,6 +62,7 @@ const Result = () => { const [rule, setRule] = useState({}); const [buttonText, setButtonText] = useState('返回'); const [passInfo, setPassInfo] = useState(false); + const [testInfo, setTestInfo] = useState({}) const params = useParams(); //获取考试详情 // const a=2; @@ -81,6 +82,24 @@ const Result = () => { getPass() }, []); + const personInfo = useRequest(() => { + return getExaminationPersonApplyInfo({ + examination_id: params.examination_id, + person_id: cookie.load('person_id') + }); + }, + { + formatResult: (result) => { + return result; + }, + onSuccess: (result) => { + if (result.success) { + console.log('result准考证',result); + setTestInfo(result.bean); + } + } + }); + const { data: chapterCourse, run } = useRequest(() => { return getPersonPaperId({ examination_id:params.examination_id, @@ -103,6 +122,16 @@ const Result = () => {
{history.push('/dashboard/workplace')}}>首页 / 资质考试 / {params.examination_name}
{params.examination_name}
+
+
+ 考生姓名： + {testInfo?.person_name} +
+
+ 准考证号： + {testInfo?.admission_number} +
+
考试用时：
diff --git a/web/src/pages/dashboard/qualification/service.ts b/web/src/pages/dashboard/qualification/service.ts index ce6f212..93a4e3b 100644 --- a/web/src/pages/dashboard/qualification/service.ts +++ b/web/src/pages/dashboard/qualification/service.ts @@ -35,6 +35,16 @@ export async function getCurrentDate(params: { }); } +//获取准考证号 +export async function getExaminationPersonApplyInfo(params: { + +}): Promise<{ data: { list: CardListItemDataType[] } }> { + return request('/dsideal_yy/zygh/training/person/getExaminationPersonApplyInfo', { + params, + }); +} + + diff --git a/web/src/pages/registration/success/index.tsx b/web/src/pages/registration/success/index.tsx index 5a762c2..3fb0a80 100644 --- a/web/src/pages/registration/success/index.tsx +++ b/web/src/pages/registration/success/index.tsx @@ -10,7 +10,7 @@ const { Step } = Steps; const extra = ( );