1

src/components/subject/Calculation.vue

@@ -22,10 +22,7 @@
         @change="onchange"
       >
         <swiper-item v-if="sortIndex != 1"></swiper-item>
-        <swiper-item
-          v-for="(item1, index1) in data.DetailsList"
-          :key="index1"
-        >
+        <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
           <view class="item1">
             <view class="flex flex_start_center">
               <view>{{ index1 + 1 }}、</view>
@@ -34,9 +31,9 @@
             <view class="chooseName">
               <textarea
                 type="text"
-                v-model="item1.Answer"
+                v-model="item1.StundetAnswer"
                 class="input textarea"
-				@input="sendData"
+                @input="sendData"
                 placeholder="请填写答案"
                 placeholder-style="textarea-placeholder"
                 :maxlength="-1"
@@ -108,9 +105,9 @@ export default {
           this.$emit("getBeforeTopic");
         }
       },
-	  sendData(){
-	    context.emit("answerChange", data.data);
-	  }
+      sendData() {
+        context.emit("answerChange", data.data);
+      },
     };
     onMounted(() => {
       if (props.isLast) {
@@ -136,9 +133,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-.ExamIndex_Box{
-  margin-right:20px;
- }
+.ExamIndex_Box {
+  margin-right: 20px;
+}
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/components/subject/MultipleChoice.vue

@@ -36,12 +36,12 @@
                 :class="{
                   myAnswer: item2.IsAnswer,
                 }"
-                @click="change(item2)"
+                @click="change(item1, item2)"
                 >{{ item2.ShowName }}
               </view>
               <view
                 class="chooseName"
-                @click="change(item2)"
+                @click="change(item1, item2)"
                 v-html="item2.Content"
               ></view>
             </view>
@@ -98,9 +98,13 @@ export default {
         uni.navigateBack();
       },
       //选题
-      change(item) {
-        item.IsAnswer = !item.IsAnswer;
-		context.emit("answerChange", data.data);
+      change(item1, item2) {
+        item2.IsAnswer = !item2.IsAnswer;
+        //标记已回答
+        item1.IsRes = item1.QuestionContentObj.some((e) => {
+          return e.IsAnswer;
+        });
+        context.emit("answerChange", data.data);
       },
       onchange(e) {
         data.ExamIndex = e.detail.current;
@@ -114,9 +118,9 @@ export default {
       },
     };
     onMounted(() => {
-      // if(props.isLast){
-      // 	data.current = props.paperData.DetailsList.length;
-      // }
+      if (props.isLast) {
+        data.current = props.paperData.DetailsList.length;
+      }
     });
     let that = methods;
     return {
@@ -138,8 +142,8 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-.ExamIndex_Box{
-  margin-right:20px;
+.ExamIndex_Box {
+  margin-right: 20px;
 }
 .Single_Before {
   font-size: 28rpx;

src/components/subject/Other.vue

@@ -22,10 +22,7 @@
         @change="onchange"
       >
         <swiper-item v-if="sortIndex != 1"></swiper-item>
-        <swiper-item
-          v-for="(item1, index1) in data.DetailsList"
-          :key="index1"
-        >
+        <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
           <view class="item1">
             <view class="flex flex_start_center">
               <view>{{ index1 + 1 }}、</view>
@@ -34,10 +31,10 @@
             <view class="chooseName">
               <textarea
                 type="text"
-                v-model="item1.Answer"
+                v-model="item1.StundetAnswer"
                 class="input textarea"
                 placeholder="请填写答案"
-				@input="sendData"
+                @input="sendData"
                 placeholder-style="textarea-placeholder"
                 :maxlength="-1"
               />
@@ -105,9 +102,9 @@ export default {
           this.$emit("getBeforeTopic");
         }
       },
-	  sendData() {
-	    context.emit("answerChange", data.data);
-	  },
+      sendData() {
+        context.emit("answerChange", data.data);
+      },
     };
     onMounted(() => {
       if (props.isLast) {
@@ -137,8 +134,8 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
-.ExamIndex_Box{
-  margin-right:20px;
+.ExamIndex_Box {
+  margin-right: 20px;
 }
 .Single_Before {
   font-size: 28rpx;

src/components/subject/SingleChoice.vue

@@ -92,12 +92,10 @@ export default {
       current: 1, //默认从第几个开始-用于从快捷菜单点入
       ExamIndex: 1, //第几题
     });
-    console.log(86, data.data);
     if (props.startIndex) {
       data.current = props.startIndex;
       data.ExamIndex = props.startIndex;
     }
-    console.log(77, data.sortIndex != 1, data.sortIndex != data.sortTotal);
     let methods = {
       changeNumToHan,
       jumpPage() {

src/components/subject/Spoken.vue

@@ -10,7 +10,8 @@
           >
         </view>
         <view class="ExamIndex_Box">
-          <text class="Single_Before">{{ ExamIndex }}</text>/
+          <text class="Single_Before">{{ ExamIndex }}</text
+          >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
       </view>
@@ -21,10 +22,7 @@
         @change="onchange"
       >
         <swiper-item v-if="sortIndex != 1"></swiper-item>
-        <swiper-item
-          v-for="(item1, index1) in data.DetailsList"
-          :key="index1"
-        >
+        <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
           <view class="item1">
             <view class="flex flex_start_center">
               <view>{{ index1 + 1 }}、</view>
@@ -33,10 +31,10 @@
             <view class="chooseName">
               <textarea
                 type="text"
-                v-model="item1.Answer"
+                v-model="item1.StundetAnswer"
                 class="input textarea"
                 placeholder="请填写答案"
-				@input="sendData"
+                @input="sendData"
                 placeholder-style="textarea-placeholder"
                 :maxlength="-1"
               />
@@ -104,9 +102,9 @@ export default {
           this.$emit("getBeforeTopic");
         }
       },
-	  sendData() {
-	    context.emit("answerChange", data.data);
-	  },
+      sendData() {
+        context.emit("answerChange", data.data);
+      },
     };
     onMounted(() => {
       if (props.isLast) {
@@ -136,8 +134,8 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
-.ExamIndex_Box{
-  margin-right:20px;
+.ExamIndex_Box {
+  margin-right: 20px;
 }
 .Single_Before {
   font-size: 28rpx;

src/components/subject/answer.vue

@@ -85,7 +85,7 @@ import {
   onMounted,
 } from "vue";
 import { changeNumToHan } from "../../utils/index";
-// import { submitPaper } from "../../utils/exam";
+import { submitPaper } from "../../api/exam";
 export default {
   props: {
     paperData: Object,
@@ -104,10 +104,6 @@ export default {
           index1,
           index2,
         });
-        // uni.navigateTo({
-        //   url:
-        //     "/pages/exam/examPaper?index=" + index + "&&index1=" + (index1 + 1),
-        // });
       },
       //隐藏答题卡
       back() {
@@ -115,7 +111,10 @@ export default {
       },
       //交卷
       savePaper() {
-        console.log("答题卡", props.paperData);
+        let obj = JSON.parse(JSON.stringify(props.paperData.Paper));
+        delete obj.Group_Id;
+        console.log("答题卡", obj);
+        // submitPaper()
       },
     };
     return {

src/components/subject/easyQuestion.vue

@@ -22,10 +22,7 @@
         @change="onchange"
       >
         <swiper-item></swiper-item>
-        <swiper-item
-          v-for="(item1, index1) in data.DetailsList"
-          :key="index1"
-        >
+        <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
           <view class="item1">
             <view class="flex flex_start_center">
               <view>{{ index1 + 1 }}、</view>
@@ -34,9 +31,9 @@
             <view class="chooseName">
               <textarea
                 type="text"
-                v-model="item1.Answer"
+                v-model="item1.StundetAnswer"
                 class="input textarea"
-				@input="sendData"
+                @input="sendData"
                 placeholder="请填写答案"
                 placeholder-style="textarea-placeholder"
                 :maxlength="-1"
@@ -108,9 +105,9 @@ export default {
           this.$emit("getBeforeTopic");
         }
       },
-	  sendData(){
-	    context.emit("answerChange", data.data);
-	  }
+      sendData() {
+        context.emit("answerChange", data.data);
+      },
     };
     onMounted(() => {
       if (props.isLast) {
@@ -136,8 +133,8 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-.ExamIndex_Box{
-  margin-right:20px;
+.ExamIndex_Box {
+  margin-right: 20px;
 }
 .Exam_Total {
   font-size: 25rpx;

src/components/subject/nounExplanation.vue

@@ -31,9 +31,9 @@
             <view class="chooseName">
               <textarea
                 type="text"
-                v-model="item1.Answer"
+                v-model="item1.StundetAnswer"
                 class="input textarea"
-				@input="sendData"
+                @input="sendData"
                 placeholder="请填写答案"
                 placeholder-style="textarea-placeholder"
                 :maxlength="-1"
@@ -105,9 +105,9 @@ export default {
           this.$emit("getBeforeTopic");
         }
       },
-	  sendData(){
-	    context.emit("answerChange", data.data);
-	  }
+      sendData() {
+        context.emit("answerChange", data.data);
+      },
     };
     onMounted(() => {
       if (props.isLast) {
@@ -137,8 +137,8 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
-.ExamIndex_Box{
-  margin-right:20px;
+.ExamIndex_Box {
+  margin-right: 20px;
 }
 .Single_Before {
   font-size: 28rpx;

src/components/subject/shortAnswer.vue

@@ -22,10 +22,7 @@
         @change="onchange"
       >
         <swiper-item v-if="sortIndex != 1"></swiper-item>
-        <swiper-item
-          v-for="(item1, index1) in data.DetailsList"
-          :key="index1"
-        >
+        <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
           <view class="item1">
             <view class="flex flex_start_center">
               <view>{{ index1 + 1 }}、</view>
@@ -34,8 +31,8 @@
             <view class="chooseName">
               <textarea
                 type="text"
-                v-model="item1.Answer"
-				@input="sendData"
+                v-model="item1.StundetAnswer"
+                @input="sendData"
                 class="input textarea"
                 placeholder="请填写答案"
                 :maxlength="-1"
@@ -75,7 +72,7 @@ export default {
     props.paperData.DetailsList.forEach((item, index) => {
       item.myAnswer = "";
     });
-	
+
     let data = reactive({
       data: props.paperData,
       autoplay: false,
@@ -108,9 +105,9 @@ export default {
           this.$emit("getBeforeTopic");
         }
       },
-	  sendData(){
-	    context.emit("answerChange", data.data);
-	  }
+      sendData() {
+        context.emit("answerChange", data.data);
+      },
     };
     onMounted(() => {
       if (props.isLast) {
@@ -140,8 +137,8 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
-.ExamIndex_Box{
-  margin-right:20px;
+.ExamIndex_Box {
+  margin-right: 20px;
 }
 .Single_Before {
   font-size: 28rpx;