Commit 532c00df by zhujian

'feat:考试'

parent 4bbd3b90
...@@ -8,11 +8,29 @@ ...@@ -8,11 +8,29 @@
} }
} }
.paperTitle{
background-color:rgba(247, 248, 249, 1) ;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 40px;
border: 2px;
margin: 8px 0;
padding-left: 12px;
img{
width: 20px;
height: 20px;
margin-right: 4px;
position: relative;
top: -2px;
}
}
.table{ .table{
border: 1px solid #e8e8e8; border: 1px solid #e8e8e8;
width: 600px; width: 600px;
margin-left: 45px;
margin-top: -10px;
.header,.body-list{ .header,.body-list{
background-color: #fafafa; background-color: #fafafa;
display: flex; display: flex;
......
...@@ -206,6 +206,8 @@ function AddExam(props: any) { ...@@ -206,6 +206,8 @@ function AddExam(props: any) {
}; };
} }
function handleGoBack() { function handleGoBack() {
Modal.confirm({ Modal.confirm({
title: '确定要返回吗?', title: '确定要返回吗?',
...@@ -220,7 +222,7 @@ function AddExam(props: any) { ...@@ -220,7 +222,7 @@ function AddExam(props: any) {
} }
return <div className="page examPage"> return <div className="page examPage">
<Breadcrumbs navList={"新建考试"} goBack={handleGoBack} /> <Breadcrumbs navList={props.type === 'edit' ? "编辑考试" : "新建考试"} goBack={handleGoBack} />
<div className="box"> <div className="box">
<Alert message="请遵守国家相关规定,切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容,小麦企培保有依据国家规定及平台规则进行处理的权利" type="info" showIcon /> <Alert message="请遵守国家相关规定,切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容,小麦企培保有依据国家规定及平台规则进行处理的权利" type="info" showIcon />
...@@ -238,46 +240,52 @@ function AddExam(props: any) { ...@@ -238,46 +240,52 @@ function AddExam(props: any) {
<Input placeholder='请输入试卷名称(40字以内)' maxLength={40} value={examName} onChange={(e) => { <Input placeholder='请输入试卷名称(40字以内)' maxLength={40} value={examName} onChange={(e) => {
setExamName(e.target.value) setExamName(e.target.value)
}} style={{ width: 300 }} /> }} style={{ width: 320 }} />
</Form.Item> </Form.Item>
<Form.Item label="选择试卷" <Form.Item label="选择试卷"
validateStatus={(check && !paperId) ? 'error' : ''} validateStatus={(check && !paperId) ? 'error' : ''}
help={check && !paperId && '请选择试卷'} help={check && !paperId && '请选择试卷'}
required> required>
<span style={{ marginRight: 12, lineHeight: '32px' }}>{paperInfo.paperName}</span> <Button onClick={() => { setShowModal(true) }} >{paperInfo.paperId ? '重新选择' : '选择试卷'}</Button> <Button onClick={() => { setShowModal(true) }} >{paperInfo.paperId ? '重新选择' : '选择试卷'}</Button>
{
paperInfo.paperId && <div className="paperTitle"><img src="https://image.xiaomaiketang.com/xm/pY5imEhjzw.png" alt=""/> {paperInfo.paperName}</div>
}
</Form.Item>
{
paperInfo.paperId && <div className="table"> {
<div className="header"> paperInfo.paperId && <div className="table">
<div className="item">单选题</div> <div className="header">
<div className="item">多选题</div> <div className="item">单选题</div>
<div className="item">判断题</div> <div className="item">多选题</div>
<div className="item">填空题</div> <div className="item">判断题</div>
<div className="item">不定项选择题</div> <div className="item">填空题</div>
<div className="item">合计</div> <div className="item">不定项选择题</div>
</div> <div className="item">合计</div>
<div className="body-list"> </div>
<div className="item">{paperInfo.singleChoiceCnt || 0}</div> <div className="body-list">
<div className="item">{paperInfo.multiChoiceCnt || 0}</div> <div className="item">{paperInfo.singleChoiceCnt || 0}</div>
<div className="item">{paperInfo.judgeCnt || 0}</div> <div className="item">{paperInfo.multiChoiceCnt || 0}</div>
<div className="item">{paperInfo.gapFillingCnt || 0}</div> <div className="item">{paperInfo.judgeCnt || 0}</div>
<div className="item long">{paperInfo.indefiniteChoiceCnt || 0}</div> <div className="item">{paperInfo.gapFillingCnt || 0}</div>
<div className="item">{paperInfo.singleChoiceCnt + paperInfo.multiChoiceCnt + paperInfo.judgeCnt + paperInfo.gapFillingCnt + paperInfo.indefiniteChoiceCnt || 0}</div> <div className="item long">{paperInfo.indefiniteChoiceCnt || 0}</div>
</div> <div className="item">{paperInfo.singleChoiceCnt + paperInfo.multiChoiceCnt + paperInfo.judgeCnt + paperInfo.gapFillingCnt + paperInfo.indefiniteChoiceCnt || 0}</div>
<div className="body-list"> </div>
<div className="item">{paperInfo.singleChoiceScore || 0}</div> <div className="body-list">
<div className="item">{paperInfo.multiChoiceScore || 0}</div> <div className="item">{paperInfo.singleChoiceScore || 0}</div>
<div className="item">{paperInfo.judgeScore || 0}</div> <div className="item">{paperInfo.multiChoiceScore || 0}</div>
<div className="item">{paperInfo.gapFillingScore || 0}</div> <div className="item">{paperInfo.judgeScore || 0}</div>
<div className="item long">{paperInfo.indefiniteChoiceScore || 0}</div> <div className="item">{paperInfo.gapFillingScore || 0}</div>
<div className="item">{paperInfo.totalScore || 0}</div> <div className="item long">{paperInfo.indefiniteChoiceScore || 0}</div>
<div className="item">{paperInfo.totalScore || 0}</div>
</div>
</div> </div>
</div> }
}
</Form.Item>
<Form.Item label="及格线" <Form.Item label="及格线"
...@@ -297,6 +305,7 @@ function AddExam(props: any) { ...@@ -297,6 +305,7 @@ function AddExam(props: any) {
help={check && !examStartTime && '请选择考试起止时间'} help={check && !examStartTime && '请选择考试起止时间'}
required> required>
<RangePicker <RangePicker
style={{ width: 320 }}
ranges={{ ranges={{
'近七天': [moment(), moment().add(6, 'day').endOf('day')], '近七天': [moment(), moment().add(6, 'day').endOf('day')],
'近1个月': [moment(), moment().add(1, 'month').endOf('day')], '近1个月': [moment(), moment().add(1, 'month').endOf('day')],
......
import React, { useState, useRef, useEffect, useContext } from 'react' import React, { useState, useRef, useEffect, useContext } from 'react'
import { Route, withRouter } from 'react-router-dom'; import { Route, withRouter } from 'react-router-dom';
import Breadcrumbs from "@/components/Breadcrumbs";
import UserData from './UserData';
import ExamData from './ExamData'
import Service from "@/common/js/service";
import { Tabs } from 'antd';
import User from "@/common/js/user";
import './dataAnalysic.less' import './dataAnalysic.less'
function DataAnalysic() { const { TabPane } = Tabs;
function DataAnalysic(props: any) {
const examDetailInit: any = {};
const [selectKey, setSelectKey] = useState('user')
const [examDetail, setExamDetail] = useState(examDetailInit);
const { match } = props;
const examId =match.params.id;
useEffect(() => {
queryExamDetail();
}, [])
function queryExamDetail() {
Service.Hades("public/hades/queryExamDetail", {
examId:examId,
tenantId: User.getStoreId(),
userId: User.getStoreUserId(),
source: 0
}).then((res) => {
const { result } = res
setExamDetail(result)
})
}
return <div className="page dataAnalysic"> return <div className="page dataAnalysic">
<Breadcrumbs navList={"考试数据"} goBack={props.history.goBack} />
<div className="box">
<div className="titleBox ">
<span className='tips'></span>
考试名称:{examDetail.examName}
</div>
</div>
<div className="box">
<Tabs activeKey={selectKey} onChange={(key: any) => {
setSelectKey(key)
}}>
<TabPane tab="考试人员数据" key="user">
<UserData examDetail ={examDetail } examId={examId} />
</TabPane>
<TabPane tab="题目数据" key="exam">
<ExamData examDetail ={examDetail } examId={examId}></ExamData>
</TabPane>
</Tabs>
</div>
</div> </div>
} }
......
import React, { useState, useRef, useEffect, useContext } from 'react'
import Service from "@/common/js/service";
import { PageControl } from "@/components";
import { Input, Select, Tooltip, Button, Table } from 'antd';
import User from "@/common/js/user";
import moment from 'moment';
import './userData.less'
const { Search } = Input;
const { Option } = Select;
interface sortType {
type: "ascend" | "descend" | null | undefined
}
function ExamData(props: any) {
const sortStatus: sortType = {
type: undefined
}
const examDataInit: any = {};
const queryInit: any = { current: 1, size: 10, };
const [examData, setUserData] = useState(examDataInit);
const [list, setList] = useState([]);
const [query, setQuery] = useState(queryInit);
const [total, setTotal] = useState(0);
const [field, setfield] = useState('');
const [order, setOrder] = useState(sortStatus.type);
const questionTypeList = {
SINGLE_CHOICE: "单选题",
MULTI_CHOICE: "多选题",
JUDGE: "判断题",
GAP_FILLING: "填空题",
INDEFINITE_CHOICE: "不定项选择题",
};
const userTypeEnum = {
WE_COM: '企业微信',
WE_CHAT: '微信'
}
const userExamStateEnum = {
EXAM: '进行中',
LACK_EXAM: '缺考',
FINISH_EXAM: '已考试'
}
const orderEnum = {
currentAccuracy: {
ascend: 'ACCURACY_ASC',
descend: 'ACCURACY_DESC'
},
}
const queryRef = useRef({});
useEffect(() => {
queryExamUserData();
}, [])
useEffect(() => {
queryRef.current = query;
queryExamUserDataList();
}, [query])
function queryExamUserData() {
Service.Hades('public/hades/queryExamQuestionData', {
examId: props.examId,
tenantId: User.getStoreId(),
userId: User.getStoreUserId(),
source: 0
}).then((res) => {
setUserData(res.result)
})
}
function queryExamUserDataList() {
Service.Hades('public/hades/queryExamQuestionDataList', {
...query,
examId: props.examId,
tenantId: User.getStoreId(),
userId: User.getStoreUserId(),
source: 0
}).then((res) => {
setList(res.result.records);
setTotal(parseInt(res.result.total))
})
}
const columns = [
{
title: "序号",
dataIndex: "sort",
width: 60
},
{
title: "题目",
dataIndex: "questionStem",
ellipsis: true,
width: 350
},
{
title: "题型",
dataIndex: "questionType",
render: (text: any) => <span>{(questionTypeList as any)[text]}</span>,
filters: Object.keys(questionTypeList).map((key) => {
return {
text: (questionTypeList as any)[key],
value: key
}
}),
},
{
title: "本次正确率",
dataIndex: "currentAccuracy",
sorter: true,
sortOrder: field === "currentAccuracy" ? order : sortStatus.type,
render: (text: any) => <span>{text*100}%</span>,
},
{
title: <div>历史正确率 <Tooltip
overlayClassName="tool-list"
title='包含本次考试正确率'
placement="top"
overlayStyle={{ maxWidth: 700 }}
> <span style={{ color: 'rgba(191, 191, 191, 1)' }} className="icon iconfont">&#xe61d;</span>
</Tooltip>
</div>,
dataIndex: "totalAccuracy",
render: (text: any) => <span>{text*100}%</span>,
},
];
function onChange(pagination: any, filters: any, sorter: any, extra: any) {
console.log(filters, sorter);
setfield(sorter.field);
setOrder(sorter.order)
console.log(sorter.field, sorter.order, (orderEnum as any)[sorter.field])
let _query: any = { ...queryRef.current };
if (filters.questionType) {
_query.questionType = filters.questionType
} else {
delete _query.questionType
}
_query.order = (orderEnum as any)[sorter.field][sorter.order]
setQuery(_query)
}
function download() {
Service.Hades('anon/hades/exportExamData', {
examId: props.examId,
exportDataType: 'EXAM_QUESTION_DATA',
tenantId: User.getStoreId(),
userId: User.getStoreUserId(),
source: 0
}).then((res) => {
const dom =(document as any).getElementById("load-play-back-excel")
dom.setAttribute('href',res.result);
dom.click();
})
}
return <div className="rr">
<a
target="_blank"
download
id="load-play-back-excel"
style={{ position: "absolute", left: "-10000px" }}
></a>
<div className="dataPanal">
<div className="item">
<div className="num">{examData.singleChoiceAccuracy * 100}%</div>
<div className="percent">正确率</div>
<div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fa;</span> 单选题 <span>(共{examData.singleChoiceCnt}题)</span></div></div>
</div>
<div className="item">
<div className="num">{examData.multiChoiceAccuracy * 100}%</div>
<div className="percent">正确率</div>
<div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fb;</span>多选题 <span>(共{examData.multiChoiceCnt}题)</span></div></div>
</div>
<div className="item">
<div className="num">{examData.judgeAccuracy * 100}%</div>
<div className="percent">正确率</div>
<div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fc;</span>判断题 <span>(共{examData.judgeCnt}题)</span></div></div>
</div>
<div className="item">
<div className="num">{examData.gapFillingAccuracy * 100}%</div>
<div className="percent">正确率</div>
<div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fd;</span>填空题 <span>(共{examData.gapFillingCnt}题)</span></div></div>
</div>
<div className="item">
<div className="num">{examData.indefiniteChoiceAccuracy * 100}%</div>
<div className="percent">正确率</div>
<div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fe;</span>不定项选择题 <span>(共{examData.indefiniteChoiceCnt}题)</span></div></div>
</div>
</div>
<Button style={{ marginBottom: 12, marginTop: 12 }} onClick={download} >导出</Button>
<div className="content">
<Table
bordered
size="small"
columns={columns}
dataSource={list}
onChange={onChange}
pagination={false}
>
</Table>
{total > 0 &&
<PageControl
size="small"
current={query.current - 1}
pageSize={query.size}
total={total}
toPage={(page: any) => {
console.log(page)
let _query: any = { ...queryRef.current };
_query.current = page + 1;
setQuery(_query)
}}
/>
}
</div>
</div>
}
export default ExamData;
\ No newline at end of file
import React, { useState, useRef, useEffect, useContext } from 'react' import React, { useState, useRef, useEffect, useContext } from 'react'
import { Row, Input, Select, DatePicker, Tooltip, Button, Table, Dropdown, Menu, Modal } from 'antd'; import {Input, Select, DatePicker, Tooltip, Button, Table, Dropdown, Menu, Modal } from 'antd';
import TeacherSelect from '@/modules/common/TeacherSelect'; import TeacherSelect from '@/modules/common/TeacherSelect';
import { Route, withRouter } from 'react-router-dom'; import { Route, withRouter } from 'react-router-dom';
import Service from "@/common/js/service"; import Service from "@/common/js/service";
...@@ -8,7 +8,7 @@ import { PageControl } from "@/components"; ...@@ -8,7 +8,7 @@ import { PageControl } from "@/components";
import AddExam from './AddExam'; import AddExam from './AddExam';
import User from "@/common/js/user"; import User from "@/common/js/user";
import { XMContext } from "@/store/context"; import { XMContext } from "@/store/context";
import StoreService from "@/domains/store-domain/storeService"; import DataAnalysic from './DataAnalysic'
import './index.less' import './index.less'
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const { Search } = Input; const { Search } = Input;
...@@ -28,8 +28,6 @@ function ExaminationManager(props: any) { ...@@ -28,8 +28,6 @@ function ExaminationManager(props: any) {
type: undefined type: undefined
} }
const sortEnum = { const sortEnum = {
} }
...@@ -129,7 +127,11 @@ function ExaminationManager(props: any) { ...@@ -129,7 +127,11 @@ function ExaminationManager(props: any) {
ctx.xmState?.userPermission?.SeeExamData() && [<div ctx.xmState?.userPermission?.SeeExamData() && [<div
key="data" key="data"
className="operate__item" className="operate__item"
onClick={() => { }} onClick={() => {
props.history.push({
pathname: `${match.url}/analysic/${record.examId}`
})
}}
> >
数据 数据
</div>, </div>,
...@@ -173,9 +175,9 @@ function ExaminationManager(props: any) { ...@@ -173,9 +175,9 @@ function ExaminationManager(props: any) {
}) })
} else { } else {
props.history.push({ props.history.push({
pathname: `${match.url}/edit/${item.examId}` pathname: `${match.url}/edit/${item.examId}`
}) })
} }
}} }}
> >
...@@ -320,6 +322,7 @@ function ExaminationManager(props: any) { ...@@ -320,6 +322,7 @@ function ExaminationManager(props: any) {
</div> </div>
<div className="reset-fold-area"> <div className="reset-fold-area">
<Tooltip title="清空筛选"><span className="resetBtn iconfont icon" onClick={() => { <Tooltip title="清空筛选"><span className="resetBtn iconfont icon" onClick={() => {
setfield('')
setQuery({ current: 1, size: 10, order: 'EXAM_START_TIME_DESC' }); setQuery({ current: 1, size: 10, order: 'EXAM_START_TIME_DESC' });
}}>&#xe61b; </span></Tooltip> }}>&#xe61b; </span></Tooltip>
<span style={{ cursor: 'pointer' }} className="fold-btn" onClick={() => { <span style={{ cursor: 'pointer' }} className="fold-btn" onClick={() => {
...@@ -377,6 +380,12 @@ function ExaminationManager(props: any) { ...@@ -377,6 +380,12 @@ function ExaminationManager(props: any) {
getList() getList()
}} />; }} />;
}} /> }} />
<Route path={`${match.url}/analysic/:id`} render={() => {
return <DataAnalysic />;
}} />
</div> </div>
} }
......
.dataAnalysic{ .dataAnalysic{
.titleBox{
font-size: 19px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
line-height: 26px;
background: #FFFFFF;
// padding: 20px 24px;
// margin-bottom: 8px;
.tips{
width: 4px;
height: 16px;
background: #336DFF;
display: inline-block;
margin-right: 4px;
}
}
} }
\ No newline at end of file
.dataPanal{
border-radius: 4px;
border: 1px solid #E8E8E8;
display: flex;
.item{
text-align: center;
width: 29.9%;
position: relative;
.num{
font-size: 26px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
line-height: 26px;
margin-top: 12px;
}
.percent{
margin-top: 6px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 17px;
height: 20px;
margin-bottom: 18px;
}
.subTitle{
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 20px;
margin-bottom: 12px;
}
.type{
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 20px;
span{
color: rgba(153, 153, 153, 1);
}
.icon{
color: rgba(204, 204, 204, 1);
font-size: 16px;
margin-right: 4px;
}
}
&:after{
content: '';
width: 0px;
height: 40px;
position: absolute;
width: 1px;
background-color: rgba(232, 232, 232, 1);
top: 40px;
right: 0px;
}
}
.exstatus{
width: 4px;
height: 4px;
background: rgb(35, 143, 255);
display: inline-block;
border-radius: 50%;
position: relative;
top: -4px;
}
}
\ No newline at end of file
.paper-list { .paper-list {
.ant-radio-wrapper{
left: -10px;
}
.paper-list-filter { .paper-list-filter {
position: relative; position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment