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
刘鸿
2 parents 34aad61a 7f6131ad
Showing 10 changed files with 472 additions and 260 deletions
src/App.vue
src/api/urls/apis.js
src/assets/images/aside/wrong-question-default.png
src/assets/images/aside/wrong-question.png
src/router/index.js
src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
src/views/basic/askTestQuestion/update.vue
src/views/basic/askTestQuestion/wrongQuestion.vue
src/views/basic/dataSync/index.vue
src/views/personal/dataSync/index.vue
 <template>
-	<div id="app" ref="app">
-		<transition name="fade" mode="out-in">
-			<router-view></router-view>
-		</transition>
-	</div>
+  <div id="app" ref="app">
+    <transition name="fade" mode="out-in">
+      <router-view></router-view>
+    </transition>
+  </div>
 </template>
 <script>
 import _ from "lodash";
 export default {
-	name: "app",
-	mounted() {
+  name: "app",
+  mounted() {},
+  methods: {
+    _reSize() {
+      const $app = this.$refs.app;
-	},
-	methods: {
-		_reSize() {
+      const standardScale = "100%" / "100%";
-			const $app = this.$refs.app;
+      const docHeight = document.body.clientHeight;
-			const standardScale = "100%" / "100%";
+      const docWidth = document.body.clientWidth;
-			const docHeight = document.body.clientHeight;
+      if (docWidth < 1700) {
+        const currentScale = docHeight / docWidth;
-			const docWidth = document.body.clientWidth;
+        let [scale, translate] = [0, 0];
+        if (currentScale < standardScale) {
+          // 以高度计算
+          scale = docHeight / 1080;
-			if (docWidth < 1700) {
+          const shouleWidth = 1920 * scale;
-				const currentScale = docHeight / docWidth;
+          const offsetWidth = docWidth - shouleWidth;
-				let [scale, translate] = [0, 0];
-				if (currentScale < standardScale) {
-					// 以高度计算
-					scale = docHeight / 1080;
+          translate =
+            offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : "";
+        } else {
+          // 以宽度计算
+          scale = docWidth / 1920;
-					const shouleWidth = 1920 * scale;
+          const shouleHeight = 1080 * scale;
-					const offsetWidth = docWidth - shouleWidth;
+          const offsetHeight = docHeight - shouleHeight;
-					translate =
-						offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : "";
+          translate =
+            offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : "";
+        }
-				} else {
-					// 以宽度计算
-					scale = docWidth / 1920;
-
-					const shouleHeight = 1080 * scale;
-
-					const offsetHeight = docHeight - shouleHeight;
-
-					translate =
-						offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : "";
-				}
-
-				if (docHeight <= 600) {
-
-					$app.style.cssText = `
+        if (docHeight <= 600) {
+          $app.style.cssText = `
 							transform: scale(${scale}) ${translate};
 							transform-origin: top left;
 							min-width: 1920px;
 							min-height:830px;
           				`;
-				}
-				else if (docHeight == 610) {
-					$app.style.cssText = `
+        } else if (docHeight == 610) {
+          $app.style.cssText = `
 							transform: scale(${scale}) ${translate};
 							transform-origin: top left;
 							min-width: 1920px;
 							min-height:885px;
-          				`; 
-				}
-				else if (docHeight <= 606) { 
-					$app.style.cssText = `
+          				`;
+        } else if (docHeight <= 606) {
+          $app.style.cssText = `
 							transform: scale(${scale}) ${translate};
 							transform-origin: top left;
 							min-width: 1920px;
 							min-height:850px;
           				`;
-				}
-				else if (docHeight <= 650) {
-
-					$app.style.cssText = `
+        } else if (docHeight <= 650) {
+          $app.style.cssText = `
 							transform: scale(${scale}) ${translate};
 							transform-origin: top left;
 							min-width: 1920px;
 							min-height:850px;
           				`;
-				}
-				else if (docHeight <= 700) {
-
-					$app.style.cssText = `
+        } else if (docHeight <= 700) {
+          $app.style.cssText = `
 								transform: scale(${scale}) ${translate};
 								transform-origin: top left;
 								min-width: 1920px;
 								min-height: 890px; 
           					`;
-				}
-				else if (docHeight <= 750) {
-
-					$app.style.cssText = `
+        } else if (docHeight <= 750) {
+          $app.style.cssText = `
 								transform: scale(${scale}) ${translate};
 								transform-origin: top left;
 								min-width: 1920px;
 								min-height: 910px; 
           					`;
-				}
-				else {
-					$app.style.cssText = `
-								transform: scale(${scale}) ${translate};
-								transform-origin: top left;
-								min-width: 1920px;
-								min-height:1045px; 
+        }
+        // else {
+        // 	$app.style.cssText = `
+        // 				transform: scale(${scale}) ${translate};
+        // 				transform-origin: top left;
+        // 				min-width: 1920px;
+        // 				min-height:1045px;
+        // 			`;
+        // }
+        else {
+          $app.style.cssText = `
+          transform: scale(${scale}) ${translate};
+					transform-origin: top left;
+          min-width: 1920px;
+      		min-height:989px;
           					`;
-				}
-
-			} else {
-				$app.style.cssText = '';
-			}
-		},
-	},
-	created() {
-		let that = this;
-
-		this.$nextTick(() => {
-			if (document.createEvent) {
-				that._reSize();
-			} else if (document.createEventObject) {
-				that._reSize();
-			}
-		});
-	}
-}
-
+        }
+      } else {
+        $app.style.cssText = "";
+      }
+    },
+  },
+  created() {
+    let that = this;
+
+    this.$nextTick(() => {
+      if (document.createEvent) {
+        that._reSize();
+      } else if (document.createEventObject) {
+        that._reSize();
+      }
+    });
+  },
+};
 </script>
 <style lang="scss">
 body {
-	margin: 0px;
-	padding: 0px;
-	font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif;
-	-webkit-font-smoothing: antialiased;
+  margin: 0px;
+  padding: 0px;
+  font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC,
+    Hiragino Sans GB, SimSun, sans-serif;
+  -webkit-font-smoothing: antialiased;
 }
 #app {
-	position: absolute;
-	top: 0px;
-	bottom: 0px;
-	width: 100%;
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  width: 100%;
 }
 a {
-	color: #56a9ff;
+  color: #56a9ff;
 }
 .fade-enter-active,
 .fade-leave-active {
-	transition: all .2s ease;
+  transition: all 0.2s ease;
 }
 .fade-enter,
 .fade-leave-active {
-	opacity: 0;
+  opacity: 0;
 }
 #nprogress .bar {
-	height: 3px !important;
-	background: #56a9ff !important; //自定义颜色
+  height: 3px !important;
+  background: #56a9ff !important; //自定义颜色
 }
 </style>
@@ -506,7 +506,7 @@ export default {
   // 获取年级信息
   teacherClassList: "api_html/teaching/classList",
   // 获取班级信息
-  teacherGradeList: "api_html/teaching/grade",
+  teacherGradeList: "api_html/teaching/gradeByTeacher",
   // 保存接口
   getWrongQuestionSave: "api_html/teaching/wrongQuestion/save",
 };
@@ -346,8 +346,8 @@ let addrouters = [
       },
       {
         path: "/wrongQuestion",
-        iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"),
-        selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"),
+        iconImage: require("@/assets/images/aside/wrong-question-default.png"),
+        selectedIconImage: require("@/assets/images/aside/wrong-question.png"),
         name: "错题组卷",
         demoRoles: ["ROLE_JIAOSHI"],
         component: wrongQuestion,
@@ -37,6 +37,11 @@
             style="padding: 0 200px"
           />
         </div>
+        <div class="binding">
+          <div class="size color">班级：_____________</div>
+          <div class="size color">姓名：_____________</div>
+          <div class="size color">学号：_____________</div>
+        </div>
         <div class="test-group">
           <div
             class="outer-item"
@@ -59,7 +64,7 @@
             <div
               class="test-group-title"
               :class="{
-                border: selectedIndex == group.questionType,
+                borderTitle: selectedIndex == group.questionType,
               }"
               @mouseenter="handleGroupMouseEnter(group.questionType, 'all')"
             >
@@ -95,7 +100,7 @@
                     left: tooltipPosition.x + 'px',
                   }"
                 >
-                  单击设置试卷标题
+                  单击修改大题名称
                 </div>
                 <span
@@ -144,6 +149,7 @@
                   width: 100%;
                   pointer-events: none;
                   border: none; /* 启用点击穿透 */
+                  padding: 0 0 0 10px;
                 "
               ></iframe>
             </div>
@@ -158,10 +164,18 @@
             >分
           </div>
           <div class="edit-button">
-            <el-button class="button-width" type="primary" @click="handleSava"
+            <el-button
+              :disabled="dataYesNo(groups)"
+              class="button-width"
+              type="primary"
+              @click="handleSava"
               >保存试卷</el-button
             >
-            <el-button class="button-width" plain @click="handleSava('print')"
+            <el-button
+              :disabled="dataYesNo(groups)"
+              class="button-width"
+              plain
+              @click="handleSava('print')"
               >保存并打印</el-button
             >
             <el-button
@@ -177,10 +191,10 @@
           </div>
         </div>
         <div class="edit-info">
-          <div class="title size color" style="padding: 15px 0 0 10px">
+          <div class="title size color" style="padding: 10px 0 5px 10px">
             题目排序
-            <span class="title size" style="color: #999999"
-              >(拖拽题号可拖拽排序)</span
+            <span class="title size font-weight" style="color: #999999"
+              >(拖拽题号可排序)</span
             >
           </div>
           <!-- 外层容器，允许拖拽整个组 -->
@@ -202,9 +216,10 @@
                     v-model="group.questionScore"
                     :min="1"
                     :max="30"
-                    style="width: 100px"
-                    :step="1"
-                    :precision="0"
+                    style="width: 120px"
+                    :precision="1"
+                    :step="0.5"
+                    @change="handleInput"
                   ></el-input-number>
                 </div>
               </div>
@@ -274,6 +289,13 @@ export default {
         return null;
       },
     },
+    userId: {
+      // uid
+      type: [String, Number],
+      default() {
+        return null;
+      },
+    },
   },
   data() {
     return {
@@ -302,24 +324,32 @@ export default {
     visible(val) {
       if (val) {
         // 上面数据测试
-        this.testData = JSON.parse(localStorage.getItem("testData")) || [];
-        this.groups = JSON.parse(localStorage.getItem("question")) || [];
+        this.testData =
+          JSON.parse(localStorage.getItem(this.userId + "testData")) || [];
+        this.groups =
+          JSON.parse(localStorage.getItem(this.userId + "question")) || [];
         // 如果都没有直接return 执行初始化
         if (this.groups.length == 0) {
           this.init();
-          localStorage.setItem("testData", JSON.stringify(this.list));
+          localStorage.setItem(
+            this.userId + "testData",
+            JSON.stringify(this.list)
+          );
           return;
         }
         // 如果一致 就直接赋值
         if (
           this.arraysHaveSameIds(this.testData, this.list) &&
-          JSON.parse(localStorage.getItem("question"))
+          JSON.parse(localStorage.getItem(this.userId + "question"))
         ) {
           return;
         } else {
           let data = this.findMissingIds(this.testData, this.list);
           this.testData = this.list;
-          localStorage.setItem("testData", JSON.stringify(this.testData));
+          localStorage.setItem(
+            this.userId + "testData",
+            JSON.stringify(this.testData)
+          );
           this.testAddDel(this.groups, data.addArr, data.delArr);
         }
       } else {
@@ -346,7 +376,10 @@ export default {
         this.groups.reduce((accumulator, current) => {
           return accumulator.concat(current.subQuestionIds);
         }, []) || [];
-      localStorage.setItem("testData", JSON.stringify(this.testData));
+      localStorage.setItem(
+        this.userId + "testData",
+        JSON.stringify(this.testData)
+      );
     },
     /** 按钮 - 取消 */
     handleClose() {
@@ -370,7 +403,10 @@ export default {
       allItems.forEach((item, index) => {
         item.globalIndex = index + 1;
       });
-      localStorage.setItem("question", JSON.stringify(this.groups));
+      localStorage.setItem(
+        this.userId + "question",
+        JSON.stringify(this.groups)
+      );
     },
     classifyByType(arr) {
       const result = {};
@@ -397,7 +433,9 @@ export default {
       const doc = iframeRef.contentDocument || iframeRef.contentWindow.document;
       const body = iframeRef.contentWindow.document.body;
       body.style.overflowX = "hidden"; // 不允许出现横向滚动条
-      const height = body.scrollHeight; // 获取内容的高度
+      const height = body.offsetHeight; // 获取内容的高度
+      console.log(height, "height");
+      console.log(body, "body");
       iframeRef.style.height = `${height + 20}px`; // 设置 iframe 的高度
       // 获取第一个P标签
       const firstP = doc.getElementsByTagName("p")[0];
@@ -421,7 +459,10 @@ export default {
     // 保存修改后的内容，回车或失去焦点时触发
     save() {
       this.isEditing = false;
-      localStorage.setItem("question", JSON.stringify(this.groups));
+      localStorage.setItem(
+        this.userId + "question",
+        JSON.stringify(this.groups)
+      );
     },
     // 单题title修改
@@ -438,7 +479,10 @@ export default {
     // 单体title保存
     groupSave(index) {
       this.$set(this.groups[index], "input", false);
-      localStorage.setItem("question", JSON.stringify(this.groups));
+      localStorage.setItem(
+        this.userId + "question",
+        JSON.stringify(this.groups)
+      );
     },
     // 高亮
     selectItem(id, type) {
@@ -456,10 +500,16 @@ export default {
         let _index = this.groups.findIndex((item) => item.questionType == id);
         if (_index != -1) {
           this.groups.splice(_index, 1);
-          localStorage.setItem("question", JSON.stringify(this.groups));
+          localStorage.setItem(
+            this.userId + "question",
+            JSON.stringify(this.groups)
+          );
           this.updateGlobalIndexes();
           this.testDataFun();
-          localStorage.setItem("testlist", JSON.stringify(this.testData));
+          localStorage.setItem(
+            this.userId + "testlist",
+            JSON.stringify(this.testData)
+          );
           this.$emit("setQuestions");
         }
       } else {
@@ -470,10 +520,16 @@ export default {
             );
           }
         });
-        localStorage.setItem("question", JSON.stringify(this.groups));
+        localStorage.setItem(
+          this.userId + "question",
+          JSON.stringify(this.groups)
+        );
         this.updateGlobalIndexes();
         this.testDataFun();
-        localStorage.setItem("testlist", JSON.stringify(this.testData));
+        localStorage.setItem(
+          this.userId + "testlist",
+          JSON.stringify(this.testData)
+        );
         this.$emit("setQuestions");
       }
     },
@@ -547,19 +603,32 @@ export default {
       return false;
     },
     processString(input) {
-      // 正则表达式：匹配最多三位数字
-      const regex = /^(\d{1,3})/;
-
-      // 测试字符串是否以数字开头
-      const match = input.match(regex);
+      // 正则表达式：
+      // const regexs = [/[0-9]+[.)]/, /（\d+分）/, /^(\d{1,3})/];
+      // // 使用正则表达式匹配并处理输入字符串
+      // for (const regex of regexs) {
+      //   const match = input.match(regex);
+      //   if (match) {
+      //     if (regex === regexs[2]) {
+      //       // 如果匹配第三条规则，使用substring截取返回结果的长度加1
+      //       const matchLength = match[0].length;
+      //       return input.substring(matchLength + 1).trim();
+      //     } else {
+      //       // 如果匹配第一条或第二条规则，替换匹配的部分
+      //       input = input.replace(regex, "");
+      //     }
+      //   }
+      // }
+      const match = input.match(/^(\d{1,3})/);
       if (match) {
-        // 如果匹配，去掉开头的数字并返回剩余部分
-        return input.substring(match[0].length + 1).trim();
+        const matchLength = match[0].length;
+        input = input.substring(matchLength + 1).trim();
       }
-
-      // 如果没有匹配，直接返回原字符串
-      return input;
+      // 使用正则表达式匹配并处理输入字符串
+      input = input.replace(/[0-9]+[.)．]/, "");
+      input = input.replace(/（\d+(\.\d+)?分）/g, "");
+      return input.trim();
     },
     // 接受两个参数，返回需要删除的数据以及需要添加的数据
@@ -608,16 +677,14 @@ export default {
         // 删除数据
         arr3.forEach((item3) => {
           // 在 array1 中找到匹配的 type
-          let matchedArray1Item = arr1.find(
-            (item1) => item1.questionType == item3.questionType
+          let matchedArray1Item = arr1.find((item1) =>
+            item1.subQuestionIds.filter((item) => item.id == item3.id)
           );
           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);
             }
@@ -673,10 +740,21 @@ export default {
         if (res.status == 0) {
           this.groups = [];
           this.testData = [];
-          localStorage.setItem("testlist", JSON.stringify(this.testData));
-          localStorage.setItem("question", JSON.stringify(this.groups));
+          localStorage.setItem(
+            this.userId + "testlist",
+            JSON.stringify(this.testData)
+          );
+          localStorage.setItem(
+            this.userId + "question",
+            JSON.stringify(this.groups)
+          );
           this.$emit("setQuestions");
           this.handleClose();
+          this.$message({
+            message: "已保存到“即时测-组卷-我自编的”",
+            type: "success",
+          });
+
           if (type == "print") {
             this.$request
               .tPaperDetail({
@@ -693,7 +771,7 @@ export default {
     // 清空
     handleClear() {
       this.$confirm("确定要清空试题篮内的全部题目吗?", "提示", {
-        confirmButtonText: "确定",
+        confirmButtonText: "清空",
         cancelButtonText: "取消",
         confirmButtonClass: "el-button--danger1",
         cancelButtonClass: "el-button--primary",
@@ -705,8 +783,15 @@ export default {
         .then(() => {
           this.groups = [];
           this.testDataFun();
-          localStorage.setItem("question", JSON.stringify(this.groups));
-          localStorage.setItem("testlist", JSON.stringify(this.testData));
+          localStorage.setItem(
+            this.userId + "question",
+            JSON.stringify(this.groups)
+          );
+          localStorage.setItem(
+            this.userId + "testlist",
+            JSON.stringify(this.testData)
+          );
+
           this.$emit("setQuestions");
         })
         .catch(() => {
@@ -724,6 +809,30 @@ export default {
         return sum + Number(item.questionScore) * item.subQuestionIds.length;
       }, 0);
     },
+
+    // 当分数发生变化的时候
+    handleInput() {
+      localStorage.setItem(
+        this.userId + "question",
+        JSON.stringify(this.groups)
+      );
+    },
+    dataYesNo(data) {
+      if (data.length < 1) {
+        return true;
+      }
+      let list = [];
+      data.forEach((item) => {
+        list.push(...item.subQuestionIds);
+      });
+      console.log(list, "list");
+
+      if (list.length < 1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
   },
 };
 </script>
@@ -739,9 +848,9 @@ export default {
   .test {
     flex: 1;
     height: fit-content;
-    max-height: 742px;
+    height: 742px;
     overflow-y: auto;
-    box-shadow: 0 0 10px 0 #999999;
+    box-shadow: 0 0 10px 0 #cfcfcf;
     margin-right: 20px;
     box-sizing: border-box;
     padding: 0 20px;
@@ -763,13 +872,17 @@ export default {
       justify-content: space-around;
       align-items: center;
     }
-
+    .binding {
+      display: flex;
+      padding: 20px 80px;
+      justify-content: space-around;
+    }
     .test-group {
       .test-group-title {
         position: relative;
         height: 40px;
-        line-height: 30px;
-        padding: 10px 0 0 0;
+        line-height: 40px;
+        padding: 0;
       }
     }
   }
@@ -782,7 +895,8 @@ export default {
     .edit-title {
       width: 100%;
       height: 200px;
-      border: 1px solid #999999;
+      border: 1px solid #cfcfcf;
+      border-radius: 5px;
       .edit-title-info {
         height: 60px;
@@ -814,11 +928,12 @@ export default {
     .edit-info {
       flex: 1;
-      border: 1px solid #999999;
+      border: 1px solid #cfcfcf;
       margin-top: 20px;
       max-height: 500px;
       padding: 10px;
       overflow: auto;
+      border-radius: 5px;
       .group-item {
         margin: 10px;
@@ -838,14 +953,14 @@ export default {
       .questions {
         display: flex;
         flex-wrap: wrap;
-
+        padding: 10px 0;
         .question-item {
           width: 35px;
           height: 35px;
           border: 1px solid rgb(172, 188, 249);
           border-radius: 4px;
           cursor: grab;
-          margin: 5px 8px;
+          margin: 0 10px 10px 10px;
           line-height: 35px;
           text-align: center;
           font-size: 16px !important;
@@ -882,6 +997,7 @@ export default {
 .border {
   border: 1px solid rgb(173, 190, 250);
   position: relative;
+  border-radius: 3px;
   .border-del {
     position: absolute;
@@ -894,7 +1010,7 @@ export default {
     color: rgb(67, 141, 255);
     font-size: 14px !important;
     line-height: 28px;
-    font-weight: 600;
+
     cursor: pointer;
   }
 }
@@ -919,9 +1035,16 @@ export default {
   background: rgb(233, 237, 253);
   width: fit-content;
 }
+.borderTitle {
+  background: rgba(102, 127, 253, 0.1);
+  padding: 0;
+}
 .title-bg {
   background: rgb(115, 142, 246);
   border-bottom: 1px solid rgb(115, 142, 246);
 }
+.font-weight {
+  font-weight: 400;
+}
 </style>
@@ -80,7 +80,7 @@
                     </div>
                     <div class="qs-partScore">
                       <p v-if="subQuestion.questionType != 3">------</p>
-                      <el-input-number class="number-ipt" v-else size="medium" :min="0" :precision="2"
+                      <el-input-number :disabled="isViewer && !isWrong" class="number-ipt" v-else size="medium" :min="0" :precision="2"
                         :max="subQuestion.score" :step="0.5" v-model="subQuestion.partScore" label="漏选得分" />
                     </div>
                     <div class="qs-options">
@@ -162,7 +162,7 @@
                     </div>
                     <div class="qs-partScore">
                       <p v-if="question.questionType != 3">------</p>
-                      <el-input-number class="number-ipt" v-else size="medium" :min="0" :precision="2"
+                      <el-input-number :disabled="isViewer && !isWrong" class="number-ipt" v-else size="medium" :min="0" :precision="2"
                         :max="question.score" :step="0.5" v-model="question.partScore" label="漏选得分" />
                     </div>
                     <div class="qs-options">
@@ -331,7 +331,7 @@
       </div>
       <div class="content-fi">
         <el-button type="info" @click="linkBack">取消</el-button>
-        <el-button class="green-el-button" @click="save">保存</el-button>
+        <el-button v-if="!isViewer || isWrong" class="green-el-button" @click="save">保存</el-button>
       </div>
     </el-main>
   </el-container>
 <template>
   <div class="page-content" v-loading="queryLoading">
     <div class="page-title">
-      <span class="default-title">错题组卷</span>
+      <span class="default-title"
+        >错题组卷
+        <span class="font-weight size" style="color: #666666"
+          >（暂仅包含即时测内使用"导入的试卷"测验后产生的错题，不包含授课端截屏保存的错题）</span
+        ></span
+      >
+
       <div>
         <el-select
           v-model="formData.grade"
@@ -21,7 +27,7 @@
           @change="changeSubject"
           v-model="formData.subjectName"
           placeholder=""
-          style="width: 100px; margin-left: 10px"
+          style="width: 120px; margin-left: 10px"
         >
           <el-option
             v-for="(item, index) in subjectList"
@@ -49,7 +55,7 @@
             </div>
           </el-col>
           <el-col class="col-margin" :span="12">
-            <span style="font-weight: 600">时间：</span>
+            <span style="font-weight: 600; white-space: nowrap">时间：</span>
             <el-date-picker
               :clearable="false"
               value-format="yyyy-MM-dd"
@@ -71,7 +77,7 @@
           </el-col>
           <el-col class="col-margin" :span="8">
             <span style="font-weight: 600">得分率：</span>
-            <div>
+            <div style="font-size: 16px !important">
               <el-input
                 v-model="formData.startScoreRate"
                 type="number"
@@ -95,10 +101,7 @@
             </div>
           </el-col>
           <el-col class="col-margin" :span="7"
-            ><span
-              style="font-weight: 600; width: fit-content; white-space: nowrap"
-              >题型：</span
-            >
+            ><span style="font-weight: 600; white-space: nowrap">题型：</span>
             <div
               @click="handleQuestion(item.value)"
               class="select-box"
@@ -114,7 +117,6 @@
               @click="handleSearch"
               style="background: #6b73f5"
               type="primary"
-              y
               >筛选错题</el-button
             ></el-col
           >
@@ -130,13 +132,21 @@
             >道题)</span
           >
         </div>
+        <div
+          style="text-align: center; line-height: 400px"
+          v-if="topicList.length < 1"
+        >
+          筛选条件下，暂无题目
+        </div>
         <div class="topic" v-for="(item, index) in topicList" :key="index">
           <div class="topic-title">
             <div style="display: flex">
               <div style="display: flex; align-items: center">
-                <span class="size"> 第 {{ item.questionIndex }} 题 </span>
+                <span class="size font-weight">
+                  第 {{ item.questionIndex }} 题
+                </span>
                 <div
-                  class="select-box Selected size"
+                  class="select-box Selected size font-weight"
                   style="padding: 3px 5px; margin-right: 20px"
                 >
                   {{
@@ -148,39 +158,46 @@
               </div>
               <div>
                 <span class="color size"> 得分率： </span>
-                <span class="score-color size">{{ item.scoreRate }}%</span>
-                <span class="size">({{ item.joinClassNames }})</span>
+                <span class="score-color size"
+                  >{{ formatNumber(item.scoreRate) }}%</span
+                >
+                <span class="size font-weight"
+                  >({{ item.joinClassNames }})</span
+                >
               </div>
             </div>
             <div>
-              <span class="color size">来自试卷：</span
-              ><span class="size">{{ item.paperName }}</span>
-              <span class="color size" style="margin-left: 20px"
+              <span class="color size font-weight">来自试卷：</span
+              ><span class="size font-weight">{{ item.paperName }}</span>
+              <span class="color size font-weight" style="margin-left: 20px"
                 >测试时间：</span
-              ><span class="size">{{ item.testTime }}</span>
+              ><span class="size font-weight">{{ item.testTime }}</span>
             </div>
           </div>
           <iframe
-            class="topic-info"
             :src="item.screenshot"
             :ref="'iframe' + index"
-            style="width: 100%"
+            style="width: 100%; border: none; padding: 0 0 0 10px"
             @load="onIFrameLoad(index)"
           />
           <!-- <div class="topic-info" v-html="item.modifiedHtml"></div> -->
           <div class="topic-bottom">
-            <div>
+            <div style="padding-left: 20px">
               <span
                 v-if="item.answerScreenshot"
-                class="knowledge size"
+                class="knowledge size font-weight"
                 @click="handleAnalysis(item.answerScreenshot)"
                 ><i class="el-icon-key"></i>查看解析</span
               >
-              <span class="color size">知识点：</span>
-              <span class="size">{{ item.knowledge }}</span>
+              <span class="color size font-weight">知识点：</span>
+              <span v-if="item.knowledge" class="size">{{
+                item.knowledge
+              }}</span>
+              <span v-else class="size color font-weight">未标注</span>
             </div>
             <el-button
+              style="margin-right: 20px"
               v-if="!questions.some((obj) => item.id === obj.id)"
               class="button"
               type="primary"
@@ -190,9 +207,9 @@
             <el-button
               v-else
               plain
-              style="padding: 5px 10px"
+              style="padding: 5px 10px; margin-right: 20px"
               @click="handleDel(item)"
-              >移除试卷</el-button
+              >移出试卷</el-button
             >
           </div>
         </div>
@@ -219,6 +236,7 @@
             questions.map((item) => item.id)
           )
         "
+        style="margin-right: 20px"
         @click="handleAllTest()"
         >全选本页</el-button
       >
@@ -227,8 +245,8 @@
         class="button-size"
         v-else
         plain
-        style="padding: 5px 10px"
-        >移除本页</el-button
+        style="padding: 5px 10px; margin-right: 20px"
+        >移出本页</el-button
       >
     </div>
     <div class="shopping" @click="handleShop">
@@ -247,6 +265,7 @@
       :sectionId="formData.sectionId"
       :gradeId="formData.grade"
       @setQuestions="setQuestions"
+      :userId="userId"
     />
     <analysisDialog
       :visible.sync="analysisVisible"
@@ -289,8 +308,8 @@ export default {
       classList: [],
       // 时间选择
       dateList: [
-        { type: "onDay", name: "今天" },
         { type: "onWeek", name: "本周" },
+        { type: "onMonth", name: "本月" },
         { type: "term", name: "本学期" },
       ],
       // 题型选择
@@ -307,27 +326,34 @@ export default {
       formData: {
         classId: 1, // 班级选中
         // type: "onDay", // 时间类型
-        type: "onDay", // 时间类型
+        type: "onWeek", // 时间类型
         dateRange: ["2022-03-01", "2023-05-01"], // 开始结束时间
         startScoreRate: 0, // 开始区间
-        endScoreRate: 100, // 结束区间
+        endScoreRate: 60, // 结束区间
         questionType: null, // 题型
         subjectName: null, // 科目
         grade: null, // 年级
         gradeName: null, // 年级名称
       },
+      userId: "",
       questions: [],
     };
   },
   created() {
+    let user = JSON.parse(localStorage.getItem("info"));
+    this.userId = user.uid;
     this.handleDate(this.formData.type);
     this.queryLoading = true;
     this.getGradeList();
-    if (!localStorage.getItem("testlist")) {
-      localStorage.setItem("testlist", JSON.stringify(this.questions));
+    if (!localStorage.getItem(this.userId + "testlist")) {
+      localStorage.setItem(
+        this.userId + "testlist",
+        JSON.stringify(this.questions)
+      );
     } else {
-      this.questions = JSON.parse(localStorage.getItem("testlist"));
-      console.log(this.questions, "===");
+      this.questions = JSON.parse(
+        localStorage.getItem(this.userId + "testlist")
+      );
     }
   },
   methods: {
@@ -370,7 +396,10 @@ export default {
       return list;
     },
     // 获取列表
-    async getList() {
+    async getList(type) {
+      if (type) {
+        this.listPage.page = 1;
+      }
       let param = {
         ...this.listPage,
         ...this.formData,
@@ -389,7 +418,7 @@ export default {
     },
     pageSizeChange(value) {
       this.listPage.page = value;
-      this.handleSearch();
+      this.getList();
     },
     // 全选按钮
@@ -419,12 +448,10 @@ export default {
       if (value < this.minValue) {
         this.formData.startScoreRate = this.minValue; // 修正值
       }
-      if (value > this.maxValue) {
-        this.formData.startScoreRate = this.maxValue; // 修正值
-      }
       if (value > this.formData.endScoreRate) {
         this.formData.startScoreRate = this.formData.endScoreRate;
       }
+
       if (!value) {
         this.formData.startScoreRate = 0;
       }
@@ -434,12 +461,13 @@ export default {
       if (value < this.minValue) {
         this.formData.endScoreRate = this.minValue; // 修正值
       }
-      if (value > this.maxValue) {
-        this.formData.endScoreRate = this.maxValue; // 修正值
-      }
+
       if (value < this.formData.startScoreRate) {
         this.formData.endScoreRate = this.formData.startScoreRate;
       }
+      if (value > this.maxValue) {
+        this.formData.endScoreRate = this.maxValue; // 修正值
+      }
       if (!value) {
         this.formData.endScoreRate = 0;
       }
@@ -448,50 +476,63 @@ export default {
     // 搜索按钮
     handleSearch() {
       this.queryLoading = true;
-      this.getList();
+      this.getList("type");
     },
     // 加入试卷
     handleAddTest(item) {
       // 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 =
+        JSON.parse(localStorage.getItem(this.userId + "testlist")) || [];
       this.questions.push(item);
-      localStorage.setItem("testlist", JSON.stringify(this.questions));
+      localStorage.setItem(
+        this.userId + "testlist",
+        JSON.stringify(this.questions)
+      );
     },
     // 移除试卷
     handleDel(item) {
       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));
+        localStorage.setItem(
+          this.userId + "testlist",
+          JSON.stringify(this.questions)
+        );
       }
     },
     // 全部选中
     handleAllTest() {
       // 获取原来的localStorage
-      let list = JSON.parse(localStorage.getItem("testlist")) || [];
+      let list =
+        JSON.parse(localStorage.getItem(this.userId + "testlist")) || [];
       let ids = this.topicList.map((item) => {
         return item;
       });
-      console.log(list, "-=-11-=");
-
       this.questions = this.removeDuplicates([...ids, ...list]);
-      localStorage.setItem("testlist", JSON.stringify(this.questions));
+      localStorage.setItem(
+        this.userId + "testlist",
+        JSON.stringify(this.questions)
+      );
     },
     // 全部删除
     handleDelTest() {
       let list = this.removeMatchingValues(this.topicList, this.questions);
       this.questions = list;
-      console.log("移除本业", this.questions);
-
-      localStorage.setItem("testlist", JSON.stringify(this.questions));
+      localStorage.setItem(
+        this.userId + "testlist",
+        JSON.stringify(this.questions)
+      );
     },
     // 重置 去除locastorage 以及 questions
     handleRest() {
       this.questions = [];
-      localStorage.setItem("testlist", JSON.stringify(this.questions));
+      localStorage.setItem(
+        this.userId + "testlist",
+        JSON.stringify(this.questions)
+      );
     },
     // 去重
     removeDuplicates(arr) {
@@ -529,27 +570,17 @@ export default {
     // 获取科目列表
     async getSubject(params) {
-      console.log(params, "params");
-
       let data = await this.$request.getSubjectList(params);
-      console.log(data, "--------");
-
       this.subjectList = data.data.subjectNames;
-      console.log(this.subjectList, "我被打印了");
-
       this.formData.subjectName = this.subjectList[0];
       this.getClassList();
     },
     // 获取年级列表
     async getGradeList() {
       let data = await this.$request.getClassList();
-      console.log(data, "----------data");
-
       this.gradeList = Array.from(
         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(
@@ -559,8 +590,6 @@ export default {
     },
     // 获取班级信息
     async getClassList() {
-      console.log(this.formData, "this.formDate");
-
       let data = await this.$request.getGradeList({
         grade: this.formData.grade,
         subjectName: this.formData.subjectName,
@@ -572,7 +601,7 @@ export default {
         }),
       ];
       this.formData.classId = null;
-      this.getList();
+      this.getList("type");
     },
     // 年级改变
@@ -589,29 +618,42 @@ export default {
       this.getClassList();
     },
     processString(input) {
-      // 正则表达式：匹配最多三位数字
-      const regex = /^(\d{1,3})/;
-
-      // 测试字符串是否以数字开头
-      const match = input.match(regex);
-
+      const match = input.match(/^(\d{1,3})/);
       if (match) {
-        // 如果匹配，去掉开头的数字并返回剩余部分
-        return input.substring(match[0].length + 1).trim();
+        const matchLength = match[0].length;
+        input = input.substring(matchLength + 1).trim();
       }
-
-      // 如果没有匹配，直接返回原字符串
-      return input;
+      // 使用正则表达式匹配并处理输入字符串
+      input = input.replace(/[0-9]+[.)．]/, "");
+      input = input.replace(/（\d+(\.\d+)?分）/g, "");
+      return input.trim();
     },
     // 获取ref
     onIFrameLoad(index) {
       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标签
+      // const firstP = doc.getElementsByTagName("p")[0];
+      // // 或者修改第一个 < p > 标签的内容;
+      // if (firstP) {
+      //   let a = this.processString(firstP.innerHTML);
+      //   firstP.innerHTML = a;
+      // }
       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 的高度
+      const height = body.offsetHeight; // 获取内容的高度
+      console.log(height, "height");
+      // console.log("body.offsetHeight:", body.offsetHeight);
+      // console.log("body.clientHeight:", body.clientHeight);
+      // console.log("body.scrollHeight:", body.scrollHeight);
+
+      iframeRef.style.height = `${height + 20}px`; // 设置 iframe 的高度
       // 获取第一个P标签
       const firstP = doc.getElementsByTagName("p")[0];
       // 或者修改第一个 < p > 标签的内容;
@@ -623,7 +665,8 @@ export default {
     // 子集删除后 父级需要更新
     setQuestions() {
-      this.questions = JSON.parse(localStorage.getItem("testlist")) || [];
+      this.questions =
+        JSON.parse(localStorage.getItem(this.userId + "testlist")) || [];
     },
     //  查看解析
@@ -631,6 +674,24 @@ export default {
       this.analysisUrl = url;
       this.analysisVisible = true;
     },
+
+    // 保留两位小数
+    formatNumber(num) {
+      // 检查是否是数字
+      if (typeof num !== "number") {
+        throw new Error("输入必须是数字");
+      }
+
+      // 检查小数位数
+      const parts = num.toString().split(".");
+      if (parts.length === 2 && parts[1].length > 2) {
+        // 如果小数部分超过两位，保留两位小数
+        return Math.round(num * 100) / 100;
+      } else {
+        // 否则返回原数据
+        return num;
+      }
+    },
   },
 };
 </script>
@@ -675,12 +736,10 @@ export default {
         }
       }
       .topic {
-        height: fit-content;
-        max-height: 500px;
         margin-top: 15px;
         display: flex;
         flex-direction: column;
-        box-shadow: 0px 0px 9px 0px #999999;
+        box-shadow: 0px 0px 9px 0px #cfcfcf;
         border-radius: 5px;
         .topic-title {
           height: 45px;
@@ -692,19 +751,14 @@ export default {
           padding: 0 20px;
           border-radius: 5px 5px 0 0;
         }
-        .topic-info {
-          overflow-y: auto;
-          max-height: 300px;
-        }
         .topic-bottom {
           height: 45px;
           display: flex;
           align-items: center;
           justify-content: space-between;
-          margin: 0 20px;
           font-weight: 600;
           box-sizing: border-box;
-          border-top: 1px solid #d2cdcd;
+          border-top: 1px dashed #e0dbdb;
           .knowledge {
             color: rgb(105, 134, 205);
             margin-right: 30px;
@@ -718,15 +772,14 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    border-top: 1px solid #666666;
+    border-top: 1px solid #cfcfcf;
     background: #ffffff;
-    box-shadow: 0 0 3px 0 #666666;
     padding: 5px 20px 0 20px;
   }
   .shopping {
-    width: 40px;
-    height: 120px;
+    width: 50px;
+    height: 135px;
     position: fixed;
     top: 30%;
     right: 0;
@@ -744,13 +797,13 @@ export default {
     text-align: center;
     cursor: pointer;
     .shopping-select {
-      width: 20px;
-      height: 20px;
+      width: 25px;
+      height: 25px;
       border-radius: 50%;
-      background: yellow;
-      color: red;
-      line-height: 20px;
+      background: #eb5151;
+      color: #ffffff;
       font-size: 12px !important;
+      line-height: 25px;
     }
     .size {
       font-size: 14px !important;
@@ -766,6 +819,7 @@ export default {
   margin: 10px 0;
   display: flex;
   align-items: center;
+  font-size: 16px !important;
 }
 .button {
   background: #6b73f5;
@@ -775,6 +829,7 @@ export default {
   padding: 5px 10px;
   border-radius: 5px;
   margin: 0 8px;
+  font-size: 16px !important;
   cursor: pointer;
   white-space: nowrap;
   width: fit-content;
@@ -795,4 +850,15 @@ export default {
 .size {
   font-size: 14px !important;
 }
+.font-weight {
+  font-weight: 400;
+}
+.filter-datePicker {
+  font-size: 16px !important;
+}
+::v-deep .el-button {
+  span {
+    font-size: 16px !important;
+  }
+}
 </style>
@@ -57,12 +57,12 @@
 <script>
 import { formatDate } from "@/utils";
+import conf from "@/config/index";
 export default {
   data() {
     return {
       role: "",
-      downLoading: false,
-      url: "/api_html/teaching/importData",
+      downLoading: false, 
       file: {},
       dialogVisible: false,
       tipData: {
@@ -82,6 +82,21 @@ export default {
       this.url = "/api_html/personal/importData"
     }
   },
+  computed: {
+    url: function () { 
+      var requestUrl = ''; 
+      var ogrinUrl = "/api_html/teaching/importData"; 
+      var baseUrl = conf.baseURL; 
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      } 
+      console.log(requestUrl);
+      return requestUrl;
+    }
+  },
   methods: {
     async downloadFile() {
       if (this.downLoading) return;
@@ -58,11 +58,11 @@
 <script>
 import { formatDate } from "@/utils";
+import conf from "@/config/index";
 export default {
   data() {
     return {
-      downLoading: false,
-      url: "/api_html/personal/importData",
+      downLoading: false, 
       file: {},
       dialogVisible: false,
       tipData: {
@@ -72,6 +72,21 @@ export default {
       },
     };
   },
+  computed: {
+    url: function () { 
+      var requestUrl = ''; 
+      var ogrinUrl = "/api_html/personal/importData"; 
+      var baseUrl = conf.baseURL; 
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      } 
+      console.log(requestUrl);
+      return requestUrl;
+    }
+  },
   methods: {
     async downloadFile() {
       if (this.downLoading) return;