From 9816329804175cf7d075ab5ae0a91dff7b8a8e21 Mon Sep 17 00:00:00 2001
From: 刘有才luck <14606842+liu-youcai-luck@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 15:18:02 +0800
Subject: [PATCH] wip: bug修复

---
 src/App.vue                                                        | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------
 src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue |  39 +++++++++++++++++++++++----------------
 src/views/basic/askTestQuestion/wrongQuestion.vue                  |  33 +++++++++++----------------------
 3 files changed, 123 insertions(+), 136 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 32ba27b..940b96e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,169 +1,160 @@
 <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 = `
+								min-width: 100vh;
+								min-height:100vh; 
           					`;
-				}
-
-			} 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>
diff --git a/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue b/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
index 60423dc..0392bfe 100644
--- a/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
+++ b/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
@@ -603,24 +603,31 @@ export default {
     },
     processString(input) {
       // 正则表达式：
-      const regexs = [/[0-9]+[.)]/, /（\d+分）/, /^(\d{1,3})/];
+      // 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, "");
-          }
-        }
+      // // 使用正则表达式匹配并处理输入字符串
+      // 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) {
+        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();
     },
 
     // 接受两个参数，返回需要删除的数据以及需要添加的数据
diff --git a/src/views/basic/askTestQuestion/wrongQuestion.vue b/src/views/basic/askTestQuestion/wrongQuestion.vue
index 17be1cf..2d843f5 100644
--- a/src/views/basic/askTestQuestion/wrongQuestion.vue
+++ b/src/views/basic/askTestQuestion/wrongQuestion.vue
@@ -55,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"
@@ -100,7 +100,7 @@
               %
             </div>
           </el-col>
-          <el-col class="col-margin" :span="6"
+          <el-col class="col-margin" :span="8"
             ><span
               style="font-weight: 600; width: fit-content; white-space: nowrap"
               >题型：</span
@@ -115,12 +115,11 @@
               {{ item.label }}
             </div></el-col
           >
-          <el-col class="col-margin" style="margin-left: 10px" :span="2"
+          <el-col class="col-margin" :span="2"
             ><el-button
               @click="handleSearch"
               style="background: #6b73f5"
               type="primary"
-              y
               >筛选错题</el-button
             ></el-col
           >
@@ -622,25 +621,15 @@ export default {
       this.getClassList();
     },
     processString(input) {
-      // 正则表达式：
-      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) {
+        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
--
libgit2 0.21.4