From 47e919133345e7f26f070bc2e1561b1a8141dbdd Mon Sep 17 00:00:00 2001
From: liufangjia <liufangjia@psunsky.com>
Date: Wed, 27 Nov 2024 15:13:48 +0800
Subject: [PATCH] feat: 代码提交

---
 src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 src/views/basic/askTestQuestion/wrongQuestion.vue                  |  19 ++++++++++++++++---
 2 files changed, 193 insertions(+), 60 deletions(-)

diff --git a/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue b/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
index 9c7948b..99696b2 100644
--- a/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
+++ b/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
@@ -1,76 +1,151 @@
 <template>
-  <el-dialog :visible.sync="visible" width="70%" :before-close="handleClose" :modal-append-to-body="false">
+  <el-dialog
+    :visible.sync="visible"
+    width="70%"
+    :before-close="handleClose"
+    :modal-append-to-body="false"
+  >
     <div class="test-box" v-if="groups">
       <div class="test">
         <div class="test-title" @click="enableEditing">
-          <div class="test-title" v-if="!isEditing" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave"
-            :class="isHovered ? 'hover' : ''">
+          <div
+            class="test-title"
+            v-if="!isEditing"
+            @mouseenter="handleMouseEnter"
+            @mouseleave="handleMouseLeave"
+            :class="isHovered ? 'hover' : ''"
+          >
             {{ inputValue }}
           </div>
-          <div v-if="isHovered" class="tooltip" :style="{
-            top: tooltipPosition.y + 'px',
-            left: tooltipPosition.x + 'px',
-          }">
+          <div
+            v-if="isHovered"
+            class="tooltip"
+            :style="{
+              top: tooltipPosition.y + 'px',
+              left: tooltipPosition.x + 'px',
+            }"
+          >
             单击设置试卷标题
           </div>
-          <el-input class="test-title" ref="editInput" v-if="isEditing" v-model="inputValue" @blur="save"
-            @keyup.enter.native="save" style="padding: 0 200px" />
+          <el-input
+            class="test-title"
+            ref="editInput"
+            v-if="isEditing"
+            v-model="inputValue"
+            @blur="save"
+            @keyup.enter.native="save"
+            style="padding: 0 200px"
+          />
         </div>
         <div class="test-group">
-          <div class="outer-item" v-for="(group, index) in groups" :key="group.questionType" :class="{
-            border: selectedIndex === group.questionType,
-          }" @mouseenter="handleGroupMouseEnter(group.questionType, 'all')" @mouseleave="handleGroupMouseLeave">
-            <div v-if="selectedIndex == group.questionType" class="border-del"
-              @click="handleDel(group.questionType, 'all')">
+          <div
+            class="outer-item"
+            v-for="(group, index) in groups"
+            :key="group.questionType"
+            :class="{
+              border: selectedIndex === group.questionType,
+            }"
+            @mouseenter="handleGroupMouseEnter(group.questionType, 'all')"
+            @mouseleave="handleGroupMouseLeave"
+          >
+            <div
+              v-if="selectedIndex == group.questionType"
+              class="border-del"
+              @click="handleDel(group.questionType, 'all')"
+            >
               删除
             </div>
             <!-- 每个组的标题 -->
-            <div class="test-group-title" :class="{
-              border: selectedIndex == group.questionType,
-            }" @mouseenter="handleGroupMouseEnter(group.questionType, '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" @click="groupEditing(index)" v-show="!group.input">{{ group.questionTitle }}</span>
-
-                <el-input :ref="'refInput' + index" class="size-16" size="mini" v-show="group.input"
-                  v-model="group.questionTitle" @blur="groupSave(index)" @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',
-                }">
+                <span
+                  @mouseenter="
+                    (event) => handleItemMouseEnter(event, group.questionType)
+                  "
+                  @mouseleave="handleItemMouseLeave"
+                  :class="isItemHovered == group.questionType ? 'hover' : ''"
+                  class="size-16"
+                  @click="groupEditing(index)"
+                  v-show="!group.input"
+                  >{{ group.questionTitle }}</span
+                >
+
+                <el-input
+                  :ref="'refInput' + index"
+                  class="size-16"
+                  size="mini"
+                  v-show="group.input"
+                  v-model="group.questionTitle"
+                  @blur="groupSave(index)"
+                  @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" style="margin-left: 10px">(共{{
-                  group.subQuestionIds.length }}题 / 共{{
+                <span
+                  v-if="group.subQuestionIds"
+                  class="size-16"
+                  style="margin-left: 10px"
+                  >(共{{ group.subQuestionIds.length }}题 / 共{{
                     group.questionScore * group.subQuestionIds.length
-                  }}分)</span>
+                  }}分)</span
+                >
               </div>
             </div>
 
             <!-- 内部的题目列表，允许组内排序 -->
-            <div style="display: flex" v-for="question in group.subQuestionIds" :key="question.id" :class="{
-              border: selectedItemIndex === question.id,
-            }" @mouseenter="handleGroupMouseEnter(question.id, 'number')" @mouseleave="handleGroupMouseLeave"
-              class="inner-item">
-              <div v-if="selectedItemIndex === question.id" class="border-del"
-                @click="handleDel(question.id, group.questionType)">
+            <div
+              style="display: flex"
+              v-for="question in group.subQuestionIds"
+              :key="question.id"
+              :class="{
+                border: selectedItemIndex === question.id,
+              }"
+              @mouseenter="handleGroupMouseEnter(question.id, 'number')"
+              @mouseleave="handleGroupMouseLeave"
+              class="inner-item"
+            >
+              <div
+                v-if="selectedItemIndex === question.id"
+                class="border-del"
+                @click="handleDel(question.id, group.questionType)"
+              >
                 删除
               </div>
               <div class="size color" style="margin-top: 20px">
-                <div style="max-width: 100px; white-space: nowrap; /* 不换行 */">
+                <div
+                  style="max-width: 100px; white-space: nowrap; /* 不换行 */"
+                >
                   {{ question.globalIndex }}、
                 </div>
               </div>
 
-              <iframe :src="question.screenshot" :ref="'iframe' + question.id" @load="onIFrameLoad(question.id)" style="
+              <iframe
+                :src="question.screenshot"
+                :ref="'iframe' + question.id"
+                @load="onIFrameLoad(question.id)"
+                style="
                   width: 100%;
                   pointer-events: none;
                   border: none; /* 启用点击穿透 */
-                "></iframe>
+                "
+              ></iframe>
             </div>
           </div>
         </div>
@@ -78,23 +153,43 @@
       <div class="edit">
         <div class="edit-title">
           <div class="edit-title-info">
-            共<span>{{ list.length }}</span>小题，卷面分<span>{{ sumValues() }}</span>分
+            共<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 @click="handleSava('print')">保存并打印</el-button>
-            <el-button class="button-width" type="danger" plain @click="handleClear">清空题目</el-button>
-            <el-button class="button-width" plain @click="handleSelect">继续选题</el-button>
+            <el-button class="button-width" type="primary" @click="handleSava"
+              >保存试卷</el-button
+            >
+            <el-button class="button-width" plain @click="handleSava('print')"
+              >保存并打印</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">
             题目排序
-            <span class="title size" style="color: #999999">(拖拽题号可拖拽排序)</span>
+            <span class="title size" style="color: #999999"
+              >(拖拽题号可拖拽排序)</span
+            >
           </div>
           <!-- 外层容器，允许拖拽整个组 -->
           <draggable v-model="groups" group="groups" @end="onEnd">
-            <div v-for="(group, index) in groups" :key="group.id" class="group-item">
+            <div
+              v-for="(group, index) in groups"
+              :key="group.id"
+              class="group-item"
+            >
               <!-- 每个组的标题 -->
               <div class="group-title">
                 <div class="size" style="font-weight: 600">
@@ -102,14 +197,28 @@
                 </div>
                 <div class="size">
                   单题分值：
-                  <el-input-number size="mini" v-model="group.questionScore" :min="1" :max="30"
-                    style="width: 100px"></el-input-number>
+                  <el-input-number
+                    size="mini"
+                    v-model="group.questionScore"
+                    :min="1"
+                    :max="30"
+                    style="width: 100px"
+                  ></el-input-number>
                 </div>
               </div>
 
               <!-- 内部的题目列表，允许组内排序 -->
-              <draggable class="questions" v-model="group.subQuestionIds" group="questions" @end="onItemEnd(group)">
-                <div v-for="question in group.subQuestionIds" :key="question.id" class="question-item">
+              <draggable
+                class="questions"
+                v-model="group.subQuestionIds"
+                group="questions"
+                @end="onItemEnd(group)"
+              >
+                <div
+                  v-for="question in group.subQuestionIds"
+                  :key="question.id"
+                  class="question-item"
+                >
                   {{ question.globalIndex }}
                 </div>
               </draggable>
@@ -157,6 +266,13 @@ export default {
         return null;
       },
     },
+    sectionId: {
+      // 科目
+      type: [String, Number],
+      default() {
+        return null;
+      },
+    },
   },
   data() {
     return {
@@ -279,8 +395,9 @@ export default {
       const iframeRef = this.$refs["iframe" + id][0]; // 获取对应的 iframe
       const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
       const body = iframeRef.contentWindow.document.body;
+      body.style.overflowX = "hidden"; // 不允许出现横向滚动条
       const height = body.scrollHeight; // 获取内容的高度
-      iframeRef.style.height = `${height}px`; // 设置 iframe 的高度
+      iframeRef.style.height = `${height + 20}px`; // 设置 iframe 的高度
       // 获取第一个P标签
       const firstP = doc.getElementsByTagName("p")[0];
       // 或者修改第一个 < p > 标签的内容;
@@ -547,6 +664,7 @@ export default {
       let param = {
         paperTitle: this.inputValue,
         subjectName: this.subjectName,
+        sectionId: this.sectionId,
         gradeId: this.gradeId,
         questions: this.groups.filter((item) => item.subQuestionIds.length > 0),
       };
@@ -559,11 +677,13 @@ export default {
           this.$emit("setQuestions");
           this.handleClose();
           if (type) {
-            this.$request.tPaperDetail({
-              paperId: res.data
-            }).then(detail => {
-              paperPrint(detail.data);
-            }); 
+            this.$request
+              .tPaperDetail({
+                paperId: res.data,
+              })
+              .then((detail) => {
+                paperPrint(detail.data);
+              });
           }
         }
       });
diff --git a/src/views/basic/askTestQuestion/wrongQuestion.vue b/src/views/basic/askTestQuestion/wrongQuestion.vue
index 448c716..b8b8e5e 100644
--- a/src/views/basic/askTestQuestion/wrongQuestion.vue
+++ b/src/views/basic/askTestQuestion/wrongQuestion.vue
@@ -507,7 +507,11 @@ export default {
 
     // 获取科目列表
     async getSubject(params) {
+      console.log(params, "params");
+
       let data = await this.$request.getSubjectList(params);
+      console.log(data, "--------");
+
       this.subjectList = data.data.subjectNames;
       this.formData.subjectName = this.subjectList[0];
       this.getClassList();
@@ -515,10 +519,15 @@ export default {
     // 获取年级列表
     async getGradeList() {
       let data = await this.$request.getClassList();
+      console.log(data, "----------data");
+
       this.gradeList = Array.from(
-        new Map(data.data.list.map((item) => [item.section, item])).values()
+        new Map(data.data.list.map((item) => [item.grade, item])).values()
       );
+      console.log(this.gradeList, "gradeList");
+
       this.formData.grade = this.gradeList[0].grade;
+      this.formData.sectionId = this.gradeList[0].section;
       this.formData.gradeName = this.gradeList.find(
         (itme) => itme.grade == this.formData.grade
       ).gradeName;
@@ -539,9 +548,12 @@ export default {
     },
 
     // 年级改变
-    changeGrade() {
+    changeGrade(value) {
+      let item = this.gradeList.find((subItem) => subItem.grade == value);
+      this.formData.sectionId = item.section;
+      this.formData.gradeName = item.gradeName;
       this.queryLoading = true;
-      this.getSubject();
+      this.getSubject({ gradeName: this.formData.gradeName });
     },
     // 科目改变
     changeSubject() {
@@ -569,6 +581,7 @@ export default {
       const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe
       const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
       const body = iframeRef.contentWindow.document.body;
+      body.style.overflowX = "hidden"; // 不允许出现横向滚动条
       const height = body.scrollHeight; // 获取内容的高度
       iframeRef.style.height = `${height}px`; // 设置 iframe 的高度
       // 获取第一个P标签
--
libgit2 0.21.4