合并代码

闫增涛

2024-06-13 6b15f89a33b0bffb9837f954c48ea2b21e7381fd

 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"
@@ -68,7 +68,7 @@
                  v-for="(itemText, indexText) in value.stem"
                  :key="indexText"
                >
                  <span v-if="typeof itemText == 'string'">{{ itemText }}</span>
                  <span v-if="typeof itemText == 'string'" v-html="itemText" ></span>
                  <!-- &nbsp; -->
                  <el-input
                    v-else
@@ -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
      >
@@ -426,7 +428,6 @@
  props: {
    cardList: {
      type: Array,
      default: [],
    },
    primaryColor: {
      type: String,
@@ -438,18 +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: {
    // 数组转为字符串方法
@@ -567,13 +587,13 @@
    },
    // 保存按钮
    saveAnswer() {
      const element = document.getElementsByClassName("examination")[0];
      const element = (this.container ? this.container : document
      ).querySelector(".examination");
      if (element) {
        const pageNum = this.getParentWithClass(
          element,
          "page-box"
        ).getAttribute("page");
        console.log(this.config.activeBook.name, pageNum);
        const oldAnswerData = localStorage.getItem(
          this.config.activeBook.name + "oldAnswerData"
        );
@@ -625,7 +645,7 @@
    list-style: none;
  }
}
.btn-box {
.examinations-btn-box {
  height: 30px;
  width: 78px;
  padding: 4px 10px;
@@ -1122,4 +1142,8 @@
    margin-top: 10px;
  }
}
.radio-img {
  width: 200px;
  object-fit: contain;
}
</style>