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

src/components/questiontype/matching.vue

@@ -42,7 +42,7 @@
   <div class="matchingQuestion">
     <span class="team_tit" style="margin-top:20px;padding-bottom:0;">第1组：</span>
     <table v-if="data&&data.length>0" class="common_TiTable">
-      <tr v-for="(item,index) in data[0]">
+      <tr v-for="(item,index) in data[0]" :key="index">
         <td style="width:40px;text-align:center;padding-top:10px;">
           {{item.Name}}
         </td>
@@ -66,7 +66,7 @@
     </table>
     <span class="team_tit">第2组：</span>
     <table v-if="data&&data.length>1" class="common_TiTable">
-      <tr v-for="(item,index) in data[1]">
+      <tr v-for="(item,index) in data[1]" :key="index">
         <td style="width:40px;text-align:center;padding-top:10px;">
           {{item.Name}}
         </td>
@@ -90,7 +90,7 @@
     </table>
     <span class="team_tit">答案</span>
     <table v-if="data&&data.length>2" style="padding-left:13px;">
-      <tr v-for="(item,index) in data[0]">
+      <tr v-for="(item,index) in data[0]" :key="index">
         <td style="width:30px;">
           {{item.Name}}
         </td>

src/components/questiontype/v-cloze.vue

@@ -72,8 +72,8 @@
           </tr>
           <tr v-if="isShowStudentAnswer">
             <td colspan="2">
-              <span style="font-weight:bold;">考试答案：</span>
-              <span>
+              <span style="font-weight:bold;">考生答案：</span>
+              <span style="font-weight:bold;">
                 {{data.StundetAnswer}}
               </span>
             </td>

src/components/questiontype/v-matching.vue

@@ -30,7 +30,7 @@
           <th colspan="2">第二组</th>
         </tr>
       </thead>
-      <tr v-for="(item,index) in data.QuestionContentObj[0]">
+      <tr v-for="(item,index) in data.QuestionContentObj[0]" :key="index">
         <td style="width:40px;text-align:center;padding-top:10px;">
           {{item.Name}}
         </td>
@@ -79,7 +79,7 @@
       </tr>
       <tfoot>
         <tr v-if="isShowStudentAnswer">
-          <td colspan="3">
+          <td colspan="3" style="font-weight:bold">
             考生答案：{{data.StundetAnswer}}
           </td>
         </tr>

src/components/questiontype/v-sharingchoose.vue

@@ -63,7 +63,7 @@
       </tbody>
       <tfoot v-if="isShowStudentAnswer">
         <tr>
-          <td colspan="2">
+          <td colspan="2" style="font-weight:bold;">
             考生答案：{{data.StundetAnswer}}
           </td>
         </tr>

src/components/questiontype/v-sortingproblem.vue

@@ -73,8 +73,8 @@
       </tr>
       <tr v-if="isShowStudentAnswer">
         <td>
-          <span style="font-weight:bold;">考试答案：</span>
-          <span>
+          <span style="font-weight:bold;">考生答案：</span>
+          <span style="font-weight:bold;">
             {{data.StundetAnswer}}
           </span>
         </td>

src/pages/exam/examineeManager.vue

@@ -140,17 +140,17 @@
       //跳转到考试详情
       gotoExamTest(item) {
         var qMsg = {
-          Id: item.Id,
           GuestId: item.GuestId,
           PaperId: item.PaperId,
+          PublishId:item.PublishId,
         };
         this.OpenNewUrl('/exam/examtest', qMsg);
       },
       gotoExamTestReview(item) {
         var qMsg = {
-          Id: item.Id,
           GuestId: item.GuestId,
           PaperId: item.PaperId,
+          PublishId:item.PublishId,
         };
         this.OpenNewUrl('/exam/examtestreview', qMsg);
       }

src/pages/exam/examtest.vue

@@ -360,9 +360,9 @@
     data() {
       return {
         msg: {
-          Id: 0,
           GuestId: 0,
-          PaperId: 0
+          PaperId: 0,
+          PublishId: 0,
         },
         //试卷对象
         DataObj: {
@@ -381,15 +381,15 @@
     },
     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;
         }
         if (this.$route.query.PaperId && this.$route.query.PaperId > 0) {
           this.msg.PaperId = this.$route.query.PaperId;
         }
+        if (this.$route.query.PublishId && this.$route.query.PublishId > 0) {
+          this.msg.PublishId = this.$route.query.PublishId;
+        }
       }
     },
     mounted() {

src/pages/exam/examtestreview.vue

@@ -366,6 +366,7 @@
           Id: 0,
           GuestId: 0,
           PaperId: 0,
+          PublishId: 0,
           isShowAnswer: true,
         },
         //试卷对象
@@ -394,6 +395,9 @@
         if (this.$route.query.PaperId && this.$route.query.PaperId > 0) {
           this.msg.PaperId = this.$route.query.PaperId;
         }
+        if (this.$route.query.PublishId && this.$route.query.PublishId > 0) {
+          this.msg.PublishId = this.$route.query.PublishId;
+        }
       }
     },
     mounted() {
@@ -433,6 +437,7 @@
       GetPaperInfo() {
         queryPaperDetails(this.msg).then(res => {
           var tempData = res.Data;
+          console.log("tempData",tempData);
           if (res.Code == 1) {
             this.DataObj.PaperId = tempData.Paper.PaperId;
             this.DataObj.PaperName = tempData.Paper.PaperName;

src/pages/koreaUpload.vue

@@ -83,7 +83,7 @@
                         return false;
                     }
                 }
-                UploadViittoFile('korea', files, res => {
+                UploadViittoFile('korea/Test/Upload', files, res => {
                     console.log(res)
                     if (res.Code == 1) {
                         res.data = this.data;