master
zhengpengju 3 years ago
parent 2b46c831f8
commit 9342a21839

@ -174,7 +174,7 @@ const CourseList: React.FC = () => {
hideInTable: true,
hideInForm: false,
hideInSearch: true,
renderText: (val: string) => `${val}`,
renderText: (val: string) => `${val} 分钟`,
formItemProps: {
// 参照 https://ant.design/components/form-cn/#Rule
rules: [

@ -80,11 +80,25 @@ export default () => {
dataIndex: 'examination_time',
valueType: 'text',
sorter: false,
hideInTable: true,
hideInTable: false,
hideInForm: true,
hideInSearch: true,
renderText: (val: string) => `${val}`,
},
{
title: '题型设置',
dataIndex: 'question_type',
valueType: 'text',
sorter: false,
hideInTable: false,
hideInForm: true,
hideInSearch: true,
renderText: (val: string) => {
return <>
</>
},
},
{
title: '关联主题',
dataIndex: 'subject_name',
@ -435,7 +449,7 @@ export default () => {
>
<ProDescriptions.Item dataIndex="id" hideInDescriptions />
<ProDescriptions.Item dataIndex="rules_name" label="考试名称" valueType="text" />
<ProDescriptions.Item dataIndex="subject_name" label="关联培训主题" valueType="text" />
<ProDescriptions.Item dataIndex="subject_name" label="关联主题" valueType="text" />
<ProDescriptions.Item dataIndex="examination_time" label="考试时长" valueType="text" renderText={(text)=>(`${text} 分钟`)} />
<ProDescriptions.Item dataIndex="grade" label="试卷信息" valueType="text" render={()=>{
@ -517,15 +531,15 @@ export default () => {
width="80%"
visible={paperModalVisible}
onVisibleChange={handlePaperModalVisible}
footer={null}
onFinish={async () => {
const values = setterRef.current?.getData()
console.log('试卷详情::::', values);
//alert(0)
//const values = setterRef.current?.getData()
//console.log('试卷详情::::', values);
//const {code, data: paper, msg} = await saveQuestionTypeScore({rules_id:Number(params?.id), type_score: JSON.stringify(values)})
console.log('paper', paper)
//console.log('paper', paper)
// setUuidPaper(paper?.paper_uuid)
// message.success('提交成功');
handleScoreModalVisible(false)
handlePaperModalVisible(false)
return true;
}}
>

@ -85,7 +85,7 @@ const ExaminationRules: React.FC = () => {
width: 48,
},
{
title: '模拟考试名称',
title: '考试名称',
dataIndex: 'rules_name',
valueType: 'text',
hideInTable: false,
@ -185,18 +185,21 @@ const ExaminationRules: React.FC = () => {
onClick={() => {
history.push('/examinationrules/normal/step/' + record.id)
}}
style={{padding: '0 2px 0 0'}}
>
</Button>,
<Button type="link"
key="remove"
disabled={record.b_use ? true : false}
onClick={ () => {
handleRemove([{ key: record?.id }], record); // 调用批量删除函数如果接口不支持批量需要在service中处理
setSelectedRows([]);
actionRef.current?.reloadAndRest?.();
}}>
<Typography.Text type="danger"></Typography.Text>
}}
style={{padding: '0 2px 0 0'}}
>
<Typography.Text disabled={record.b_use ? true : false} type={"danger"}></Typography.Text>
</Button>,
<a
key="b_use"

@ -481,7 +481,7 @@ export default () => {
>
<ProDescriptions.Item dataIndex="id" hideInDescriptions />
<ProDescriptions.Item dataIndex="rules_name" label="考试名称" valueType="text" />
<ProDescriptions.Item dataIndex="subject_name" label="关联培训主题" valueType="text" />
<ProDescriptions.Item dataIndex="subject_name" label="关联主题" valueType="text" />
<ProDescriptions.Item dataIndex="examination_time" label="考试时长" valueType="text" renderText={(text)=>(`${text} 分钟`)} />
<ProDescriptions.Item dataIndex="grade" label="试卷信息" valueType="text" render={()=>{

@ -219,7 +219,7 @@ const QuestionBank = () => {
},
},
{
title: '答案',
title: '正确答案',
dataIndex: 'answertrue',
valueType: 'text',
sorter: false,
@ -339,6 +339,7 @@ const QuestionBank = () => {
pagination={{
defaultPageSize: 10,
showSizeChanger: false,
showQuickJumper: true
}}
search={{}}
toolBarRender={() => {

Loading…
Cancel
Save