Merge branch 'ezTeach-2.0.0.0.release' of http://120.78.57.84/baoman/Ezquiz_Plat…

…form into ezTeach-2.0.0.0.release

Merge branch 'ezTeach-2.0.0.0.release' of http://120.78.57.84/baoman/Ezquiz_Plat…
…form into ezTeach-2.0.0.0.release
LH_PC
2 parents f1d1ffae ce926d5e
Showing 6 changed files with 491 additions and 137 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/assets/css/base.css
src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
src/views/basic/askTestQuestion/wrongQuestion.vue
vue.config.js
@@ -1059,4 +1059,8 @@ export default {
   getGradeList(data) {
     return defaltGetService(setUpUrls.teacherGradeList, data);
   },
+  // 获取班级信息
+  getWrongQuestionSave(data) {
+    return defaltService(setUpUrls.getWrongQuestionSave, data);
+  },
 };
@@ -495,9 +495,9 @@ export default {
   //获取即时测报表学生名单和题目列表
   listStudentsAndQuestions: "/api_html/teaching/listStudentsAndQuestions",
   //分页查询授课端日志列表
-  deviceZipLogList: "/api_html/school/manager/deviceZipLogList", 
+  deviceZipLogList: "/api_html/school/manager/deviceZipLogList",
   //获取即时测报表录分情况
-  getScoreType: "/api_html/teaching/getScoreType", 
+  getScoreType: "/api_html/teaching/getScoreType",
   // 获取错题本列表
   wrongQuestionList: "api_html/teaching/wrongQuestion/list",
   // 获取科目列表
@@ -506,4 +506,6 @@ export default {
   teacherClassList: "api_html/teaching/classList",
   // 获取班级信息
   teacherGradeList: "api_html/teaching/grade",
+  // 保存接口
+  getWrongQuestionSave: "api_html/teaching/wrongQuestion/save",
 };
@@ -49,6 +49,6 @@ input[type=&quot;number&quot;]::-webkit-outer-spin-button {
   background: #667ffd;
 }
-.el-message-box .el-button--default {
+/* .el-message-box .el-button--default {
   color: #fff;
-}
+} */
@@ -7,7 +7,7 @@
   >
     <div class="test-box" v-if="groups">
       <div class="test">
-        <div class="test-title" @dblclick="enableEditing">
+        <div class="test-title" @click="enableEditing">
           <div
             class="test-title"
             v-if="!isEditing"
@@ -25,7 +25,7 @@
               left: tooltipPosition.x + 'px',
             }"
           >
-            双击设置试卷标题
+            单击设置试卷标题
           </div>
           <el-input
             class="test-title"
@@ -41,25 +41,38 @@
           <div
             class="outer-item"
             v-for="(group, index) in groups"
-            :key="group.id"
+            :key="group.questionType"
             :class="{
-              border: selectedIndex === group.id,
+              border: selectedIndex === group.questionType,
             }"
+            @mouseenter="handleGroupMouseEnter(group.questionType, 'all')"
+            @mouseleave="handleGroupMouseLeave"
           >
             <div
-              v-if="selectedIndex === group.id"
+              v-if="selectedIndex == group.questionType"
               class="border-del"
-              @click="handleDel(group.id, 'all')"
+              @click="handleDel(group.questionType, 'all')"
             >
               删除
             </div>
             <!-- 每个组的标题 -->
-            <div class="test-group-title" @click="selectItem(group.id, 'all')">
+            <div
+              class="test-group-title"
+              :class="{
+                border: selectedIndex == group.questionType,
+              }"
+              @mouseenter="handleGroupMouseEnter(group.questionType, 'all')"
+            >
               <div class="size-16" style="font-weight: 600">
                 {{ index + 1 }}、
                 <span
+                  @mouseenter="
+                    (event) => handleItemMouseEnter(event, group.questionType)
+                  "
+                  @mouseleave="handleItemMouseLeave"
+                  :class="isItemHovered == group.questionType ? 'hover' : ''"
                   class="size-16"
-                  @dblclick="groupEditing(index)"
+                  @click="groupEditing(index)"
                   v-show="!group.input"
                   >{{ group.questionTitle }}</span
                 >
@@ -74,6 +87,17 @@
                   @keyup.enter.native="groupSave(index)"
                   style="width: fit-content"
                 />
+                <div
+                  v-if="isItemHovered == group.questionType"
+                  class="tooltip"
+                  :style="{
+                    top: tooltipPosition.y + 'px',
+                    left: tooltipPosition.x + 'px',
+                  }"
+                >
+                  单击设置试卷标题
+                </div>
+
                 <span
                   v-if="group.subQuestionIds"
                   class="size-16"
@@ -87,36 +111,69 @@
             <!-- 内部的题目列表，允许组内排序 -->
             <div
-              style="display: flex; padding: 10px 0"
-              v-for="(question, subIndex) in group.subQuestionIds"
+              style="display: flex"
+              v-for="question in group.subQuestionIds"
               :key="question.id"
               :class="{
                 border: selectedItemIndex === question.id,
               }"
-              @click="selectItem(question.id, 'number')"
+              @mouseenter="handleGroupMouseEnter(question.id, 'number')"
+              @mouseleave="handleGroupMouseLeave"
               class="inner-item"
             >
               <div
                 v-if="selectedItemIndex === question.id"
                 class="border-del"
-                @click="handleDel(question.id, 'number')"
+                @click="handleDel(question.id, group.questionType)"
               >
                 删除
               </div>
-              <div class="size color">{{ question.globalIndex }}、</div>
+              <div class="size color" style="margin-top: 20px">
+                <div
+                  style="max-width: 100px; white-space: nowrap; /* 不换行 */"
+                >
+                  {{ question.globalIndex }}、
+                </div>
+              </div>
               <iframe
                 :src="question.screenshot"
-                :ref="'iframe' + subIndex"
-                @load="onIFrameLoad(subIndex)"
-                style="width: 100%"
+                :ref="'iframe' + question.id"
+                @load="onIFrameLoad(question.id)"
+                style="
+                  width: 100%;
+                  pointer-events: none;
+                  border: none; /* 启用点击穿透 */
+                "
               ></iframe>
             </div>
           </div>
         </div>
       </div>
       <div class="edit">
-        <div class="edit-title"></div>
+        <div class="edit-title">
+          <div class="edit-title-info">
+            共<span>{{ list.length }}</span
+            >小题，卷面分<span>{{ sumValues() }}</span
+            >分
+          </div>
+          <div class="edit-button">
+            <el-button class="button-width" type="primary" @click="handleSava"
+              >保存试卷</el-button
+            >
+            <el-button class="button-width" plain>保存并打印</el-button>
+            <el-button
+              class="button-width"
+              type="danger"
+              plain
+              @click="handleClear"
+              >清空题目</el-button
+            >
+            <el-button class="button-width" plain @click="handleSelect"
+              >继续选题</el-button
+            >
+          </div>
+        </div>
         <div class="edit-info">
           <div class="title size color" style="padding: 15px 0 0 10px">
             题目排序
@@ -173,6 +230,7 @@
   </el-dialog>
 </template>
 <script>
+import { number } from "echarts";
 import draggable from "vuedraggable";
 export default {
   components: { draggable },
@@ -184,7 +242,7 @@ export default {
         return false;
       },
     },
-    ids: {
+    list: {
       // 用于请求详情接口
       type: Array,
       default() {
@@ -198,6 +256,13 @@ export default {
         return null;
       },
     },
+    gradeId: {
+      // 科目
+      type: [String, Number],
+      default() {
+        return null;
+      },
+    },
   },
   data() {
     return {
@@ -207,8 +272,10 @@ export default {
       selectedIndex: null, // 当前选中的外层对象的索引
       selectedItemIndex: null, // 当前选中的内层对象的索引
       isHovered: false, // 用于控制边框和提示文字的显示
+      isItemHovered: false, // 用于控制边框和提示文字的显示
       tooltipPosition: { x: 0, y: 0 }, // 提示文字的位置
       time: "",
+      testData: [], // 存一份list
       questionList: [
         { label: "全部", value: null },
         { label: "单选题", value: 2 },
@@ -216,91 +283,56 @@ export default {
         { label: "判断题", value: 4 },
         { label: "主观题", value: 5 },
       ],
-      groups: [
-        {
-          id: 1,
-          name: "单选题",
-          input: false,
-          items: [
-            { id: 1, content: "组一题目1", globalIndex: 1 },
-            { id: 2, content: "组一题目2", globalIndex: 2 },
-            { id: 3, content: "组一题目3", globalIndex: 3 },
-          ],
-        },
-        {
-          id: 2,
-          name: "多选题",
-          input: false,
-          items: [
-            { id: 4, content: "组二题目1", globalIndex: 4 },
-            { id: 5, content: "组二题目2", globalIndex: 5 },
-            { id: 6, content: "组二题目3", globalIndex: 6 },
-          ],
-        },
-        {
-          id: 3,
-          name: "填空题",
-          input: false,
-          items: [
-            { id: 7, content: "组三题目1", globalIndex: 7 },
-            { id: 8, content: "组三题目2", globalIndex: 8 },
-            { id: 9, content: "组三题目3", globalIndex: 9 },
-            { id: 10, content: "组三题目3", globalIndex: 10 },
-            { id: 11, content: "组三题目3", globalIndex: 11 },
-            { id: 12, content: "组三题目3", globalIndex: 12 },
-            { id: 13, content: "组三题目3", globalIndex: 13 },
-            { id: 14, content: "组三题目3", globalIndex: 14 },
-            { id: 15, content: "组三题目3", globalIndex: 15 },
-            { id: 16, content: "组三题目3", globalIndex: 16 },
-            { id: 17, content: "组三题目3", globalIndex: 17 },
-          ],
-        },
-        {
-          id: 4,
-          name: "问答题",
-          input: false,
-          items: [
-            { id: 18, content: "组二题目1", globalIndex: 18 },
-            { id: 19, content: "组二题目2", globalIndex: 19 },
-            { id: 20, content: "组二题目3", globalIndex: 20 },
-          ],
-        },
-      ],
+      groups: [],
     };
   },
   watch: {
     visible(val) {
       if (val) {
-        // 初始化
-        this.init();
+        // 上面数据测试
+        this.testData = JSON.parse(localStorage.getItem("testData")) || [];
+        this.groups = JSON.parse(localStorage.getItem("question")) || [];
+        // 如果都没有直接return 执行初始化
+        if (this.groups.length == 0) {
+          this.init();
+          return;
+        }
+        // 如果一致 就直接赋值
+        if (
+          this.arraysHaveSameIds(this.testData, this.list) &&
+          JSON.parse(localStorage.getItem("question"))
+        ) {
+          return;
+        } else {
+          let data = this.findMissingIds(this.testData, this.list);
+          this.testAddDel(this.groups, data.addArr, data.delArr);
+        }
       } else {
-        // 关闭后处理
-        localStorage.setItem("question", JSON.stringify(this.groups));
+        this.testDataFun();
       }
     },
   },
   methods: {
     // 初始化
-    async init() {
-      let dataList = JSON.parse(localStorage.getItem("question"));
-      if (dataList && dataList.length > 0) {
-        this.groups = dataList;
-        return;
-      }
-      console.log("初始化成功");
+    init() {
+      console.log("初始化");
       this.time = this.getFormattedDate();
       this.inputValue = this.time + this.subjectName + "--错题复习";
-      this.$request
-        .getWrongQuestionList({ ids: this.ids, page: 1, size: 99999 })
-        .then((res) => {
-          this.groups = this.classifyByType(
-            res.data.records.map((item, index) => {
-              return { ...item, globalIndex: index };
-            })
-          );
-          console.log(this.groups, "=-=-=");
-        });
+      this.groups = this.classifyByType(
+        this.list.map((item, index) => {
+          return { ...item, globalIndex: index + 1 };
+        })
+      );
+      this.updateGlobalIndexes();
+    },
+    // 随时保存testData
+    testDataFun() {
+      this.testData =
+        this.groups.reduce((accumulator, current) => {
+          return accumulator.concat(current.subQuestionIds);
+        }, []) || [];
+      localStorage.setItem("testData", JSON.stringify(this.testData));
     },
     /** 按钮 - 取消 */
     handleClose() {
@@ -324,6 +356,7 @@ export default {
       allItems.forEach((item, index) => {
         item.globalIndex = index + 1;
       });
+      localStorage.setItem("question", JSON.stringify(this.groups));
     },
     classifyByType(arr) {
       const result = {};
@@ -337,17 +370,29 @@ export default {
       // 将结果对象转换为数组
       return Object.keys(result).map((type) => ({
-        type: type,
+        questionType: type,
+        input: false,
         questionTitle: this.questionList.find((item) => item.value == type)
           .label,
         questionScore: 1,
         subQuestionIds: result[type],
       }));
     },
-    onIFrameLoad(index) {
-      const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe
-      console.log(iframeRef, "ref");
-      console.log(iframeRef.contentWindow.document, "document");
+    onIFrameLoad(id) {
+      const iframeRef = this.$refs["iframe" + id][0]; // 获取对应的 iframe
+      const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
+      const body = iframeRef.contentWindow.document.body;
+      const height = body.scrollHeight; // 获取内容的高度
+      console.log(height, "body高度");
+      iframeRef.style.height = `${height}px`; // 设置 iframe 的高度
+      // 获取第一个P标签
+      const firstP = doc.getElementsByTagName("p")[0];
+      // 或者修改第一个 < p > 标签的内容;
+      if (firstP) {
+        console.log(firstP, firstP.innerHTML, "-----innerHTML-----");
+        let a = this.processString(firstP.innerHTML);
+        firstP.innerHTML = a;
+      }
     },
     // 启动编辑模式
@@ -357,20 +402,18 @@ export default {
       this.$nextTick(() => {
         // 在 DOM 更新完成后让输入框获取焦点
         this.$refs.editInput.focus();
-        console.log(this.$refs.editInput);
       });
     },
     // 保存修改后的内容，回车或失去焦点时触发
     save() {
-      console.log("回车事件");
-
       this.isEditing = false;
-      console.log("保存的内容:", this.inputValue); // 可根据需要将内容保存到其他地方
+      localStorage.setItem("question", JSON.stringify(this.groups));
     },
     // 单题title修改
     groupEditing(index) {
+      this.isItemHovered = null;
       this.$set(this.groups[index], "input", true);
       // DOM 更新完成后让对应的输入框获取焦点
@@ -382,6 +425,7 @@ export default {
     // 单体title保存
     groupSave(index) {
       this.$set(this.groups[index], "input", false);
+      localStorage.setItem("question", JSON.stringify(this.groups));
     },
     // 高亮
     selectItem(id, type) {
@@ -396,14 +440,31 @@ export default {
     // 删除题目
     handleDel(id, type) {
       if (type == "all") {
-        console.log("删除整个大题");
+        let _index = this.groups.findIndex((item) => item.questionType == id);
+        if (_index != -1) {
+          this.groups.splice(_index, 1);
+          localStorage.setItem("question", JSON.stringify(this.groups));
+          this.updateGlobalIndexes();
+          this.testDataFun();
+          localStorage.setItem("testlist", JSON.stringify(this.testData));
+          this.$emit("setQuestions");
+        }
       } else {
-        console.log("删除整个小题");
+        this.groups.forEach((item) => {
+          if (type == item.questionType) {
+            item.subQuestionIds = item.subQuestionIds.filter(
+              (item) => item.id !== id
+            );
+          }
+        });
+        localStorage.setItem("question", JSON.stringify(this.groups));
+        this.updateGlobalIndexes();
+        this.testDataFun();
+        localStorage.setItem("testlist", JSON.stringify(this.testData));
+        this.$emit("setQuestions");
       }
     },
     handleMouseEnter(event) {
-      console.log(event);
-
       this.isHovered = true;
       // 计算提示文字位置 (鼠标右下角)
       this.tooltipPosition = {
@@ -424,6 +485,219 @@ export default {
       const day = today.getDate(); // 获取日期
       return `${year}年${month}月${day}日`;
     },
+
+    // 接收两个参数
+    arraysHaveSameIds(arr1, arr2) {
+      // 检查两个数组长度是否相同
+      if (arr1.length !== arr2.length) {
+        return false;
+      }
+      // 提取两个数组中所有的 id
+      const ids1 = arr1.map((item) => item.id);
+      const ids2 = arr2.map((item) => item.id);
+      // 将 id 数组排序
+      ids1.sort();
+      ids2.sort();
+      // 比较两个 id 数组是否一致
+      for (let i = 0; i < ids1.length; i++) {
+        if (ids1[i] !== ids2[i]) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 接收两个参数
+    arrContrast(arr1, arr2) {
+      // 如果两个数组的长度不同，直接返回 true
+      if (arr1.length !== arr2.length) {
+        return true;
+      }
+
+      // 创建一个 id 集合来存放 arr1 中的 id
+      const idsSet1 = new Set(arr1.map((obj) => obj.id));
+      // 创建一个 id 集合来存放 arr2 中的 id
+      const idsSet2 = new Set(arr2.map((obj) => obj.id));
+
+      // 比较两个集合的大小，如果不同，返回 true
+      if (idsSet1.size !== idsSet2.size) {
+        return true;
+      }
+
+      // 比较两个集合的内容
+      for (const id of idsSet1) {
+        if (!idsSet2.has(id)) {
+          return true;
+        }
+      }
+
+      // 如果所有的 id 都一致，返回 false
+      return false;
+    },
+    processString(input) {
+      // 正则表达式：匹配最多三位数字
+      const regex = /^(\d{1,3})/;
+
+      // 测试字符串是否以数字开头
+      const match = input.match(regex);
+
+      if (match) {
+        // 如果匹配，去掉开头的数字并返回剩余部分
+        return input.substring(match[0].length + 1).trim();
+      }
+
+      // 如果没有匹配，直接返回原字符串
+      return input;
+    },
+
+    // 接受两个参数，返回需要删除的数据以及需要添加的数据
+    findMissingIds(array1, array2) {
+      // 找出第一个数组中存在但第二个数组中不存在的 id
+      const delArr = array1.filter(
+        (item1) => !array2.some((item2) => item2.id === item1.id)
+      );
+      // 找出第二个数组中存在但第一个数组中不存在的 id
+      const addArr = array2.filter(
+        (item2) => !array1.some((item1) => item1.id === item2.id)
+      );
+
+      return {
+        delArr,
+        addArr,
+      };
+    },
+
+    // 添加，删除
+    // 需要的数据，添加的数据，删除的数据
+    testAddDel(arr1, arr2, arr3) {
+      console.log(arr1, arr3);
+      if (arr2 && arr2.length > 0) {
+        // 添加数据，如果没有type重新创建一个type
+        arr2.forEach((item2) => {
+          const typeMatch = arr1.find(
+            (item1) => item1.questionType == item2.questionType
+          );
+          if (typeMatch) {
+            typeMatch.subQuestionIds.push(item2);
+          } else {
+            arr1.push({
+              questionType: item2.questionType,
+              subQuestionIds: [item2],
+              questionTitle: this.questionList.find(
+                (item) => item.value == item2.questionType
+              ).label,
+              input: false,
+              questionScore: 1,
+            });
+          }
+        });
+      }
+      if (arr3 && arr3.length > 0) {
+        // 删除数据
+        arr3.forEach((item3) => {
+          // 在 array1 中找到匹配的 type
+          let matchedArray1Item = arr1.find(
+            (item1) => item1.questionType == item3.questionType
+          );
+          if (matchedArray1Item) {
+            // 如果找到了匹配的 type，遍历 matchedArray1Item 的 items
+            let _index = matchedArray1Item.subQuestionIds.findIndex(
+              (item) => item.id === item3.id
+            );
+            console.log("_index");
+
+            if (_index != -1) {
+              matchedArray1Item.subQuestionIds.splice(_index, 1);
+            }
+          } else {
+            return;
+          }
+        });
+      }
+
+      this.updateGlobalIndexes();
+    },
+
+    // 鼠标移入
+    handleGroupMouseEnter(id, type) {
+      if (type == "all") {
+        this.selectedIndex = id;
+        this.selectedItemIndex = null;
+      } else {
+        this.selectedItemIndex = id;
+        this.selectedIndex = null;
+      }
+    },
+    // 鼠标离开
+    handleGroupMouseLeave() {
+      this.selectedIndex = null;
+      this.selectedItemIndex = null;
+    },
+
+    // 小标题移入
+    handleItemMouseEnter(event, type) {
+      this.tooltipPosition = {
+        x: 50,
+        y: 40,
+      };
+
+      this.isItemHovered = type;
+    },
+    // 小标题移除
+    handleItemMouseLeave() {
+      this.isItemHovered = null;
+    },
+
+    // 保存
+    handleSava() {
+      let param = {
+        paperTitle: this.inputValue,
+        subjectName: this.subjectName,
+        gradeId: this.gradeId,
+        questions: this.groups.filter((item) => item.subQuestionIds.length > 0),
+      };
+      this.$request.getWrongQuestionSave(param).then((res) => {
+        if (res.status == 0) {
+          this.groups = [];
+          this.testData = [];
+          localStorage.setItem("testlist", JSON.stringify(this.questions));
+          localStorage.setItem("question", JSON.stringify(this.groups));
+          this.$emit("setQuestions");
+          this.testDataFun();
+          this.handleClose();
+        }
+      });
+    },
+
+    // 清空
+    handleClear() {
+      this.$confirm("确定要清空试题篮内的全部题目吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.groups = [];
+          this.testDataFun();
+          localStorage.setItem("question", JSON.stringify(this.groups));
+          localStorage.setItem("testlist", JSON.stringify(this.testData));
+          this.$emit("setQuestions");
+          this.handleClose();
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    // 继续选题
+    handleSelect() {
+      this.handleClose();
+    },
+
+    // 计算总分
+    sumValues() {
+      return this.groups.reduce((sum, item) => {
+        return sum + Number(item.questionScore) * item.subQuestionIds.length;
+      }, 0);
+    },
   },
 };
 </script>
@@ -433,13 +707,16 @@ export default {
 }
 .test-box {
   display: flex;
+  min-height: 742px;
   .test {
     flex: 1;
     height: fit-content;
-    max-height: 642px;
+    max-height: 742px;
     overflow-y: auto;
     box-shadow: 0 0 10px 0 #999999;
     margin-right: 20px;
+    box-sizing: border-box;
+    padding: 0 20px;
     .test-title {
       font-size: 20px !important;
       font-weight: 700;
@@ -459,7 +736,10 @@ export default {
     }
     .test-group {
       .test-group-title {
-        padding: 10px 0;
+        position: relative;
+        height: 40px;
+        line-height: 30px;
+        padding: 10px 0 0 0;
       }
     }
   }
@@ -471,16 +751,38 @@ export default {
       width: 100%;
       height: 200px;
       border: 1px solid #999999;
+      .edit-title-info {
+        height: 60px;
+        width: 100%;
+        text-align: center;
+        font-weight: 600;
+        font-size: 16px !important;
+        line-height: 60px;
+        color: #000000;
+        span {
+          color: rgb(234, 163, 73);
+        }
+      }
+      .edit-button {
+        box-sizing: border-box;
+        padding: 0 20px;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-around;
+        .button-width {
+          width: 160px !important;
+          margin: 10px 0;
+        }
+      }
     }
     .edit-info {
       flex: 1;
       border: 1px solid #999999;
       margin-top: 20px;
-      max-height: 400px;
+      max-height: 500px;
       padding: 10px;
       overflow: auto;
       .group-item {
-        padding: 10px;
         margin: 10px;
         background: rgba(243, 243, 243, 0.6);
         border-radius: 5px;
@@ -551,8 +853,7 @@ export default {
 .outer-item,
 .inner-item {
   height: fit-content;
-  padding: 0 20px;
-  margin: 5px;
+  margin-bottom: 20px;
 }
 .tooltip {
   position: absolute;
@@ -565,5 +866,10 @@ export default {
 .hover {
   border: 1px solid rgb(115, 142, 246);
   background: rgb(233, 237, 253);
+  width: fit-content;
+}
+.title-bg {
+  background: rgb(115, 142, 246);
+  border-bottom: 1px solid rgb(115, 142, 246);
 }
 </style>
 \ No newline at end of file
@@ -160,7 +160,9 @@
           <iframe
             class="topic-info"
             :src="item.screenshot"
-            style="height: 100% !important"
+            :ref="'iframe' + index"
+            style="width: 100%"
+            @load="onIFrameLoad(index)"
           />
           <!-- <div class="topic-info" v-html="item.modifiedHtml"></div> -->
           <div class="topic-bottom">
@@ -172,7 +174,7 @@
               <span class="size">{{ item.knowledge }}</span>
             </div>
             <el-button
-              v-if="!questions.includes(item.id)"
+              v-if="!questions.some((obj) => item.id === obj.id)"
               class="button"
               type="primary"
               @click="handleAddTest(item)"
@@ -207,7 +209,7 @@
         v-if="
           !arraysEqual(
             topicList.map((item) => item.id),
-            questions
+            questions.map((item) => item.id)
           )
         "
         @click="handleAllTest()"
@@ -233,8 +235,11 @@
     </div>
     <wrongQuestionDialog
       :visible.sync="visible"
-      :ids="questions"
+      :list="questions"
       :subjectName="formData.subjectName"
+      :sectionId="formData.sectionId"
+      :gradeId="formData.grade"
+      @setQuestions="setQuestions"
     />
   </div>
 </template>
@@ -286,7 +291,7 @@ export default {
       formData: {
         classId: 1, // 班级选中
         // type: "onDay", // 时间类型
-        type: "onWeek", // 时间类型
+        type: "term", // 时间类型
         dateRange: ["2022-03-01", "2023-05-01"], // 开始结束时间
         startScoreRate: 0, // 开始区间
         endScoreRate: 100, // 结束区间
@@ -295,13 +300,19 @@ export default {
         grade: null, // 年级
         gradeName: null, // 年级名称
       },
-      questions: JSON.parse(localStorage.getItem("testlist")) || [],
+      questions: [],
     };
   },
   created() {
     this.handleDate(this.formData.type);
     this.queryLoading = true;
     this.getGradeList();
+    if (!localStorage.getItem("testlist")) {
+      localStorage.setItem("testlist", JSON.stringify(this.questions));
+    } else {
+      this.questions = JSON.parse(localStorage.getItem("testlist"));
+      console.log(this.questions, "===");
+    }
   },
   methods: {
     async loadAndModifyHTML(array) {
@@ -416,14 +427,15 @@ export default {
     // 加入试卷
     handleAddTest(item) {
-      if (this.questions.includes(item.id)) return;
+      // if (this.questions.includes(item.id)) return;
+      if (this.questions.some((obj) => obj.id === item.id)) return;
       this.questions = JSON.parse(localStorage.getItem("testlist")) || [];
-      this.questions.push(item.id);
+      this.questions.push(item);
       localStorage.setItem("testlist", JSON.stringify(this.questions));
     },
     // 移除试卷
     handleDel(item) {
-      let _index = this.questions.indexOf(item.id);
+      let _index = this.questions.findIndex((obj) => obj.id === item.id);
       if (_index !== -1) {
         this.questions.splice(_index, 1); // 从索引位置删除一个元素
         localStorage.setItem("testlist", JSON.stringify(this.questions));
@@ -432,12 +444,13 @@ export default {
     // 全部选中
     handleAllTest() {
       // 获取原来的localStorage
-      let list = JSON.parse(localStorage.getItem("testlist"));
-      console.log(list);
+      let list = JSON.parse(localStorage.getItem("testlist")) || [];
       let ids = this.topicList.map((item) => {
-        return item.id;
+        return item;
       });
+      console.log(list, "-=-11-=");
+
       this.questions = this.removeDuplicates([...ids, ...list]);
       localStorage.setItem("testlist", JSON.stringify(this.questions));
     },
@@ -445,7 +458,7 @@ export default {
     handleDelTest() {
       let list = this.removeMatchingValues(
         this.topicList.map((item) => item.id),
-        this.questions
+        this.questions.map((item) => item.id)
       );
       this.questions = list;
       localStorage.setItem("testlist", JSON.stringify(this.questions));
@@ -457,7 +470,14 @@ export default {
     },
     // 去重
     removeDuplicates(arr) {
-      return [...new Set(arr)];
+      const seen = new Set();
+      return arr.filter((item) => {
+        if (!seen.has(item.id)) {
+          seen.add(item.id);
+          return true;
+        }
+        return false;
+      });
     },
     // 去除第二数组中存在第一数组中的值
     removeMatchingValues(arr1, arr2) {
@@ -542,6 +562,30 @@ export default {
       // 如果没有匹配，直接返回原字符串
       return input;
     },
+
+    // 获取ref
+    onIFrameLoad(index) {
+      const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe
+      const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
+      const body = iframeRef.contentWindow.document.body;
+      const height = body.scrollHeight; // 获取内容的高度
+      iframeRef.style.height = `${height}px`; // 设置 iframe 的高度
+      // 获取第一个P标签
+      const firstP = doc.getElementsByTagName("p")[0];
+      // 或者修改第一个 < p > 标签的内容;
+      if (firstP) {
+        console.log(firstP, firstP.innerHTML, "-----innerHTML-----");
+        let a = this.processString(firstP.innerHTML);
+        firstP.innerHTML = a;
+      }
+    },
+
+    // 子集删除后 父级需要更新
+    setQuestions() {
+      console.log("我被调用");
+
+      this.questions = JSON.parse(localStorage.getItem("testlist")) || [];
+    },
   },
 };
 </script>
@@ -604,10 +648,8 @@ export default {
           border-radius: 5px 5px 0 0;
         }
         .topic-info {
-          height: 100% !important;
-          // flex: 1;
-          // overflow-y: auto;
-          padding: 10px 20px;
+          overflow-y: auto;
+          max-height: 300px;
         }
         .topic-bottom {
           height: 45px;
 const path = require("path");
 const resolve = (dir) => path.join(__dirname, dir);
 const IS_PROD = ["production", "prod"].includes(process.env.NODE_ENV);
-const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
+const BundleAnalyzerPlugin =
+  require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
 const TimeStamp = new Date().getTime();
@@ -26,13 +27,13 @@ module.exports = {
         // target:"http://ezquiz.sunvotecloud.cn",
         // target:"http://192.168.1.151:8089",
         // target: "https://ezquiz.sunvotecloud.cn",
-        // target: "http://121.40.127.171:8090",
-        target:"http://127.0.0.1:8089",
+        target: "http://121.40.127.171:8090",
+        // target:"http://127.0.0.1:8089",
         changeOrigin: true,
         ws: true,
       },
     },
-    disableHostCheck: true
+    disableHostCheck: true,
   },
   // configureWebpack: {
   //   devtool: 'source-map',
@@ -51,8 +52,8 @@ module.exports = {
     // }
   },
   chainWebpack: (config) => {
-    config.plugin('html').tap(args => {
-      args[0].title = '云平台';
+    config.plugin("html").tap((args) => {
+      args[0].title = "云平台";
       return args;
     });
     config.resolve.alias
@@ -108,4 +109,3 @@ module.exports = {
     });
   },
 };
-