Skip to content

Commit

Permalink
'update auto_socre'
Browse files Browse the repository at this point in the history
  • Loading branch information
@1257any
1257any committed May 7, 2019
1 parent 66adbe5 commit 151cf58
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 148 deletions.
289 changes: 151 additions & 138 deletions controllers/examination_manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exports.paperInfo = async function (ctx, next) {
// `insert into class values('${data.name}','${data.classId}','${data.subjectId}','',null)`
`select * from create_exam`
);
console.log("result"+JSON.stringify(results));
console.log("result" + JSON.stringify(results));

// ctx.body = {
// "respCode" : "1",
Expand Down Expand Up @@ -277,127 +277,127 @@ exports.set_teacher = async function (ctx, next) {
//修改教师
exports.get_stu_answer = async function (ctx, next) {
try {
const result = ctx.request.body;
const connection = connectionModel.getConnection();
const query = bluebird.promisify(connection.query.bind(connection));
const result = ctx.request.body;
const connection = connectionModel.getConnection();
const query = bluebird.promisify(connection.query.bind(connection));
// // console.log('a'+JSON.stringify(data.params.managerId));
console.log('stuId'+result.stuId)
const data = await query(
`select * from student_answer where student_no ='${result.stuId}'`
);
console.log("data",JSON.stringify(data));
if(data.length){
ctx.body = {
"respCode": "1",
data
// "data": [{
// "answer": "a",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 1,
// "questionstem": "填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空题干？",
// "type": 1
// }, {
// "answer": "b",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 2,
// "questionstem": "填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空的飞洒发斯蒂芬啊大丰收sad",
// "type": 1
// }, {
// "answer": "c",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 3,
// "questionstem": "简答简答简答简答简答简答简答简答简答简答简答简答简答简答的飞洒发斯蒂芬啊大丰收sad",
// "type": 5
// }, {
// "answer": "d",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 4,
// "questionstem": "dfja简答简答简答简答简答简答简答简答简答slkfjalksdjflkasjti题干？",
// "type": 5
// }, {
// "answer": "e",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 5,
// "questionstem": "的飞洒发斯简答简答简答简答简答简答简答简答简答简答简答简答蒂芬啊大丰收sad",
// "type": 5
// }, {
// "answer": "f",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 6,
// "questionstem": "程序题的飞程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题洒发斯蒂芬啊大丰收sad",
// "type": 6
// }, {
// "answer": "g",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 7,
// "questionstem": "dfjaslkfjalksdjf程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题lkasjti题干？",
// "type": 6
// }, {
// "answer": "h",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 8,
// "questionstem": "填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空的飞洒发斯蒂芬啊大丰收sad",
// "type": 1
// }]
console.log('stuId' + result.stuId)
const data = await query(
`select * from student_answer where student_no ='${result.stuId}'`
);
console.log("data", JSON.stringify(data));
if (data.length) {
ctx.body = {
"respCode": "1",
data
// "data": [{
// "answer": "a",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 1,
// "questionstem": "填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空题干？",
// "type": 1
// }, {
// "answer": "b",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 2,
// "questionstem": "填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空的飞洒发斯蒂芬啊大丰收sad",
// "type": 1
// }, {
// "answer": "c",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 3,
// "questionstem": "简答简答简答简答简答简答简答简答简答简答简答简答简答简答的飞洒发斯蒂芬啊大丰收sad",
// "type": 5
// }, {
// "answer": "d",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 4,
// "questionstem": "dfja简答简答简答简答简答简答简答简答简答slkfjalksdjflkasjti题干？",
// "type": 5
// }, {
// "answer": "e",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 5,
// "questionstem": "的飞洒发斯简答简答简答简答简答简答简答简答简答简答简答简答蒂芬啊大丰收sad",
// "type": 5
// }, {
// "answer": "f",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 6,
// "questionstem": "程序题的飞程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题洒发斯蒂芬啊大丰收sad",
// "type": 6
// }, {
// "answer": "g",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 7,
// "questionstem": "dfjaslkfjalksdjf程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题程序题lkasjti题干？",
// "type": 6
// }, {
// "answer": "h",
// "gradeId": 0,
// "pointId": 0,
// "questionId": 8,
// "questionstem": "填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空填空的飞洒发斯蒂芬啊大丰收sad",
// "type": 1
// }]


};
}else {
ctx.body = {
respCode:"-1",
respMsg : '暂无作答'
};
};
} else {
ctx.body = {
respCode: "-1",
respMsg: '暂无作答'
};
}
connection.end();
connection.end();
} catch (e) {
console.log('[/user/login] error:', e.message, e.stack);
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
}
};
//修改教师
exports.submit_score = async function (ctx, next) {
try {
const data = ctx.request.body;
const connection = connectionModel.getConnection();
const query = bluebird.promisify(connection.query.bind(connection));
// console.log('a'+JSON.stringify(data.params.managerId));
// console.log('content'+data.content)
//非选择题的总分
// const username = localStorage.userName;
const results = await query(
`insert into student_grade value(null,'${data.totalScore}',null,'${data.stuId}',null,'${data.username}','${data.classId}')`
);
console.log("result",JSON.stringify(results));
if(!results.length){
ctx.body = {
respCode: 1,
results,
respMsg:'更新成功'
};
}else {
ctx.body = {
"respCode": "1",
"respMsg": "提交成功"
};
const data = ctx.request.body;
const connection = connectionModel.getConnection();
const query = bluebird.promisify(connection.query.bind(connection));
// console.log('a'+JSON.stringify(data.params.managerId));
// console.log('content'+data.content)
//非选择题的总分
// const username = localStorage.userName;
const results = await query(
`insert into student_grade value(null,'${data.totalScore}',null,'${data.stuId}',null,'${data.username}','${data.classId}')`
);
console.log("result", JSON.stringify(results));
if (!results.length) {
ctx.body = {
respCode: 1,
results,
respMsg: '更新成功'
};
} else {
ctx.body = {
"respCode": "1",
"respMsg": "提交成功"
};
}
connection.end();
connection.end();
} catch (e) {
console.log('[/user/login] error:', e.message, e.stack);
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
}
};
//修改教师
Expand Down Expand Up @@ -449,42 +449,55 @@ exports.search_papers = async function (ctx, next) {
// connection.end();
} catch (e) {
console.log('[/user/login] error:', e.message, e.stack);
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
};
}
//开始阅卷
exports.auto_read = async function (ctx, next) {
try {
// const data = ctx.request.body;
// const connection = connectionModel.getConnection();
// const query = bluebird.promisify(connection.query.bind(connection));
// // console.log('a'+JSON.stringify(data.params.managerId));
// // console.log('content'+data.content)
// const results = await query(
// `update user set name='${data.name}' id ='${data.id}' where
// id='${data.old_id}'`
// );
// console.log("result",JSON.stringify(results));
// if(!results.length){
// ctx.body = {
// respCode: 1,
// results,
// respMsg:'更新成功'
// };
// }else {
ctx.body = {
"respCode": "1"
};
// }
// connection.end();
const data = ctx.request.body;
const connection = connectionModel.getConnection();
const query = bluebird.promisify(connection.query.bind(connection));
// console.log('a'+JSON.stringify(data.params.managerId));
// console.log('content'+data.content)
let auto_score = 0;
const results = await query(
`select question_id,answer from student_answer where student_no = '${data.stuId}' and (question_type = '0' or question_type = '1' or question_type = '2')`
);
// results.map((item,index)=>{
for(let i =0;i<results.length;i++){
let answer =await query(
`select answer from question_insert where id = '${results[i].question_id}'`
)
console.log('answer'+JSON.stringify(answer));
if(results[i].answer == answer[0].answer){
auto_score +=2;
console.log('score'+auto_score)
}
}

// })
console.log("result", JSON.stringify(results));
if (results.length) {
ctx.body = {
respCode: 1,
auto_score,
respMsg: '更新成功'
};
} else {
ctx.body = {
"respCode": "1"
};
}
connection.end();
} catch (e) {
console.log('[/user/login] error:', e.message, e.stack);
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
ctx.body = {
respCode: e.code || -1,
respMsg: e.message
};
}
}
16 changes: 14 additions & 2 deletions src/containers/main/paper_manage/reading_paper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class ReadingPaper extends React.Component {
fillInList : [],
shortAnswerList : [],
programList : [],
auto_score:''
}
this.gapscorelist = [];
this.shoscorelist = [];
Expand Down Expand Up @@ -113,7 +114,7 @@ class ReadingPaper extends React.Component {
// });
// return;
// }

console.log('auto_score'+typeof this.state.auto_score)
httpServer({
method:'post',
url : URL.submit_score
Expand All @@ -124,7 +125,7 @@ class ReadingPaper extends React.Component {
gapscorelist : this.gapscorelist,
shoscorelist : this.shoscorelist,
proscorelist : this.proscorelist,
totalScore : totalScore,
totalScore : totalScore+parseInt(this.state.auto_score),
updateType : 2,
})
.then((res)=>{
Expand All @@ -137,6 +138,17 @@ class ReadingPaper extends React.Component {
// this.props.match.params.paperId}/${this.props.match.params.classId}
console.log('instId'+this.props.match.params.stuId)
this.getStuAnswer(this.props.match.params.stuId);
httpServer({
method:'post',
url : URL.auto_read
},{
stuId:this.props.match.params.stuId
}) .then((res)=>{
console.log('reshrerh'+JSON.stringify(res))
let auto_score = parseInt(res.data.auto_score)
console.log('auto_score'+auto_score)
this.setState({auto_score,auto_score})
})
}

render(){
Expand Down
8 changes: 0 additions & 8 deletions src/containers/main/paper_manage/scoring_paper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,6 @@ class ScoringPaper extends React.Component {
console.log("data[i]",this.state.data[i])
this.state.curPaperInfo = this.state.data[i];
this.setState({curPaperInfo : this.state.curPaperInfo});
httpServer({
method:'post',
url : URL.auto_read
},{
className : 'StuExamBatchImpl',
classId : this.state.curPaperInfo.classId,
paperId : this.state.curPaperInfo.paperId,
})
this.props.history.push("/main/paper_manage/scoring/all_papers/"+this.state.curPaperInfo.paperId+"/"+this.state.curPaperInfo.classId);//react-router 4.0 写法
}

Expand Down

0 comments on commit 151cf58

Please sign in to comment.