测试bug修改

master
wangxi 3 years ago
parent 65d29178d8
commit 32559f2063

@ -82,7 +82,7 @@ export default defineConfig({
{ {
name: '资质考试答题', name: '资质考试答题',
icon: 'dashboard', 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', component: './dashboard/qualification/examAnswer',
hideInMenu: true, hideInMenu: true,
}, },

@ -86,6 +86,7 @@ const CardList = () => {
const [timeData, setTimeData] = useState(0); const [timeData, setTimeData] = useState(0);
useEffect(() => { useEffect(() => {
let secondValue = params.time; // 秒 截至时间 - 服务器当前时间 let secondValue = params.time; // 秒 截至时间 - 服务器当前时间
setTimeData(secondValue) setTimeData(secondValue)
// console.log(secondValue); // console.log(secondValue);
@ -204,11 +205,13 @@ const CardList = () => {
formatResult: (result) => { formatResult: (result) => {
return result; return result;
}, },
onSuccess: (result, params) => { onSuccess: (result) => {
if (result.success) { if (result.success) {
const time = new Date(timeData).getTime(); const time = new Date(timeData).getTime();
const timeDiff = params.duration / 1000 - time; // const timeDiff = params.duration / 1000 - time;
// console.log('timeDiff',timeDiff)
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}`); 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 ( return (
<PageContainer content={content} extraContent={false}> <PageContainer content={content} extraContent={false}>
<Row> <Row>
<Col span={6} style={{ paddingRight: 24 }}> <Col span={6} style={{ paddingRight: 24 }}>
<ProCard <ProCard
@ -361,6 +365,7 @@ const CardList = () => {
<Form <Form
ref={formRef} name="control-ref" ref={formRef} name="control-ref"
> >
{/*{console.log('questionNow',questionNow)}*/}
<Form.Item name="note" label="Note" rules={[{ required: true }]}> <Form.Item name="note" label="Note" rules={[{ required: true }]}>
{questionNow.question_type === 0 ? {questionNow.question_type === 0 ?
@ -369,7 +374,7 @@ const CardList = () => {
<Radio.Group> <Radio.Group>
<Space direction="vertical">{questionNow?.answers?.map((item, index) => { <Space direction="vertical">{questionNow?.answers?.map((item, index) => {
s
return <Radio key={item.id} return <Radio key={item.id}
onChange={() => { onChange={() => {
const qArr = [] const qArr = []

@ -50,15 +50,16 @@ const Qualification = () => {
} }
}); });
const getTime=(time)=>{ // const getTime=(time)=>{
const current_date=new Date(time.current_date.replace(/-/g, "/")) // const current_date=new Date(time.current_date.replace(/-/g, "/"))
const start_date=new Date(rule.examination_start_time.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 end_date=new Date(rule.examination_end_time.replace(/-/g, "/"));
const duration=end_date.getTime()-start_date.getTime(); // const duration=end_date.getTime()-start_date.getTime();
const dateDiff=end_date.getTime()-current_date.getTime(); // const dateDiff=end_date.getTime()-current_date.getTime();
const date=dateDiff/1000; // const date=dateDiff/1000;
history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}/${date}/${duration}`) // const time=rule.examination_time*60;
} // history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}/${time}`)
// }
return ( return (
<div className="qualification" style={{height:window.innerHeight-200,background:'#fff',width:'100%',padding:20}}> <div className="qualification" style={{height:window.innerHeight-200,background:'#fff',width:'100%',padding:20}}>
@ -90,9 +91,10 @@ const Qualification = () => {
if(paperId===''){ if(paperId===''){
message.warning('您已参加过考试,不能开始考试!'); message.warning('您已参加过考试,不能开始考试!');
}else { }else {
const time = await getCurrentDate(); // const time = await getCurrentDate();
getTime(time); // getTime(time);
// history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}`) const time=rule.examination_time*60;
history.push(`/dashboard/qualification/examAnswer/${params.examination_id}/${examinationInfo.examination_name}/${time}`)
} }
} }
} }

Loading…
Cancel
Save