1

src/pages/exam/examPaper.vue

@@ -71,22 +71,8 @@
           @getAfterTopic="getAfterTopic()"
           v-if="item.QuestionTypeKey === 'fill-in' && index === changeIndex"
         />
-        <<<<<<< HEAD
+
         <!-- 阅读理解 -->
-        <readingCompre
-          :paperData="item"
-          :isLast="isLast"
-          :sort="index"
-          @getBeforeTopic="getBeforeTopic()"
-          v-if="
-            item.QuestionTypeKey === 'reading-comprehensio' &&
-            index === changeIndex
-          "
-        />
-        <!--   <Judge :paperData="item" v-if="item.QuestionTypeKey === 'judge'" />
-        <Write
-=======
-		<!-- 阅读理解 -->
         <readingCompre
           :paperData="item"
           :isLast="isLast"
@@ -109,7 +95,6 @@
         />
         <!--简答题、名词解释、论述题、计算题、口语题、其它-->
         <!-- <Write
->>>>>>> cf56b230171a1070596b5408cec3117e0a398f3c
           :paperData="item"
           v-if="
             item.QuestionTypeKey === 'short-answer' ||