From 545037e97c521d5021b5b9d46968915dfd7dc3c4 Mon Sep 17 00:00:00 2001
From: "1596579598@qq.com" <1596579598@qq.com>
Date: Wed, 15 May 2019 10:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=98=20small=20adjust=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/create_examination.js                 | 8 +++++---
 controllers/examination_manager.js                | 4 ++--
 controllers/student_function.js                   | 2 +-
 dist/index.html                                   | 4 ++--
 src/containers/main/paper_manage/scoring_paper.js | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/controllers/create_examination.js b/controllers/create_examination.js
index 40bca54..547ff88 100644
--- a/controllers/create_examination.js
+++ b/controllers/create_examination.js
@@ -11,11 +11,13 @@ exports.paperInfo= async function(ctx, next){
 		const connection = connectionModel.getConnection();
 		const query = bluebird.promisify(connection.query.bind(connection));
         let question = JSON.parse(data.paperInfo);
-        // console.log(JSON.parse(data.paperInfo).questionObjects)
+        console.log(JSON.parse(data.paperInfo).questionObjects)
             for(let i =0; i<question.questionObjects.length;i++){
                 for(let j in question.questionObjects[i].knowledgePointInfo){
-                    // console.log(question.questionObjects[i].knowledgePointInfo[j])
-                    const results = await query( `insert into exam_content values(null,'${exam_id}','${question.questionObjects[i].questionType}','${j}','${question.questionObjects[i].knowledgePointInfo[j]}','${question.questionObjects[i].score}',null,null)`)
+                    console.log('j'+j);
+                    console.log()
+                    console.log(question.questionObjects[i])
+                    const results = await query( `insert into exam_content values(null,'${exam_id}','${question.questionObjects[i].questionType}',${j},'${question.questionObjects[i].knowledgePointInfo[j]}',${question.questionObjects[i].score})`)
                 }
                    
             }
diff --git a/controllers/examination_manager.js b/controllers/examination_manager.js
index 2b264f2..d334557 100644
--- a/controllers/examination_manager.js
+++ b/controllers/examination_manager.js
@@ -134,7 +134,7 @@ exports.get_stu_papers = async function (ctx, next) {
     const connection = connectionModel.getConnection();
     const query = bluebird.promisify(connection.query.bind(connection));
     const data = await query(
-      `select * from create_exam`
+      `select * from exam_content`
     );
     console.log('paperewtw' + JSON.stringify(data));
     if (data.length) {
@@ -195,7 +195,7 @@ exports.create_exam = async function (ctx, next) {
     )
     console.log("class" + JSON.stringify(class_id))
     const results = await query(
-      `insert into create_exam values(null,'${class_id[0].class_id}','${data.examName}','${data.classId}','${data.paperId}','${startTime}','${endTime}','${data.paperId}')`
+      `insert into create_exam values(null,'${class_id[0].class_id}','${data.examName}','${data.classId}','${data.paperId}','${startTime}','${endTime}','${data.paperId}',null,null)`
     );
     console.log("result", JSON.stringify(results));
     if (results.length) {
diff --git a/controllers/student_function.js b/controllers/student_function.js
index dec2bb1..8f6d610 100644
--- a/controllers/student_function.js
+++ b/controllers/student_function.js
@@ -40,7 +40,7 @@ exports.get_question = async function (ctx, next) {
 						// console.log("把题目内容查出来"+JSON.stringify(sm_question))
 						for(let j =0 ;j<question[i].num;j++){
 							  sm_question = await query(
-								`select * from question_insert where knowlege_type ='${question[i].knowledge}' and question_type = '${question[i].question_type}'`
+								`select * from question_insert where knowlege_type ='${question[i].knowledge}' and question_type = '${question[i].question_type-1}'`
 						)
 							allquestion.push(sm_question[j])
 						}
diff --git a/dist/index.html b/dist/index.html
index f336147..3d2d875 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -5,8 +5,8 @@
 		<title></title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 		<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
-	<link href="./css/app.d2fb1683.css" rel="stylesheet"></head>
+	<link href="./css/app.be238d4f.css" rel="stylesheet"></head>
 	<body>
 		<div id="app"></div>
-	<script type="text/javascript" src="./js/vendor.dca76adb.js"></script><script type="text/javascript" src="./js/app.d2fb1683.js"></script></body>
+	<script type="text/javascript" src="./js/vendor.19b14ca0.js"></script><script type="text/javascript" src="./js/app.be238d4f.js"></script></body>
 </html>
diff --git a/src/containers/main/paper_manage/scoring_paper.js b/src/containers/main/paper_manage/scoring_paper.js
index 603ffd7..a738014 100644
--- a/src/containers/main/paper_manage/scoring_paper.js
+++ b/src/containers/main/paper_manage/scoring_paper.js
@@ -268,7 +268,7 @@ class ScoringPaper extends React.Component {
         <span>
           {
             this.state.data[record.key].status ?
-            <Button type="primary" size="small" onClick={this.beginScoring.bind(this,record.key)}>开始阅卷</Button>:  <Button type="primary" disabled size="small">开始阅卷</Button>
+              <Button type="primary" disabled size="small">开始阅卷</Button>:<Button type="primary" size="small" onClick={this.beginScoring.bind(this,record.key)}>开始阅卷</Button>
           }
         </span>
       ),