web
/
syzx
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug

Browse Source
master
xialiang 3 years ago
parent 7b66d0c2ad
commit a808f0a2d3
8 changed files with 150 additions and 153 deletions
Show Stats Download Patch File Download Diff File

7
admin/src/pages/dashboard/analysis/components/CourseRow.tsx
Unescape View File

@ -44,6 +44,7 @@ const TrainingRow = () => {
xAxis={{ xAxis={{
visible: true, visible: true,
title: { title: {
text: '课程名称',
visible: false, visible: false,
}, },
}} }}
@ -62,11 +63,7 @@ const TrainingRow = () => {
fontSize: 14, fontSize: 14,
}, },
}}*/ }}*/
meta={{
y: {
alias: '次',
},
}}
/> />
</div> </div>
</ChartCard> </ChartCard>

9
admin/src/pages/dashboard/analysis/components/IntroduceRow.tsx
Unescape View File

@ -65,27 +65,24 @@ const IntroduceRow = () => {
xAxis={{ xAxis={{
visible: true, visible: true,
title: { title: {
text: '主题名称',
visible: false, visible: false,
}, },
}} }}
yAxis={{ yAxis={{
visible: true, visible: true,
title: { title: {
text: '数量',
visible: false, visible: false,
}, },
}} }}
title={{ title={{
visible: false, visible: false,
text: '课程浏览量',
style: { style: {
fontSize: 14, fontSize: 14,
}, },
}} }}
meta={{
y: {
alias: '培训数',
},
}}
/> />
</ChartCard> </ChartCard>
</Col> </Col>

3
admin/src/pages/examination/certificate/index.tsx
Unescape View File

@ -101,7 +101,7 @@ const CourseList: React.FC = () => {
width: 48, width: 48,
}, },
{ {
title: '证件名称', title: '考试名称',
dataIndex: 'examination_name', dataIndex: 'examination_name',
valueType: 'text', valueType: 'text',
hideInTable: false, hideInTable: false,
@ -221,6 +221,7 @@ const CourseList: React.FC = () => {
}, },
]; ];
return ( return (
<PageContainer> <PageContainer>
<ProTable<TableListItem, TableListPagination> <ProTable<TableListItem, TableListPagination>

4
admin/src/pages/examinationrules/normal/step/index.tsx
Unescape View File

@ -525,11 +525,7 @@ export default () => {
console.log('v::::', values.name); console.log('v::::', values.name);
const rows = selectorRef?.current?.getSelectedRows() const rows = selectorRef?.current?.getSelectedRows()
console.log('rows::::', rows); console.log('rows::::', rows);
<<<<<<< HEAD
const { code, data: paper, msg } = await handleAppend(Number(params?.id), rows)
=======
const { code, data: paper, msg } = await handleAppend(Number(params?.id || rulesId), rows) const { code, data: paper, msg } = await handleAppend(Number(params?.id || rulesId), rows)
>>>>>>> 49ed2a82efcf921baec6deb67be90df4ffd3b34a
console.log('paper', paper) console.log('paper', paper)
setUuidPaper(paper?.paper_uuid) setUuidPaper(paper?.paper_uuid)
console.log('paper_uuid', paper?.paper_uuid) console.log('paper_uuid', paper?.paper_uuid)

12
admin/src/pages/history/analysis/components/TrainCard.tsx
Unescape View File

@ -54,13 +54,23 @@ const SalesCard = () => {
geometry: 'column', geometry: 'column',
}, },
{ {
geometry: 'line', geometry: 'line',
lineStyle: { lineStyle: {
lineWidth: 2, lineWidth: 2,
}, },
}, },
], ],
meta: {
city: {
alias: '类别',
},
count: {
alias: '资质证书人数',
},
credential_rate: {
alias: '证书比例',
},
}
}; };
return (<Card bordered={false} bodyStyle={{ padding: 0, marginBottom: '24px' }}> return (<Card bordered={false} bodyStyle={{ padding: 0, marginBottom: '24px' }}>
<div className={styles.salesCard}> <div className={styles.salesCard}>

46
web/src/pages/mockExamination/chapterErrorListPaper.tsx
Unescape View File

@ -158,10 +158,21 @@ const CardList = () => {
} }
} }
// 根据题型返回题数、分数、总分
const showQuestionTypeSocore = (questionType) => {
let num = 0
let name = 0
questionTypeList.map((e) => {
e.question_type === questionType ? name = e.question_type_name : "";
e.question_type === questionType ? num = e.question_list.length : ""
})
return `${name} (共${num}题)`
}
return ( return (
<PageContainer content={content} extraContent={false}> <PageContainer content={content} extraContent={false}>
<Row> <Row>
{/* {console.log("试题列表：", paperInfo, "答题卡：", questionTypeList, "当前试题", questionNow)} */} {console.log("试题列表：", paperInfo, "答题卡：", questionTypeList, "当前试题", questionNow)}
{/* {console.log(questionTypeList, 'uestionTypeList')} */} {/* {console.log(questionTypeList, 'uestionTypeList')} */}
<Col span={6} style={{ paddingRight: 24 }}> <Col span={6} style={{ paddingRight: 24 }}>
@ -220,11 +231,11 @@ const CardList = () => {
</div> </div>
</ProCard> </ProCard>
</Col> </Col>
{console.log(questionNow, 'questionNow.index[1]')}
<Col span={13} style={{ background: '#ffffff', padding: 0 }}> <Col span={13} style={{ background: '#ffffff', padding: 0 }}>
<ProCard <ProCard
title={ title={showQuestionTypeSocore(questionNow.question_type)}
questionNow.question_type === 0 ? "一、单选题" : questionNow.question_type === 1 ? "二、多选题" : questionNow.question_type === 2 ? "判断题" : ""
}
extra={false} extra={false}
split='vertical' split='vertical'
bordered bordered
@ -232,7 +243,7 @@ const CardList = () => {
> >
<Space direction="vertical" style={{ width: '100%', padding: '24px 48px' }}> <Space direction="vertical" style={{ width: '100%', padding: '24px 48px' }}>
<Typography style={{ marginBottom: 16, fontSize: 18 }}> <Typography style={{ marginBottom: 16, fontSize: 18 }}>
{questionNow.id ? questionNow.index[0] + 1 : ""} 、{questionNow?.question_stem} {JSON.stringify(questionNow) !== {} ? questionNow.index[1] + 1 : ""} 、{questionNow?.question_stem}
</Typography> </Typography>
<Space direction="vertical" style={{ fontSize: 16 }}> <Space direction="vertical" style={{ fontSize: 16 }}>
@ -357,12 +368,6 @@ const CardList = () => {
// runSavePersonAnswer({ // runSavePersonAnswer({
// answer_ids: e.target.value, // answer_ids: e.target.value,
// question_id: questionNow.question_id, // question_id: questionNow.question_id,
// record_id: rulesPaperInfo.record_id
// })
// console.log("答题：", questionAnswer, qArr, questionNow)
// 修改答题卡状态 写入答案以及修改答题状态
const qX = questionNow?.question_type;
const qI = questionNow?.index;
questionList[questionNow.index[0]].question_list[questionNow.index[1]].answerSelect = questionAnswer; questionList[questionNow.index[0]].question_list[questionNow.index[1]].answerSelect = questionAnswer;
if (questionAnswer === questionNow.answertrue) { if (questionAnswer === questionNow.answertrue) {
questionList[questionNow.index[0]].question_list[questionNow.index[1]].state = 0 questionList[questionNow.index[0]].question_list[questionNow.index[1]].state = 0
@ -380,24 +385,7 @@ const CardList = () => {
})}</Space></Radio.Group> })}</Space></Radio.Group>
) : "" ) : ""
} } <div style={{ background: '#ffffff', padding: 24 }}>
</Form.Item>
</Form>
</Space>
<Radio.Group onChange={() => { return true }} value={0} size="large">
<Space direction="vertical" style={{ fontSize: 16 }}>
<Button type="primary" onClick={() => {
setParsingShow(!parsingShow)
}}>查看解析</Button>
<div style={{ display: (parsingShow ? 'block' : 'none') }} dangerouslySetInnerHTML={{ __html: questionNow.parsing }} />
</Space>
</Radio.Group>
</Space>
</ProCard>
</Col>
<Col span={5} style={{ paddingLeft: 24 }}>
<div style={{ background: '#ffffff', padding: 24 }}>
<Space direction="vertical" style={{ width: '100%' }}> <Space direction="vertical" style={{ width: '100%' }}>
<Divider style={{ margin: '6px 0', opacity: 0.5 }} /> <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
<strong>答题序号</strong> <strong>答题序号</strong>

22
web/src/pages/mockExamination/chapterListPaper.tsx
Unescape View File

@ -189,13 +189,23 @@ const CardList = () => {
} }
// 计算试题总数以及已答题数 // 根据题型返回题数、分数、总分
const showQuestionTypeSocore = (questionType) => {
let num = 0
let name = 0
questionTypeList.map((e) => {
console.log(e, 'eee')
e.question_type === questionType ? name = e.question_type_name : "";
e.question_type === questionType ? num = e.question_list.length : ""
})
return `${name} (共${num}题)`
}
return ( return (
<PageContainer content={content} extraContent={false}> <PageContainer content={content} extraContent={false}>
<Row> <Row>
{console.log("试题列表：", paperInfo, "答题卡：", questionTypeList, "当前试题", questionNow)} {console.log("试题列表：", paperInfo, "答题卡：", questionTypeList, "当前试题", questionNow)}
{/* {console.log(questionTypeList, 'uestionTypeList')} */} {/* {console.log(questionTypeList, 'uestionTypeList')} */}
<Col span={6} style={{ paddingRight: 24 }}> <Col span={6} style={{ paddingRight: 24 }}>
<ProCard <ProCard
@ -256,9 +266,7 @@ const CardList = () => {
</Col> </Col>
<Col span={13} style={{ background: '#ffffff', padding: 0 }}> <Col span={13} style={{ background: '#ffffff', padding: 0 }}>
<ProCard <ProCard
title={ title={showQuestionTypeSocore(questionNow.question_type)}
questionNow.question_type === 0 ? "一、单选题" : questionNow.question_type === 1 ? "二、多选题" : questionNow.question_type === 2 ? "判断题" : ""
}
extra={false} extra={false}
split='vertical' split='vertical'
bordered bordered
@ -266,7 +274,7 @@ const CardList = () => {
> >
<Space direction="vertical" style={{ width: '100%', padding: '24px 48px' }}> <Space direction="vertical" style={{ width: '100%', padding: '24px 48px' }}>
<Typography style={{ marginBottom: 16, fontSize: 18 }}> <Typography style={{ marginBottom: 16, fontSize: 18 }}>
{questionNow.id ? questionNow.index[0] + 1 : ""} 、{questionNow?.question_stem} {questionNow.id ? questionNow.index[1] + 1 : ""} 、{questionNow?.question_stem}
{console.log("question", questionNow)} {console.log("question", questionNow)}
</Typography> </Typography>
<Space direction="vertical" style={{ fontSize: 16 }}> <Space direction="vertical" style={{ fontSize: 16 }}>
@ -424,7 +432,7 @@ const CardList = () => {
<Space direction="vertical" style={{ fontSize: 16 }}> <Space direction="vertical" style={{ fontSize: 16 }}>
<Button type="primary" onClick={() => { <Button type="primary" onClick={() => {
setParsingShow(!parsingShow) setParsingShow(!parsingShow)
}}>查看解析</Button> }}>查看答案</Button>
<div style={{ display: (parsingShow ? 'block' : 'none') }} dangerouslySetInnerHTML={{ __html: questionNow.parsing }} /> <div style={{ display: (parsingShow ? 'block' : 'none') }} dangerouslySetInnerHTML={{ __html: questionNow.parsing }} />
</Space> </Space>
</Radio.Group> </Radio.Group>

4
web/src/pages/mockExamination/paper/index.tsx
Unescape View File

@ -402,7 +402,7 @@ const CardList = () => {
} }
onClick={() => { onClick={() => {
// 查看解析关闭 // 查看答案关闭
setParsingShow(false) setParsingShow(false)
paperInfo.map((e) => { paperInfo.map((e) => {
@ -556,7 +556,7 @@ const CardList = () => {
<Space direction="vertical" style={{ fontSize: 16 }}> <Space direction="vertical" style={{ fontSize: 16 }}>
<Button type="primary" onClick={() => { <Button type="primary" onClick={() => {
setParsingShow(!parsingShow) setParsingShow(!parsingShow)
}}>查看解析</Button> }}>查看答案</Button>
<div style={{ display: (parsingShow ? 'block' : 'none') }} dangerouslySetInnerHTML={{ __html: questionNow.parsing }} /> <div style={{ display: (parsingShow ? 'block' : 'none') }} dangerouslySetInnerHTML={{ __html: questionNow.parsing }} />
</Space> </Space>
</Radio.Group> </Radio.Group>

Write Preview
Loading…
Cancel
Save