diff --git a/admin/src/pages/examination/option/index.tsx b/admin/src/pages/examination/option/index.tsx index 41ca3d7..dba752f 100644 --- a/admin/src/pages/examination/option/index.tsx +++ b/admin/src/pages/examination/option/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useRef } from 'react'; import { useRequest, history } from 'umi'; import { PlusOutlined, TagsOutlined, UploadOutlined } from '@ant-design/icons'; -import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Form, Popconfirm } from 'antd'; +import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Form, Popconfirm, Typography } from 'antd'; import { PageContainer, FooterToolbar } from '@ant-design/pro-layout'; import type { ActionType } from '@ant-design/pro-table'; import type { ProColumns } from '@ant-design/pro-table'; @@ -296,10 +296,9 @@ const ExaminationList: React.FC = () => { }} > - {record.b_use == 1 ? "已发布" : "未发布"} + {record.b_use == 1 ? 已发布 : 未发布} @@ -312,9 +311,6 @@ const ExaminationList: React.FC = () => { record.apply_time = [record.apply_start_time, record.apply_end_time] record.examination_time = [record.examination_end_time, record.examination_end_time] record.apply_time = [record.apply_start_time, record.apply_end_time] - - - setCurrentRow(record); }} > diff --git a/admin/src/pages/examinationrules/attestation/index.tsx b/admin/src/pages/examinationrules/attestation/index.tsx index 7b2b23c..27f10f2 100644 --- a/admin/src/pages/examinationrules/attestation/index.tsx +++ b/admin/src/pages/examinationrules/attestation/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useRef } from 'react'; import { useRequest, history } from 'umi'; import { PlusOutlined, TagsOutlined, UploadOutlined } from '@ant-design/icons'; -import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload } from 'antd'; +import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Typography } from 'antd'; import { PageContainer, FooterToolbar } from '@ant-design/pro-layout'; import type { ProColumns, ActionType } from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table'; @@ -222,6 +222,7 @@ const ExaminationRules: React.FC = () => { }}> 删除 , + /* { @@ -229,8 +230,8 @@ const ExaminationRules: React.FC = () => { //setCurrentRow(record); }} > - 发布 - , + {record.b_use == 1 ? 已发布 : 未发布} + */, ] }, }, diff --git a/admin/src/pages/examinationrules/attestation/step/index.tsx b/admin/src/pages/examinationrules/attestation/step/index.tsx index 58da570..95baa64 100644 --- a/admin/src/pages/examinationrules/attestation/step/index.tsx +++ b/admin/src/pages/examinationrules/attestation/step/index.tsx @@ -20,7 +20,7 @@ import { saveRules, querySubjectList, queryRulesView, queryRulesList, queryRules import { queryQuestionType } from '@/pages/questionbank/service'; import ProTable, { ActionType, EditableProTable, ProColumns } from '@ant-design/pro-table'; import { TableListPagination } from '@/pages/ListTableList2/data'; -import { PlusOutlined } from '@ant-design/icons'; +import { DiffOutlined, PlusOutlined } from '@ant-design/icons'; import { TableListItem } from '../../components/QuestionSelector'; import ScoreSetter from '../../components/ScoreSetter'; import AutoSelector from '../components/AutoSelector'; @@ -62,8 +62,8 @@ export default () => { dataIndex: 'examination_time', valueType: 'text', sorter: false, - hideInTable: false, - hideInForm: false, + hideInTable: true, + hideInForm: true, hideInSearch: true, renderText: (val: string) => `${val}`, }, @@ -71,13 +71,13 @@ export default () => { title: '关联主题', dataIndex: 'subject_name', valueType: 'text', - hideInTable: false, - hideInForm: false, + hideInTable: true, + hideInForm: true, hideInSearch: true, }, { title: '题型设置', - dataIndex: 'subject_id', + dataIndex: 'question_type_count', valueType: 'text', hideInTable: true, hideInForm: false, @@ -93,9 +93,9 @@ export default () => { sinfo.push({ label: Items.list[i].subject_name, value: Items.list[i].subject_id }) } console.log(sinfo, 'sinfo'); - */ + */ return []; - }, + }, }, { title: '总分', @@ -104,7 +104,7 @@ export default () => { valueType: 'text', hideInSearch: true, hideInForm: false, - renderText: (val: string) => `${val}分`, + renderText: (val: string) => `${val || 0} 分`, }, { title: '通过线', @@ -113,12 +113,13 @@ export default () => { valueType: 'text', hideInSearch: true, hideInForm: false, - renderText: (val: string) => `${val}`, + renderText: (val: string) => `${val || '-'}`, }, { title: '操作', dataIndex: 'option', valueType: 'option', + width: 200, render: (_dom: any, record: React.SetStateAction) => { console.log(record, 'record') return [ @@ -305,32 +306,36 @@ export default () => { >
+ page headerTitle={false} actionRef={actionRef} rowKey="examination_id" options={false} search={false} - toolBarRender={() => [ - , - - ]} + toolBarRender={() => ( + + + + + )} request={async (value) => { + console.log('queryRulesPaper::') const _data = await queryRulesPaper( { rules_id: params?.id, @@ -340,7 +345,7 @@ export default () => { ); return { current: _data?.pageNumber, - data: _data?.table_List, + data: _data?.question_list, pageSize: _data?.pageSize, total: _data?.totalRow || 0, }; @@ -407,6 +412,7 @@ export default () => { console.log('paper', paper) // setUuidPaper(paper?.paper_uuid) // message.success('提交成功'); + actionRef.current?.reload() handleAutoModalVisible(false) return true; }} diff --git a/admin/src/pages/examinationrules/normal/index.tsx b/admin/src/pages/examinationrules/normal/index.tsx index 40dc00f..28fce60 100644 --- a/admin/src/pages/examinationrules/normal/index.tsx +++ b/admin/src/pages/examinationrules/normal/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useRef } from 'react'; import { useRequest, history } from 'umi'; import { PlusOutlined, TagsOutlined, UploadOutlined } from '@ant-design/icons'; -import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload } from 'antd'; +import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Typography } from 'antd'; import { PageContainer, FooterToolbar } from '@ant-design/pro-layout'; import type { ProColumns, ActionType } from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table'; @@ -194,7 +194,7 @@ const ExaminationRules: React.FC = () => { setSelectedRows([]); actionRef.current?.reloadAndRest?.(); }}> - 删除 + 删除 , { actionRef.current?.reloadAndRest?.(); }} > - {record.b_use == 0 ? "未发布" : "已发布"} + {record.b_use == 1 ? 已发布 : 未发布} , ] }, diff --git a/admin/src/pages/examinationrules/service.ts b/admin/src/pages/examinationrules/service.ts index f485591..5e161fb 100644 --- a/admin/src/pages/examinationrules/service.ts +++ b/admin/src/pages/examinationrules/service.ts @@ -209,4 +209,4 @@ export async function autoPaperOfficial(data: Record, options?: Rec requestType: "form", ...(options || {}), }); -} +} \ No newline at end of file diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx index 8b00535..cb0c0b3 100644 --- a/admin/src/pages/questionbank/index.tsx +++ b/admin/src/pages/questionbank/index.tsx @@ -185,21 +185,31 @@ const QuestionBank = () => { hideInForm: false, hideInSearch: true, renderFormItem: (item, { defaultRender, ...rest }, form) => ( - + { + //console.log(`checked = ${e.target.checked}`); + }}> + + + A + + + B + + + C + + + D + + + ) /* formItemProps: { rules: [ { required: true, - message: '请填写试题解析', + message: '请填答案', }, ] },*/ @@ -231,7 +241,6 @@ const QuestionBank = () => { // rules={[{ required: true }]} value="锦书" // disabled - /> ), },