Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu

src/api/exam.js

@@ -22,4 +22,16 @@ export function getPaperDetail(data) {
         method: 'post',
         data
     })
+}
+
+/**
+ * 提交试卷
+ * @param {JSON参数} data 
+ */
+export function submitPaper(data) {
+    return request({
+        url: '/AppletIndex/GetSetStudentPaperDetails',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file

src/components/subject/answer.vue

@@ -37,6 +37,7 @@
                 item1.QuestionTypeKey === 'reading-comprehensio' ||
                 item1.QuestionTypeKey === 'listening'
               "
+              @click="chooseTopic(index, index1)"
               >{{ index1 + 1 }}.</view
             >
             <view
@@ -66,7 +67,7 @@
       </view>
     </view>
     <view class="submitBox">
-      <view class="submit">立即提交</view>
+      <view class="submit" @click="savePaper">立即提交</view>
     </view>
     <van-toast id="van-toast" />
   </view>
@@ -84,12 +85,12 @@ import {
   onMounted,
 } from "vue";
 import { changeNumToHan } from "../../utils/index";
+// import { submitPaper } from "../../utils/exam";
 export default {
   props: {
     paperData: Object,
   },
   setup(props, ctx) {
-    console.log(84, ctx);
     let Gid = uni.getStorageSync("userInfo").Id;
     let data = reactive({
       msg: { GuestId: Gid, PaperId: 5, PublishId: 1 },
@@ -112,8 +113,11 @@ export default {
       back() {
         ctx.emit("hideAnswer");
       },
+      //交卷
+      savePaper() {
+        console.log("答题卡", props.paperData);
+      },
     };
-    console.log("答题卡", props.paperData);
     return {
       ...toRefs(data),
       ...methods,

src/pages/exam/examPaper.vue

@@ -52,7 +52,7 @@
           :sortTotal="peaperDetail.Paper.GroupList.length"
           @getBeforeTopic="getBeforeTopic()"
           @getAfterTopic="getAfterTopic()"
-		  @answerChange="getAnswerChange($event, index)"
+          @answerChange="getAnswerChange($event, index)"
           v-if="item.QuestionTypeKey === 'multiple' && index === changeIndex"
         />
         <!-- 单选题 -->
@@ -88,7 +88,7 @@
           :sortTotal="peaperDetail.Paper.GroupList.length"
           @getBeforeTopic="getBeforeTopic()"
           @getAfterTopic="getAfterTopic()"
-		  @answerChange="getAnswerChange($event, index)"
+          @answerChange="getAnswerChange($event, index)"
           v-if="item.QuestionTypeKey === 'fill-in' && index === changeIndex"
         />
 
@@ -101,7 +101,7 @@
           :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
-		  @answerChange="getAnswerChange($event, index)"
+          @answerChange="getAnswerChange($event, index)"
           v-if="
             item.QuestionTypeKey === 'reading-comprehensio' &&
             index === changeIndex
@@ -116,7 +116,7 @@
           :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
-		  @answerChange="getAnswerChange($event, index)"
+          @answerChange="getAnswerChange($event, index)"
           v-if="item.QuestionTypeKey === 'judge' && index === changeIndex"
         />
         <!-- 简答题 -->
@@ -128,7 +128,7 @@
           :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
-		  @answerChange="getAnswerChange($event, index)"
+          @answerChange="getAnswerChange($event, index)"
           v-if="
             item.QuestionTypeKey === 'short-answer' && index === changeIndex
           "
@@ -347,7 +347,6 @@ export default {
       msg: { GuestId: Gid, PaperId: 5, PublishId: 1 },
       peaperDetail: {},
       changeIndex: 0, //大题序号
-      changeIndexSub: 1, //小题序号
       isLast: false, //用于判断是否从后往前翻
       isShowAnswer: false, //是否显示答题卡
     });
@@ -395,6 +394,7 @@ export default {
       },
       //跳转到指定题目
       jumpTopic(val) {
+        this.changeIndex = val.index;
         data.peaperDetail.Paper.GroupList[val.index].startIndex =
           val.index1 + 1;
         data.isShowAnswer = false;