From 870e0b3c8361cfa8af3facf67b08f1f5be66252a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 10:13:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/components/examinations/index.vue |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 9e462e0..23b1a5f 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="examination" v-loading="!cardData.length">
+  <div class="examination" v-loading="loading">
     <div
       v-for="(item, nindex) in cardData"
       :key="nindex"
@@ -124,7 +124,9 @@
                     :src="getPublicImage(content.img, 115)"
                     v-show="content.img"
                     :preview-src-list="[getPublicImage(content.img)]"
+                    v-if="isReal"
                   ></el-image>
+                  <img :src="content.img" alt="" v-if="!isReal" class="radio-img">
                 </p>
                 <p
                   class="optionContent"
@@ -402,17 +404,17 @@
       </ul>
     </div>
     <div class="bottom-btn" v-if="!loading">
-      <el-button class="btn-box" @click="saveAnswer">淇濆瓨</el-button>
+      <el-button class="examinations-btn-box" @click="saveAnswer">淇濆瓨</el-button>
       <el-button
         @click="handleQuestion"
-        class="btn-box"
+        class="examinations-btn-box"
         :style="{ borderColor: primaryColor }"
         >鎻愪氦</el-button
       >
-      <el-button @click="redo" class="btn-box">閲嶅仛</el-button>
+      <el-button @click="redo" class="examinations-btn-box">閲嶅仛</el-button>
       <el-button
         @click="openAnswers"
-        class="btn-box"
+        class="examinations-btn-box"
         :style="{ borderColor: primaryColor }"
         >鏌ョ湅绛旀</el-button
       >
@@ -437,25 +439,37 @@
     page: {
       type: Number,
     },
+    isReal:{
+      type:Boolean,
+      default:true
+    }
   },
   data() {
     return {
       type: "option",
       loading: false,
-      cardData:[]
+      cardData:[],
+      loading:true,
+      
     };
   },
   watch:{
     cardList:{
       handler(newVal) {
         console.log('11',newVal);
-      }
+        this.cardData = this.cardList
+        if(newVal && newVal.length) {
+          this.loading = false
+        }
+      },
+      immediate:true,
+      deep:true
     }
   },
   mounted() {
-    this.cardData = this.cardList
-    console.log('this.cardList',this.cardList);
-    console.log('this.cardData',this.cardData);
+    // this.cardData = this.cardList
+    // console.log('this.cardList',this.cardList);
+    // console.log('this.cardData',this.cardData);
   },
   methods: {
     // 鏁扮粍杞负瀛楃涓叉柟娉�
@@ -631,7 +645,7 @@
     list-style: none;
   }
 }
-.btn-box {
+.examinations-btn-box {
   height: 30px;
   width: 78px;
   padding: 4px 10px;
@@ -1128,4 +1142,8 @@
     margin-top: 10px;
   }
 }
+.radio-img {
+  width: 200px;
+  object-fit: contain;
+}
 </style>

--
Gitblit v1.9.1