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

fix

Browse Source
master
zhengpengju 3 years ago
parent d14173ddd8
commit da9bef00de
7 changed files with 245 additions and 152 deletions
Show Stats Download Patch File Download Diff File

3
admin/src/components/RightContent/AvatarDropdown.tsx
Unescape View File

@ -70,6 +70,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
const menuHeaderDropdown = (
<Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}>
{/*
{menu && (
<Menu.Item key="center">
<UserOutlined />
@ -83,7 +84,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
</Menu.Item>
)}
{menu && <Menu.Divider />}
*/}
<Menu.Item key="logout">
<LogoutOutlined />
退出登录

19
admin/src/pages/demo/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { DingdingOutlined, UploadOutlined } from '@ant-design/icons';
import { Button, Card, Steps, Result, Descriptions, Modal, Input, Upload, Popconfirm, Menu } from 'antd';
import { Button, Card, Steps, Result, Descriptions, Modal, Input, Upload, Popconfirm, Menu, Radio } from 'antd';
import { Fragment, useEffect, useRef, useState } from 'react';
import { GridContent } from '@ant-design/pro-layout';
import { Line } from '@ant-design/charts';
@ -117,6 +117,8 @@ export default () => {
const [modalVisible, handleModalVisible] = useState<boolean>(false);
const saveInputRef = useRef();
const radioRef = useRef();
//const currentRow = {course_name:'课程0001'};
const currentRow = {course_name1:'课程0001'};
const columns = [
@ -162,11 +164,6 @@ export default () => {
{menuItems}
</Menu>
);
}, [listData, selectedCourse]);
const config = {
@ -254,6 +251,16 @@ export default () => {
</Popconfirm>
<DualAxes {...config} />
<Radio.Group onChange={()=>{
}}>
<Radio value={1}>A</Radio>
<Radio value={2}>B</Radio>
<Radio value={3}>C</Radio>
<Radio value={4} defaultChecked>D</Radio>
</Radio.Group>
<a onClick={()=>{}}>rrrrr</a>
</>
)
};

35
admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
Unescape View File

@ -44,6 +44,9 @@ const AutoSelector = (props: any, ref: any) => {
const [questionCount, setQuestionCount] = useState([0,0]) // 题库抽取数量
const [questionTypeCount, setQuestionTypeCount] = useState(questionType.map(()=>(0))) // 题型抽取数量
const [normalQuestionSum, setNormalQuestionSum] = useState(0) // 常规题库试题数量
const [attestationQuestionSum, setAttestationQuestionSum] = useState(0) // 资质考试题库试题数量
const match = useRouteMatch();
console.log('match', match);
@ -52,7 +55,28 @@ const AutoSelector = (props: any, ref: any) => {
//const [selectedRowsState, setSelectedRows] = useState<API.RuleListItem[]>([]);
//const [addType, setAddType] = useState({name: '', value: 0});
/** 获取常规题库试题数量 */
const { data: normalSum } = useRequest(()=>{
return queryQuestionList({page_number: 1, page_size: 1, type: 0})
},{
formatResult: (result) => {
return result.totalRow;
}
});
/** 获取资质考试题库试题数量 */
const { data: attestationSum } = useRequest(()=>{
return queryQuestionList({page_number: 1, page_size: 1, type: 1})
},{
formatResult: (result) => {
return result.totalRow;
}
});
useEffect(() => {
setNormalQuestionSum(normalSum);
setAttestationQuestionSum(attestationSum);
}, [ normalSum, attestationSum]);
// 暴露组件的方法 接受外部获取的ref
useImperativeHandle(ref, () => ({
@ -61,18 +85,19 @@ const AutoSelector = (props: any, ref: any) => {
return {questionCount, questionTypeCount};
},
}));
return (
<>
<Row><Col style={{padding:10}}>题库选择</Col></Row>
<Row style={{padding:5}}>
<Col offset={1} span={5}>{`常规题库 ( ${0} 道题)`}</Col>
<Col offset={1} span={10}>抽取比例: <InputNumber defaultValue={0} style={{textAlign:'center'}} onChange={(value)=>{
setQuestionCount([value,questionCount[1]])
<Col offset={1} span={5}>{`常规题库 ( ${normalQuestionSum} 道题)`}</Col>
<Col offset={1} span={10}>抽取比例: <InputNumber defaultValue={50} style={{textAlign:'center'}} onChange={(value)=>{
setQuestionCount([value, questionCount[1]])
}} /> %</Col>
</Row>
<Row style={{padding:5}}>
<Col offset={1} span={5}>{`资质考试题库 ( ${0} 道题)`}</Col>
<Col offset={1} span={10}>抽取比例: <InputNumber defaultValue={0} style={{textAlign:'center'}} onChange={(value)=>{
<Col offset={1} span={5}>{`资质考试题库 ( ${attestationQuestionSum} 道题)`}</Col>
<Col offset={1} span={10}>抽取比例: <InputNumber defaultValue={50} style={{textAlign:'center'}} onChange={(value)=>{
setQuestionCount([questionCount[0], value])
}} /> %</Col>
</Row>

298
admin/src/pages/examinationrules/attestation/step/index.tsx
Unescape View File

@ -2,163 +2,159 @@ import React, { useEffect, useRef, useState } from 'react';
import { history, useParams, useRequest } from 'umi';
import { ModalForm, ProFormInstance } from '@ant-design/pro-form';
import { ProFormRadio } from '@ant-design/pro-form';
import ProForm, {
StepsForm,
ProFormText,
ProFormDatePicker,
ProFormSelect,
ProFormTextArea,
ProFormCheckbox,
ProFormDateRangePicker,
} from '@ant-design/pro-form';
import ProForm, {StepsForm, ProFormText, ProFormSelect, ProFormDateRangePicker } from '@ant-design/pro-form';
import ProCard from '@ant-design/pro-card';
import { Button, Checkbox, Col, Divider, Input, List, Menu, message, Radio, Row, Space, Typography } from 'antd';
import { Button, Checkbox, Col, Divider, Input, List, Menu, message, Radio, Row, Space } from 'antd';
import { PageContainer } from '@ant-design/pro-layout';
import ProDescriptions from '@ant-design/pro-descriptions';
import styles from './index.less'
import { saveRules, querySubjectList, queryRulesView, queryRulesList, queryRulesPaper, saveQuestionTypeScore, autoPaperOfficial } from '../../service';
import { queryQuestionType } from '@/pages/questionbank/service';
import ProTable, { ActionType, EditableProTable, ProColumns } from '@ant-design/pro-table';
import { TableListPagination } from '@/pages/ListTableList2/data';
//import { TableListPagination } from '@/pages/ListTableList2/data';
import { DiffOutlined, PlusOutlined } from '@ant-design/icons';
import { TableListItem } from '../../components/QuestionSelector';
//import { TableListItem } from '../../components/QuestionSelector';
import ScoreSetter from '../../components/ScoreSetter';
import AutoSelector from '../components/AutoSelector';
import QuestionSelector from '../../components/QuestionSelector';
/** 题型序号 */
const numberType = ['一','二','三','四','五','六','七','八','九','十'];
const questions = []
export default () => {
const params = useParams();
const waitTime = (time: number = 100) => {
return new Promise((resolve) => {
setTimeout(() => {
resolve(true);
}, time);
});
};
const numbers = [];
for (let i = 0; i < 50; i++) {
numbers.push({ id: `${i}` })
}
const formRef = useRef<ProFormInstance>();
const actionRef = useRef<ActionType>();
const setterRef = useRef();
const autoRef = useRef();
const [questionTypeValues, setQuestionTypeValues] = useState([]); // 题型数据[{count:0, score:0, score_harf:0}]
/** 自动组卷窗口 */
const [autoModalVisible, handleAutoModalVisible] = useState<boolean>(false);
/** 分值窗口 */
const [scoreModalVisible, handleScoreModalVisible] = useState<boolean>(false);
/** 试卷详情窗口 */
const [paperModalVisible, handlePaperModalVisible] = useState<boolean>(false);
export default () => {
/** 列表项定义 */
const columns: ProColumns<TableListItem>[] = [
const columns: ProColumns[] = [
{
title: '序号',
key: 'index',
valueType: 'indexBorder',
width: 48,
title: '序号',
key: 'index',
valueType: 'indexBorder',
width: 48,
},
{
title: '考试名称',
dataIndex: 'rules_name',
valueType: 'text',
hideInTable: false,
hideInForm: false,
hideInSearch: true,
title: '考试名称',
dataIndex: 'rules_name',
valueType: 'text',
hideInTable: false,
hideInForm: false,
hideInSearch: true,
},
{
title: '试卷',
dataIndex: 'examination_time',
valueType: 'text',
sorter: false,
hideInTable: true,
hideInForm: true,
hideInSearch: true,
renderText: (val: string) => `${val}`,
},
title: '试卷',
dataIndex: 'examination_time',
valueType: 'text',
sorter: false,
hideInTable: true,
hideInForm: true,
hideInSearch: true,
renderText: (val: string) => `${val}`,
},
{
title: '关联主题',
dataIndex: 'subject_name',
valueType: 'text',
hideInTable: true,
hideInForm: true,
hideInSearch: true,
title: '关联主题',
dataIndex: 'subject_name',
valueType: 'text',
hideInTable: true,
hideInForm: true,
hideInSearch: true,
},
{
title: '题型设置',
dataIndex: 'question_type_count',
valueType: 'text',
hideInTable: true,
hideInForm: false,
hideInSearch: false,
request: async () => {
/*
const { data: Items } = await querySubjectList({});
// console.log(Items, ')))');
title: '题型设置',
dataIndex: 'question_type_count',
valueType: 'text',
hideInTable: true,
hideInForm: false,
hideInSearch: false,
request: async () => {
/*
const { data: Items } = await querySubjectList({});
// console.log(Items, ')))');
const sinfo = []
for (let i = 0; i < Items.list.length; i++) {
// console.log(Items.list[i], ">>>")
sinfo.push({ label: Items.list[i].subject_name, value: Items.list[i].subject_id })
}
console.log(sinfo, 'sinfo');
*/
return [];
const sinfo = []
for (let i = 0; i < Items.list.length; i++) {
// console.log(Items.list[i], ">>>")
sinfo.push({ label: Items.list[i].subject_name, value: Items.list[i].subject_id })
}
console.log(sinfo, 'sinfo');
*/
return [];
},
},
{
title: '总分',
dataIndex: 'sum_score',
sorter: false,
valueType: 'text',
hideInSearch: true,
hideInForm: false,
renderText: (val: string) => `${val || 0} 分`,
title: '总分',
dataIndex: 'sum_score',
sorter: false,
valueType: 'text',
hideInSearch: true,
hideInForm: false,
renderText: (val: string) => `${val || 0} 分`,
},
{
title: '通过线',
dataIndex: 'pass_score',
sorter: false,
valueType: 'text',
hideInSearch: true,
hideInForm: false,
renderText: (val: string) => `${val || '-'}`,
title: '通过线',
dataIndex: 'pass_score',
sorter: false,
valueType: 'text',
hideInSearch: true,
hideInForm: false,
renderText: (val: string) => `${val || '-'}`,
},
{
title: '操作',
dataIndex: 'option',
valueType: 'option',
width: 200,
render: (_dom: any, record: React.SetStateAction<TableListItem | undefined>) => {
console.log(record, 'record')
return [
<a
key="detail"
onClick={() => {
//console.log('entity', entity);
//setCurrentRow(record);
//handleDetailModalVisible(true);
}}
>
查看
</a>,
<a
key="create"
onClick={() => {
//history.push(`/examination/option/registration/${record.examination_id}`);
//setCurrentRow(record);
}}
>
重新生成
</a>,
]
},
title: '操作',
dataIndex: 'option',
valueType: 'option',
width: 200,
render: (_dom: any, record: React.SetStateAction) => {
console.log(record, 'record')
return [
<a
key="detail"
onClick={() => {
//console.log('entity', entity);
//setCurrentRow(record);
handlePaperModalVisible(true); // 试卷详情
}}
>
查看
</a>,
<a
key="create"
onClick={async () => {
//history.push(`/examination/option/registration/${record.examination_id}`);
//setCurrentRow(record);
const _type_count: any[] = [];
record?.question_type_count.forEach((item: { count: any; })=>{
_type_count.push(item?.count || 0)
})
const { success } = await autoPaperOfficial(
{
paper_id: record?.paper_id,
rules_id: Number(params?.id),
question_count: '50,50', // 当前数据库没保存，只能采用默认
question_type_count: _type_count?.toString()
}
)
}}
>
重新生成
</a>,
]
},
},
];
const params = useParams();
const formRef = useRef<ProFormInstance>();
const actionRef = useRef<ActionType>();
const setterRef = useRef();
const autoRef = useRef();
/** 自动组卷窗口 */
const [autoModalVisible, handleAutoModalVisible] = useState<boolean>(false);
/** 分值窗口 */
const [scoreModalVisible, handleScoreModalVisible] = useState<boolean>(false);
console.log(params, 'params');
let ruleData = {}
if (params?.id) {
@ -198,7 +194,6 @@ export default () => {
}>
formRef={formRef}
onFinish={async () => {
await waitTime(1000);
message.success('提交成功');
}}
formProps={{
@ -231,8 +226,6 @@ export default () => {
start_time: fileds.dateRange[0],
end_time: fileds.dateRange[1]
});
// await waitTime(2000);
return true;
}}
@ -305,7 +298,8 @@ export default () => {
}}
>
<div style={{ margin: '0' }}>
<ProTable<TableListItem, TableListPagination>
{`试卷`}
<ProTable
page
headerTitle={false}
actionRef={actionRef}
@ -336,6 +330,7 @@ export default () => {
)}
request={async (value) => {
console.log('queryRulesPaper::')
/** 获取试卷 */
const _data = await queryRulesPaper(
{
rules_id: params?.id,
@ -343,6 +338,28 @@ export default () => {
page_size: value.pageSize
}
);
const _questionTypeCountData = [];
_data.question_list[0]?.question_type_count.forEach((item)=>{
_questionTypeCountData.push(item.count)
})
console.log('_questionTypeCountData', _questionTypeCountData)
const _questionType = [];
console.log('_data.question_type_score', _data.question_type_score)
if(_data?.question_type_score.length > 0){
_data.question_type_score?.forEach((item, index)=>{
_questionType.push({count: _questionTypeCountData[index], score: item.score, score_harf: item.score_harf})
})
}else{
_questionTypeCountData?.forEach((item, index)=>{
_questionType.push({count: _questionTypeCountData[index], score:0, score_harf: 0})
})
}
console.log('_questionType', _questionType)
setQuestionTypeValues(_questionType)
return {
current: _data?.pageNumber,
data: _data?.question_list,
@ -437,7 +454,32 @@ export default () => {
return true;
}}
>
<ScoreSetter ref={setterRef} />
<ScoreSetter ref={setterRef} questionTypeValues={questionTypeValues} />
</ModalForm>
<ModalForm
title={`试卷详情`}
//
width="80%"
visible={paperModalVisible}
onVisibleChange={handlePaperModalVisible}
footer={null}
onFinish={async () => {
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)
// setUuidPaper(paper?.paper_uuid)
// message.success('提交成功');
handleScoreModalVisible(false)
return true;
}}
>
{questions && questions?.map((item)=>{
return <>
</>
})}
试卷详情正在调整布局。。。。。。
</ModalForm>
</PageContainer>

17
admin/src/pages/examinationrules/components/ScoreSetter.tsx
Unescape View File

@ -34,6 +34,9 @@ export type TableListItem = {
// React.forwardRef 接受渲染函数作为参数。React 将使用 props 和 ref 作为参数来调用此函数。此函数应返回 React 节点。
const ScoreSetter = (props: any, ref: any) => {
const {questionTypeValues} = props
console.log('questionTypeValues', questionTypeValues)
const match = useRouteMatch();
console.log('match', match);
@ -45,11 +48,9 @@ const ScoreSetter = (props: any, ref: any) => {
const [sumScore, setSumScore] = useState(0); // 总分
const formRef = useRef();
//const actionRef = useRef<ActionType>();
//const actionRef = useRef<ActionType>();
/** 列表项定义 */
const columns: any = [
@ -67,7 +68,7 @@ const ScoreSetter = (props: any, ref: any) => {
render: (text, record, index) =>
<Space direction='horizontal'>
<span>每题</span>
<Form.Item style={{margin:0}} name={`score[${index}]`}><InputNumber type="number" placeholder="请输入" size="small" onChange={(value)=>{
<Form.Item style={{margin:0}} name={`score[${index}]`}><InputNumber type="number" defaultValue={questionTypeValues[index]?.score} placeholder="请输入" size="small" onChange={(value)=>{
console.log('row', index)
console.log('v1',value)
const _data = [];
@ -81,7 +82,7 @@ const ScoreSetter = (props: any, ref: any) => {
{ (record?.code === 1) &&
<>
<span>错选、漏选得:: </span>
<Form.Item style={{margin:0}} name={`score_harf`}><InputNumber type="number" placeholder="请输入" size="small" name='score_harf' onChange={(value)=>{
<Form.Item style={{margin:0}} name={`score_harf`}><InputNumber type="number" defaultValue={questionTypeValues[index]?.score_harf} placeholder="请输入" size="small" name='score_harf' onChange={(value)=>{
//
const _data = [];
console.log('typeScore',typeScore)
@ -99,7 +100,7 @@ const ScoreSetter = (props: any, ref: any) => {
title: '题目数量',
dataIndex: 'count',
width: 80,
//render: text => <a>{text}</a>,
render: (text, _, index) => <>{questionTypeValues[index].count}</>,
/*
editable: (text, record, index) => {
return true;
@ -160,7 +161,9 @@ const ScoreSetter = (props: any, ref: any) => {
ref={formRef}
>
<EditableProTable
title={()=>{return <Space>共计 0 题, 总计 {sumScore} 分 通过分数线
title={()=>{
questionTypeValues
return <Space>共计 0 题, 总计 {sumScore} 分 通过分数线
<Form.Item style={{margin:0}} name='win' initialValue={0}><InputNumber /></Form.Item>
分</Space>}}
//formMapRef={formMapRef}

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

@ -194,7 +194,7 @@ export default () => {
b_use: 0,
rules_type: 0,
});
run({paper_uuid:1}); // 获取当前选题列表
//run({paper_uuid:1}); // 获取当前选题列表
// console.log('模拟考试基本信息', fileds)
setSubjectId(fileds?.subject_id) // 设置当前关联主题
setRulesName(fileds?.rules_name) // 设置模拟考试规则名称
@ -278,7 +278,7 @@ export default () => {
<Row>
<Col span={18} style={{ background: '#ffffff', padding: 0 }}>
<ProCard
title="一. 单选题 （共50分，每题1分）"
title="一. 单选题 （共50分，每题1分）111"
extra={false}
split='vertical'
bordered
@ -286,6 +286,21 @@ export default () => {
>
<Space direction="vertical" style={{ width: '100%', padding: '24px 48px' }}>
{ questions && questions.map(
<>
<Typography style={{ marginBottom: 16, fontSize: 18 }}>
0. 以下哪些是符合法律规定的 ？
</Typography>
<Radio.Group onChange={() => { return true }} value={0} size="large">
<Space direction="vertical" style={{ fontSize: 16 }}>
<Radio value={1} style={{ padding: 5, fontSize: 16 }}>A. 单位在试用期辞退员工</Radio>
<Radio value={2} style={{ padding: 5, fontSize: 16 }}>B. 社会中介收取中介费</Radio>
<Radio value={3} style={{ padding: 5, fontSize: 16 }}>C. 单位不缴纳五险一金</Radio>
<Radio value={4} style={{ padding: 5, fontSize: 16 }}>D. 要求员工支付押金</Radio>
</Space>
</Radio.Group>
</>
)}
<Typography style={{ marginBottom: 16, fontSize: 18 }}>
4. 以下哪些是符合法律规定的 ？
</Typography>
@ -416,14 +431,14 @@ export default () => {
visible={selectorModalVisible}
onVisibleChange={handleSelectorModalVisible}
footer={null}
onFinish={async (values) => {
onFinish={async (values) => {
console.log('v::::', values.name);
const rows = selectorRef?.current?.getSelectedRows()
console.log('rows::::', rows);
const {code, data: paper, msg} = await handleAppend(Number(params?.id), rows)
console.log('paper', paper)
setUuidPaper(paper?.paper_uuid)
run({paper_uuid: paper?.paper_uuid}); // 获取当前选题列表
// message.success('提交成功');
handleSelectorModalVisible(false)
return true;

2
admin/src/pages/examinationrules/service.ts
Unescape View File

@ -209,4 +209,4 @@ export async function autoPaperOfficial(data: Record<string, any>, options?: Rec
requestType: "form",
...(options || {}),
});
}
}

Write Preview
Loading…
Cancel
Save