Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/questiontype/v-fillin.vue

@@ -48,15 +48,15 @@
           <td colspan="2"><span v-if="data&&data.IsMutex==1" style="font-size:13px;">答案顺序打乱也判正确</span></td>
         </tr>
         <tr>
-          <td colspan="2">1. 一个空有多种答案时请用";"隔开。如：水;H2O</td>
+          <td colspan="2" style="height:40px;">1. 一个空有多种答案时请用";"隔开。如：水;H2O</td>
         </tr>
         <tr>
-          <td colspan="2">2. 若试题答案是数字，可设置范围，两个数字之间用"-"。如：1-9，学生填写1到9之间的数字都算正确（包括1和9）</td>
+          <td colspan="2" style="height:40px;">2. 若试题答案是数字，可设置范围，两个数字之间用"-"。如：1-9，学生填写1到9之间的数字都算正确（包括1和9）</td>
         </tr>
       </tbody>
       <tfoot v-if="isShowAnswer">
         <tr v-if="isShowStudentAnswer">
-          <td class="v_fillInBold">
+          <td class="v_fillInBold" style="height:40px;">
             考生答案
           </td>
           <td>
@@ -73,8 +73,8 @@
           </tr>
         </template>
         <tr v-if="isShowStudentAnswer">
-          <td colspan="2">
-            <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分："
+          <td colspan="2" style="height:70px;">
+            <q-input v-if="isEditStudentScore" filled style="width:180px;" v-model="data.StudentScore" label="得分："
               maxlength="20" @input="getQuestionScore" />
             <span v-else class="v_fillInBold">考生得分：{{data.StudentScore}}</span>
           </td>

src/components/questiontype/v-judge.vue

@@ -7,11 +7,17 @@
   .v_judgeQuestionBold {
     font-weight: bold
   }
+  .v_judgeTable tfoot:before{
+    content: "-";
+    display: block;
+    line-height: 1em;
+    color: transparent;
+  }
 
 </style>
 <template>
   <div class="v_judgeQuestion">
-    <table v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable">
+    <table v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable judgeTable">
       <tbody v-for="(item,index) in data.QuestionContentObj" :key="index">
         <tr>
           <td style="width:50px;text-align:center;">
@@ -34,15 +40,15 @@
       </tbody>
       <tfoot v-if="isShowAnswer">
         <tr>
-          <td colspan="2" class="v_judgeQuestionBold">正确答案：{{data.Answer}}</td>
+          <td colspan="2" style="height:40px;" class="v_judgeQuestionBold">正确答案：{{data.Answer}}</td>
         </tr>
         <tr v-if="isShowStudentAnswer">
-          <td colspan="2" class="v_judgeQuestionBold" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">
+          <td colspan="2" class="v_judgeQuestionBold" style="height:40px;" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">
             考生答案：{{data.StundetAnswer}}</td>
         </tr>
         <tr v-if="isShowStudentAnswer">
-          <td colspan="2">
-            <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分："
+          <td colspan="2" style="height:70px;">
+            <q-input v-if="isEditStudentScore" filled style="width:180px" v-model="data.StudentScore" label="得分："
               maxlength="20" @input="getQuestionScore" />
             <span v-else class="v_judgeQuestionBold">考生得分：{{data.StudentScore}}</span>
           </td>

src/components/questiontype/v-multiple.vue

@@ -48,8 +48,8 @@
             :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">考生答案：{{data.StundetAnswer}}</td>
         </tr>
         <tr v-if="isShowStudentAnswer">
-          <td colspan="2" style="height:40px;">
-            <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分："
+          <td colspan="2" style="height:70px;">
+            <q-input v-if="isEditStudentScore" style="width:180px;" filled v-model="data.StudentScore" label="得分："
               maxlength="20" @input="getQuestionScore" />
             <span v-else class="v_multipleQuestionBold">考生得分：{{data.StudentScore}}</span>
           </td>

src/components/questiontype/v-sharingchoose.vue

@@ -74,13 +74,13 @@
       </tbody>
       <tfoot v-if="isShowStudentAnswer">
         <tr>
-          <td colspan="2" class="v_sharingChooseQuestionBold" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">
+          <td colspan="2" class="v_sharingChooseQuestionBold" style="height:70px" :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">
             考生答案：{{data.StundetAnswer}}
           </td>
         </tr>
         <tr>
           <td colspan="2">
-            <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分："
+            <q-input v-if="isEditStudentScore" filled style="width:180px" v-model="data.StudentScore" label="得分："
               maxlength="20" @input="getQuestionScore" />
             <span v-else class="v_sharingChooseQuestionBold">考生得分：{{data.StudentScore}}</span>
           </td>

src/components/questiontype/v-shortanswer.vue

@@ -20,11 +20,11 @@
       <el-input v-model="data.Answer" placeholder="请填写问题答案"> </el-input>
     </div>
     <div v-if="isShowStudentAnswer" style="display:flex;">
-      <div class="v_shortAnswerQuestionBold">考生答案：</div>
+      <div class="v_shortAnswerQuestionBold" style="margin:20px 0">考生答案：</div>
       <div v-html="data.StundetAnswer"></div>
     </div>
-    <div v-if="isShowStudentAnswer" style="display:flex;">
-      <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分："
+    <div v-if="isShowStudentAnswer" style="display:flex;;margin-bottom:20px;">
+      <q-input v-if="isEditStudentScore" filled v-model="data.StudentScore" label="得分："
         maxlength="20" @input="getQuestionScore" />
       <span v-else class="v_shortAnswerQuestionBold">考生得分：{{data.StudentScore}}</span>
     </div>

src/components/questiontype/v-single.vue

@@ -42,8 +42,8 @@
             :style="{color:data.Answer ==data.StundetAnswer?'#67c23a':'red'}">考生答案：{{data.StundetAnswer}}</td>
         </tr>
         <tr v-if="isShowStudentAnswer">
-          <td colspan="2" style="height:40px;">
-            <q-input v-if="isEditStudentScore" standout="bg-primary text-white" v-model="data.StudentScore" label="得分："
+          <td colspan="2" style="height:70px;">
+            <q-input v-if="isEditStudentScore" filled v-model="data.StudentScore" label="得分："
               maxlength="20" @input="getQuestionScore" />
             <span v-else class="v_singleQuestionBold">考生得分：{{data.StudentScore}}</span>
           </td>

src/pages/exam/examtestreview.vue

 <style>
   .examPaperInfo_Top {
-    height: 83px;
+    min-height: 83px;
     border-bottom: 1px solid #d9d9d9;
     display: flex;
-    align-items: center;
     justify-content: space-between;
     margin: 0 100px;
+    padding-bottom:20px;
   }
 
   .Exam-main {
@@ -241,20 +241,25 @@
   .examPaperInfo_Top .vClozeQuestion .clozeTest_question_tit {
     margin: 15px 0;
   }
+ .Exam_PaperNameV2{
+    font-size:20px;
+    font-weight: bold;
+    margin-bottom:5px;
+  }
 
 </style>
 <!--阅卷-->
 <template>
   <div class="examPaper page-body">
     <div class="examPaperInfo_Top">
-      <div>
+      <div style="width:80%;">
         <div>
-          {{DataObj.PaperName}} <br />
-          题量：{{examNum}} &nbsp;&nbsp;&nbsp; 满分：{{examScore}}
-          <br />
-          学生总得分:{{studentScore}}
-          <q-input filled stack-label maxlength="100" :dense="false" v-model="DataObj.StuComment"
-            class="col-6 q-pb-lg q-pr-lg" label="评语" />
+          <div class="Exam_PaperNameV2">{{DataObj.PaperName}}</div>
+          <div style="margin-bottom:10px;">
+            题量：{{examNum}} &nbsp;&nbsp;&nbsp; 满分：{{examScore}}
+            <span style="margin-left:30px;">学生总得分:{{studentScore}}</span>
+          </div>
+          <q-input v-model="DataObj.StuComment" filled type="textarea" placeholder="评语" />
         </div>
       </div>
       <div style="width:20%;text-align:right;">