Open-CT
/
openscore
1
0
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/frontend' into frontend 

# Conflicts:
#	controllers/Administrator.go
#	controllers/supervisor.go
#	lastupdate.tmp
This commit is contained in:
chenh1 2021-10-01 19:29:05 +08:00
parent 1a698c2fe8 55c9eeca72
commit 3767579468
10 changed files with 88 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/src/menu/menuTab.js
View File

@ -37,15 +37,15 @@ export default [
chidPermissions: [
]
},
{
key: "selfMark",
userPermission: "阅卷员",
menu_name: "自评",
menu_url: "/home/selfMark",
icon: "SolutionOutlined",
chidPermissions: [
]
},
// {
// key: "selfMark",
// userPermission: "阅卷员",
// menu_name: "自评",
// menu_url: "/home/selfMark",
// icon: "SolutionOutlined",
// chidPermissions: [
// ]
// },
{
key: "mark_monitor",
userPermission: "组长",
@ -174,7 +174,7 @@ export default [
{
key: "paper",
userPermission: "管理员",
menu_name: "导入导出试卷",
menu_name: "试卷导入",
menu_url: "/home/management/paper",
icon: "",
chidPermissions: [

4
web/src/views/Group/mark_monitor/all/index.jsx
View File

@ -39,7 +39,7 @@ export default class index extends Component {
{
title: '分配人数',
width: 90,
dataIndex: 'DistributionNumber',
dataIndex: 'DistributionUserNumber',
},
{
title: '完成量',
@ -305,7 +305,7 @@ export default class index extends Component {
}
tableData = () => {
group.allMonitor({ supervisorId: "2",subjectName: JSON.parse(localStorage.getItem('userInfo')).SubjectName})
group.allMonitor({ supervisorId: "2",subject: JSON.parse(localStorage.getItem('userInfo')).SubjectName})
.then((res) => {
if (res.data.status == "10000") {
let tableData = [];

4
web/src/views/Group/mark_monitor/standard/index.jsx
View File

@ -84,7 +84,7 @@ export default class index extends Component {
dataIndex: 'UserName',
},
{
title: '小题标准差',
title: '标准差',
width: 180,
dataIndex: 'Deviation',
}
@ -116,7 +116,7 @@ export default class index extends Component {
</Select>
</div>
<div className="question-score">
满分：{this.state.fullScore}
{/* 满分：{this.state.fullScore} */}
</div>
</div>
<div className="display-container">

2
web/src/views/Group/test_monitor/arbitration/index.jsx
View File

@ -22,7 +22,7 @@ export default class index extends Component {
}
questionList = () => {
group.questionList({ supervisorId: "2" })
group.questionList({ adminId: "1",subjectName: JSON.parse(localStorage.getItem('userInfo')).SubjectName})
.then((res) => {
if (res.data.status == "10000") {
this.setState({

4
web/src/views/Group/test_monitor/marking/index.jsx
View File

@ -12,7 +12,7 @@ export default class index extends Component {
componentDidMount() {
this.questionList();
}
// 选择区
state = {
questionList: [],
@ -22,7 +22,7 @@ export default class index extends Component {
}
questionList = () => {
group.questionList({ supervisorId: "2" })
group.questionList({ adminId: "1",subjectName: JSON.parse(localStorage.getItem('userInfo')).SubjectName})
.then((res) => {
if (res.data.status == "10000") {
this.setState({

2
web/src/views/Group/test_monitor/problem/index.jsx
View File

@ -43,7 +43,7 @@ export default class index extends Component {
}
questionList = () => {
group.questionList({ supervisorId: "2" })
group.questionList({ adminId: "1",subjectName: JSON.parse(localStorage.getItem('userInfo')).SubjectName})
.then((res) => {
if (res.data.status == "10000") {
this.setState({

2
web/src/views/Home/index.jsx
View File

@ -277,7 +277,7 @@ export default class index extends Component {
<Route path="/home/answer" component={Answer} exact></Route>
<Route path="/home/sample" component={Sample} exact></Route>
<Route path="/home/review" component={Review} exact></Route>
<Route path="/home/selfMark" component={SelfMark} exact></Route>
{/* <Route path="/home/selfMark" component={SelfMark} exact></Route> */}
<Route path="/home/markMonitor/all" component={all} exact></Route>
<Route path="/home/markMonitor/average" component={average} exact></Route>

24
web/src/views/Manage/paper_manage/allot/index.jsx
View File

@ -22,6 +22,7 @@ export default class index extends Component {
subjectValue: undefined,
questionValue: undefined,
loading: false,
ScoreType:undefined
}
componentDidMount() {
@ -64,6 +65,7 @@ export default class index extends Component {
questionList: res.data.data.questionsList,
ImportTestNumber: undefined,
OnlineNumber: undefined,
ScoreType:undefined,
testNumber: undefined,
userNumber: undefined
})
@ -93,7 +95,8 @@ export default class index extends Component {
if (res.data.status === "10000") {
this.setState({
ImportTestNumber: res.data.data.distributionInfoVO.ImportTestNumber,
OnlineNumber: res.data.data.distributionInfoVO.OnlineNumber
OnlineNumber: res.data.data.distributionInfoVO.OnlineNumber,
ScoreType:res.data.data.distributionInfoVO.ScoreType,
})
}
})
@ -116,7 +119,7 @@ export default class index extends Component {
})
Manage.distributePaper({ adminId: this.adminId, questionId: this.state.questionValue, testNumber: Number(this.state.testNumber), userNumber: Number(this.state.userNumber) })
.then((res) => {
// if (res.data.status === "10000") {
if (res.data.status === "10000") {
this.setState({
loading: false,
questionList: [],
@ -124,10 +127,11 @@ export default class index extends Component {
OnlineNumber: undefined,
testNumber: undefined,
userNumber: undefined,
questionValue: undefined
questionValue: undefined,
ScoreType:undefined
})
message.success('试卷分配成功！')
// }
}
})
.catch((e) => {
console.log(e)
@ -143,8 +147,16 @@ export default class index extends Component {
this.props.history.push({pathname:"/home/management/detailTable",query:{subjectName:this.state.subjectValue}})
}else {
message.warning('请先选择科目！')
}
}
ScoreType = () => {console.log('111111')
if (this.state.ScoreType === 1) {
return '否'
} else if (this.state.ScoreType === 1) {
return '是'
}else {
return null
}
}
render() {
return (
@ -192,7 +204,7 @@ export default class index extends Component {
未分配试卷数：{this.state.ImportTestNumber}
</div>
<div className="setting-item">
是否需要二次阅卷：否
是否需要二次阅卷：{this.ScoreType()}
</div>
</div>
<div className="setting-input" style={{ marginTop: 24 }}>

48
web/src/views/Manage/paper_manage/paper/index.jsx
View File

@ -19,7 +19,7 @@ export default class index extends Component {
render() {
const props = {
const props_1 = {
name: 'excel',
action: 'http://localhost:8080/openct/marking/admin/readExcel',
headers: {
@ -36,11 +36,51 @@ export default class index extends Component {
}
},
}
const props_2 = {
name: 'excel',
action: 'http://localhost:8080/openct/marking/admin/readExapmleExcel',
headers: {
authorization: 'authorization-text',
},
onChange(info) {
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList);
}
if (info.file.status === 'done') {
message.success(`${info.file.name} file uploaded successfully`);
} else if (info.file.status === 'error') {
message.error(`${info.file.name} file upload failed.`);
}
},
}
const props_3 = {
name: 'excel',
action: 'http://localhost:8080/openct/marking/admin/readAnswerExcel',
headers: {
authorization: 'authorization-text',
},
onChange(info) {
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList);
}
if (info.file.status === 'done') {
message.success(`${info.file.name} file uploaded successfully`);
} else if (info.file.status === 'error') {
message.error(`${info.file.name} file upload failed.`);
}
},
}
return (
<DocumentTitle title='试卷管理-导入导出试卷'>
<div className="question-page" data-component="question-page">
<Upload {...props}>
<Button icon={<UploadOutlined />}>导入试卷</Button>
<div className="export-page" data-component="export-page">
<Upload {...props_1}>
<Button icon={<UploadOutlined />} style={{marginRight: 24}}>导入试卷</Button>
</Upload>
<Upload {...props_2}>
<Button icon={<UploadOutlined />} style={{marginRight: 24}}>导入样卷</Button>
</Upload>
<Upload {...props_3}>
<Button icon={<UploadOutlined />} style={{marginRight: 24}}>导入答案</Button>
</Upload>
</div>
</DocumentTitle>

7
web/src/views/Manage/paper_manage/paper/index.less
View File

@ -0,0 +1,7 @@
[data-component=export-page]{
width: 100%;
height: 100%;
background-color: #E5E5E5;
padding: 24px 24px 0 24px;
display: flex;
}