updata

src/modules/exam-module/components/answerCard.vue

@@ -21,13 +21,13 @@
             </li>
           </ul>
         </div>
-        <div class="question">
+        <!-- <div class="question">
           <template v-for="(item, index) in dataList">
             <div :key="index">
               <div class="title">{{ questionType[item.type] }}</div>
               <ul>
                 <template v-for="(cItem, cIndex) in item.question_list">
-                  <!-- <li class="active2">{{ cItem.num }}</li> -->
+                  <li class="">{{ cItem.num }}</li>
                   <template v-if="requestData[item.id]">
                     <template v-if="requestData[item.id][cItem.id]">
                       <template v-if="requestData[item.id][cItem.id].sign">
@@ -49,6 +49,36 @@
               </ul>
             </div>
           </template>
+        </div> -->
+        <div class="question">
+          <template>
+            <div :key="index">
+              <!-- <div class="title">{{ questionType[item.type] }}</div> -->
+              <ul>
+                <template v-for="(item) in dataList">
+                  <template v-for="(cItem, cIndex) in item.question_list">
+                    <template v-if="requestData[item.id]">
+                      <template v-if="requestData[item.id][cItem.id]">
+                        <template v-if="requestData[item.id][cItem.id].sign">
+                          <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active2">{{ cItem.num }}</li>
+                        </template>
+                        <template v-else>
+                          <li @click="go(cItem.id)" :data-id="cItem.id" v-if="requestData[item.id][cItem.id].answer.length != 0" :key="cIndex" class="active1">{{ cItem.num }}</li>
+                          <li @click="go(cItem.id)" :data-id="cItem.id" v-else :key="cIndex" class="active3">{{ cItem.num }}</li>
+                        </template>
+                      </template>
+                      <template v-else>
+                        <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active3">{{ cItem.num }}</li>
+                      </template>
+                    </template>
+                    <template v-else>
+                      <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active3">{{ cItem.num }}</li>
+                    </template>
+                  </template>
+                </template>
+              </ul>
+            </div>
+          </template>
         </div>
       </div>
     </div>
@@ -85,11 +115,17 @@ export default {
     }
   },
   methods: {
-    duplicates(c) {
-      // arr.map(item => {
-      //   const data = arr.find(i => { return i.type === item.type })
-      //   console.log(data)
-      // })
+    duplicates(data) {
+      const hash = {}
+      const newArr = data.reduce((item, next) => {
+        hash[next.type] ? item.forEach((l) => {
+          if (l.type === next.type) {
+            l.question_list = [...l.question_list, ...next.question_list]
+          }
+        }) : hash[next.type] = true && item.push(next)
+        return item
+      }, [])
+      return newArr
     },
     go(id) {
       setTimeout(() => {
@@ -102,6 +138,10 @@ export default {
       const clientHeight = document.documentElement.clientHeight
       const bottomView = document.getElementById('bottom-view2')
       bottomView.style.height = (clientHeight - topViewH) + 'px'
+    },
+    clone(origin) {
+      const originProto = Object.getPrototypeOf(origin)
+      return Object.assign(Object.create(originProto), origin)
     }
   },
   computed: {
@@ -109,9 +149,8 @@ export default {
       return this.questionsData
     },
     dataList() {
-      // this.cardData = this.questionsData
-      // this.duplicates(this.cardData.questions)
-      // console.log(this.duplicates(this.cardData.questions))
+      // const clone = this.clone(this.questionsData)
+      // const data = this.duplicates(clone.questions)
       let num = 1
       return this.questionsData.questions.map(item => {
         item.question_list.map((subitem, index) => {
@@ -132,8 +171,7 @@ export default {
     },
     questionsData: {
       handler(newV, oldV) {
-        // console.log(this.duplicates(this.questionsData.questions))
-        // this.questionsData.questions =
+        // this.duplicates(this.questionsData.questions)
       }
     }
   }
@@ -193,9 +231,9 @@ export default {
       }
       ul{
         list-style: none;
-        margin: 0;
+        margin-top: .3rem;
         padding: 0 0.6rem;
-        border-bottom: 0.01rem solid #EEEEEE;
+        // border-bottom: 0.01rem solid #EEEEEE;
         display: flex;
         flex-wrap: wrap;
         li{

src/modules/exam-module/src/ExamEnd.vue

@@ -49,7 +49,7 @@
                 </li>
               </ul>
             </div>
-            <div class="question">
+            <!-- <div class="question">
               <template v-for="(item, index) in dataList">
                 <div :key="index">
                   <div class="title">{{ questionType[item.type] }}</div>
@@ -80,6 +80,40 @@
                   </ul>
                 </div>
               </template>
+            </div> -->
+            <div class="question">
+              <template>
+                <div :key="index">
+                  <!-- <div class="title">{{ questionType[item.type] }}</div> -->
+                  <ul>
+                    <template v-for="(item) in dataList">
+                      <template v-for="(cItem, cIndex) in item.question_list">
+                        <template v-if="requestData[item.id]">
+                          <template v-if="requestData[item.id][cItem.id]">
+                            <template v-if="requestData[item.id][cItem.id].answer.length != 0">
+                              <template v-if="questionsData.score_items[item.id]">
+                                <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" :class="questionsData.score_items[item.id][cItem.id].is_right ? 'active1' : 'active2'">{{ cItem.num }}</li>
+                              </template>
+                              <template v-else>
+                                <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active3">{{ cItem.num }}</li>
+                              </template>
+                            </template>
+                            <template v-else>
+                              <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active3">{{ cItem.num }}</li>
+                            </template>
+                          </template>
+                          <template v-else>
+                            <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active3">{{ cItem.num }}</li>
+                          </template>
+                        </template>
+                        <template v-else>
+                          <li @click="go(cItem.id)" :data-id="cItem.id" :key="cIndex" class="active3">{{ cItem.num }}</li>
+                        </template>
+                      </template>
+                    </template>
+                  </ul>
+                </div>
+              </template>
             </div>
           </div>
         </div>
@@ -356,9 +390,9 @@ export default {
         }
         ul{
           list-style: none;
-          margin: 0;
+          margin-top: .3rem;
           padding: 0 0.6rem;
-          border-bottom: 0.01rem solid #EEEEEE;
+          // border-bottom: 0.01rem solid #EEEEEE;
           display: flex;
           flex-wrap: wrap;
           li{