diff --git a/web/config/config.ts b/web/config/config.ts index ebd1a25..d7d8378 100644 --- a/web/config/config.ts +++ b/web/config/config.ts @@ -82,7 +82,7 @@ export default defineConfig({ { name: '资质考试答题', icon: 'dashboard', - path: '/dashboard/qualification/examAnswer/:examination_id/:examination_name/:time/:duration', + path: '/dashboard/qualification/examAnswer/:examination_id/:examination_name/:time', component: './dashboard/qualification/examAnswer', hideInMenu: true, }, diff --git a/web/src/pages/dashboard/qualification/examAnswer.tsx b/web/src/pages/dashboard/qualification/examAnswer.tsx index 256d7d5..b7928ea 100644 --- a/web/src/pages/dashboard/qualification/examAnswer.tsx +++ b/web/src/pages/dashboard/qualification/examAnswer.tsx @@ -86,6 +86,7 @@ const CardList = () => { const [timeData, setTimeData] = useState(0); useEffect(() => { + let secondValue = params.time; // 秒 截至时间 - 服务器当前时间 setTimeData(secondValue) // console.log(secondValue); @@ -204,11 +205,13 @@ const CardList = () => { formatResult: (result) => { return result; }, - onSuccess: (result, params) => { + onSuccess: (result) => { if (result.success) { const time = new Date(timeData).getTime(); - const timeDiff = params.duration / 1000 - time; - // console.log('timeDiff',timeDiff) + // const timeDiff = params.duration / 1000 - time; + + const timeDiff=params.time-time; + 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}`); } } @@ -290,6 +293,7 @@ const CardList = () => { } return ( + {
+ {/*{console.log('questionNow',questionNow)}*/} {questionNow.question_type === 0 ? @@ -369,7 +374,7 @@ const CardList = () => { {questionNow?.answers?.map((item, index) => { - +s return { const qArr = [] diff --git a/web/src/pages/dashboard/qualification/index.tsx b/web/src/pages/dashboard/qualification/index.tsx index cacf023..0ed96e5 100644 --- a/web/src/pages/dashboard/qualification/index.tsx +++ b/web/src/pages/dashboard/qualification/index.tsx @@ -50,15 +50,16 @@ const Qualification = () => { } }); - const getTime=(time)=>{ - const current_date=new Date(time.current_date.replace(/-/g, "/")) - const start_date=new Date(rule.examination_start_time.replace(/-/g, "/")); - const end_date=new Date(rule.examination_end_time.replace(/-/g, "/")); - const duration=end_date.getTime()-start_date.getTime(); - const dateDiff=end_date.getTime()-current_date.getTime(); - const date=dateDiff/1000; - history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}/${date}/${duration}`) - } + // const getTime=(time)=>{ + // const current_date=new Date(time.current_date.replace(/-/g, "/")) + // const start_date=new Date(rule.examination_start_time.replace(/-/g, "/")); + // const end_date=new Date(rule.examination_end_time.replace(/-/g, "/")); + // const duration=end_date.getTime()-start_date.getTime(); + // const dateDiff=end_date.getTime()-current_date.getTime(); + // const date=dateDiff/1000; + // const time=rule.examination_time*60; + // history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}/${time}`) + // } return (
@@ -90,9 +91,10 @@ const Qualification = () => { if(paperId===''){ message.warning('您已参加过考试,不能开始考试!'); }else { - const time = await getCurrentDate(); - getTime(time); - // history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}`) + // const time = await getCurrentDate(); + // getTime(time); + const time=rule.examination_time*60; + history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}/${time}`) } } }