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

src/components/course/lesson-form.vue

@@ -303,7 +303,7 @@
           <template v-slot:body-cell-signUser="props">
             <q-td>
               <div v-for="(item,index) in props.row.TimeList" class="lessForm_Class">
-                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="签到"
+                <q-btn v-if="props.row.IsEndDate" flat size="xs" icon="edit" color="accent" style="font-weight:400" label="签到"
                   @click.stop="getClicked(props.row,item)"></q-btn>
               </div>
             </q-td>

src/components/exam/exampaperlist.vue

@@ -125,8 +125,9 @@
               v-if="currentUserInfo.Id==props.row.CreateBy" />
           </template>
           <template v-if="props.row.PaperType==2">
+        
             <q-btn flat size="xs" color="primary" icon="edit" style="font-weight:400" @click="goExameEdit(props.row)" label="编辑"
-              v-if="currentUserInfo.Id==props.row.CreateBy &&(props.row.ExamineStatus==0||props.row.ExamineStatus==3||props.row.ExamineStatus==4)" />
+               />
             <q-btn flat size="xs" color="primary" icon="iconfont icon-View" style="font-weight:400" @click="showPaperInfo(props.row)" label="详情"/>
           </template>
           <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px">

src/components/questiontype/v-readingcomprehensio.vue

@@ -28,8 +28,8 @@
 <template>
   <div class="v_readingComprehensioQuestion">
     <template v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0">
-      <table class="common_TiTable" v-for="(item,index) in data.QuestionContentObj" :key="index">
-        <thead>
+      <table class="common_TiTable">
+        <tbody v-for="(item,index) in data.QuestionContentObj" :key="index">
           <tr>
             <th colspan="2" style="text-align:left;">
               <div class="clozeTest_question_tit">
@@ -41,8 +41,6 @@
               </div>
             </th>
           </tr>
-        </thead>
-        <tbody>
           <tr>
             <td colspan="2">
               <div style="margin:16px 0;" v-html="item.SubTitle"></div>
@@ -60,7 +58,7 @@
                     </div>
                   </template>
                   <template v-else-if="isOperate">
-                    <div class="Answer_List2" @click="ChangeItem(item,subItem)"
+                    <div class="Answer_List2" style="cursor:pointer;" @click="ChangeItem(item,subItem)"
                       :class="{'Is_Answer':subItem.IsAnswer }">
                       {{subItem.Name}}
                     </div>
@@ -78,7 +76,7 @@
                     </div>
                   </template>
                   <template v-else-if="isOperate">
-                    <div class="Answer_List" @click="changeMutile(subItem)" :class="{'Is_Answer':subItem.IsAnswer}">
+                    <div class="Answer_List" style="cursor:pointer;" @click="changeMutile(subItem)" :class="{'Is_Answer':subItem.IsAnswer}">
                       {{subItem.Name}}
                     </div>
                   </template>
@@ -99,7 +97,7 @@
           <template v-if="item.QuestionKey=='fill-in'">
             <template v-if="isShowAnswer">
               <tr v-for="(subItem,subIndex) in item.SubAnwser" :key="subIndex">
-                <td style="width:50px;text-align:center;padding-top:8px;">
+                <td style="width:70px;text-align:center;padding-top:8px;">
                   第{{subIndex+1}}空
                 </td>
                 <td>
@@ -165,6 +163,28 @@
             </template>
           </template>
         </tbody>
+        <tfoot v-if="isShowStudentAnswer">
+          <template v-if="data.AnswerList">
+            <tr>
+              <td colspan="2" style="font-weight:bold">
+                学生答案
+              </td>
+            </tr>
+            <tr v-for="(item,index) in data.AnswerList" :key="index">
+              <td style="font-weight:bold">
+                第 {{index+1}} 题
+              </td>
+              <td style="font-weight:bold">
+                {{item.Content}}
+              </td>
+            </tr>
+          </template>
+          <tr>
+            <td colspan="2">
+              <q-input standout="bg-primary text-white" v-model="data.StundetScore" label="得分：" maxlength="20" />
+            </td>
+          </tr>
+        </tfoot>
       </table>
     </template>
   </div>

src/pages/exam/examtestreview.vue

@@ -251,7 +251,10 @@
         <div>
           {{DataObj.PaperName}} <br />
           题量：{{examNum}} &nbsp;&nbsp;&nbsp; 满分：{{examScore}}
+          <br />
 
+          <q-input filled stack-label maxlength="100" :dense="false" v-model="DataObj.StuComment"
+            class="col-6 q-pb-lg q-pr-lg" label="评语" />
         </div>
       </div>
       <div style="width:20%;text-align:right;">
@@ -363,7 +366,6 @@
     data() {
       return {
         msg: {
-          Id: 0,
           GuestId: 0,
           PaperId: 0,
           PublishId: 0,
@@ -371,6 +373,7 @@
         },
         //试卷对象
         DataObj: {
+          StuComment: "", //学员评语
           PaperId: 0, //试卷编号
           PaperName: '', //试卷名称
           GuestId: 0, //学员编号
@@ -386,9 +389,6 @@
     },
     created() {
       if (this.$route.query) {
-        if (this.$route.query.Id && this.$route.query.Id > 0) {
-          this.msg.Id = this.$route.query.Id;
-        }
         if (this.$route.query.GuestId && this.$route.query.GuestId > 0) {
           this.msg.GuestId = this.$route.query.GuestId;
         }
@@ -437,7 +437,7 @@
       GetPaperInfo() {
         queryPaperDetails(this.msg).then(res => {
           var tempData = res.Data;
-          console.log("tempData",tempData);
+          console.log("tempData", tempData);
           if (res.Code == 1) {
             this.DataObj.PaperId = tempData.Paper.PaperId;
             this.DataObj.PaperName = tempData.Paper.PaperName;