From 14a8bde1fe1814d4ffb7c93563f244b3247f544b Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 11 Jun 2024 16:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home/components/LockList.vue | 28 +-----------------
 src/pages/Home/index.vue               | 41 +++++++++++++++++++++++---
 src/utils/request/request.ts           |  3 +-
 3 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/pages/Home/components/LockList.vue b/src/pages/Home/components/LockList.vue
index 518d1d6..04d4d07 100644
--- a/src/pages/Home/components/LockList.vue
+++ b/src/pages/Home/components/LockList.vue
@@ -53,33 +53,7 @@ const activeNames = ref([
   "otherPoint",
 ]);
 const list = ref<any>([]);
-const getData = (data: any, templateInfo: any): void => {
-  // 效验
-  let msg = "";
-  if (!templateInfo.headList[2].point.length && !templateInfo.tailsList[2].point.length) {
-    msg = "考号未框选！";
-  }
-  if (!templateInfo.headList[1].point.length && !templateInfo.tailsList[1].point.length) {
-    msg = "学科未框选！";
-  }
-  if (templateInfo.hasPosition) {
-    if (templateInfo.imgSrc.length === 2) {
-      if (
-        templateInfo.headList[0].point.length !== 4 ||
-        templateInfo.tailsList[0].point.length !== 4
-      ) {
-        msg = "定位点未框选完成！";
-      }
-    } else {
-      if (templateInfo.headList[0].point.length !== 4) {
-        msg = "定位点未框选完成！";
-      }
-    }
-  }
-  if (msg) {
-    ElMessage.error(msg);
-    return;
-  }
+const getData = (data: any): void => {
   // 修改数据
   changeData(data);
   // 显示弹窗内容
diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue
index 92d6679..fdcf3bb 100644
--- a/src/pages/Home/index.vue
+++ b/src/pages/Home/index.vue
@@ -163,7 +163,11 @@
             <el-button type="primary" size="large" @click="btnClick('save')"
               >保 存</el-button
             >
-            <el-button type="primary" size="large" @click="btnClick('lock')"
+            <el-button
+              type="primary"
+              size="large"
+              @click="btnClick('lock')"
+              :disabled="isLock"
               >锁 定</el-button
             >
           </div>
@@ -503,7 +507,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { onMounted, reactive, ref, nextTick } from "vue";
+import { onMounted, reactive, ref, nextTick, watch } from "vue";
 import { fabric } from "fabric";
 import { createWorker } from "tesseract.js";
 import html2canvas from "html2canvas";
@@ -712,6 +716,7 @@ const templateInfo = reactive<any>({
   questionList: [],
   otherData: [],
 });
+const isLock = ref<boolean>(false);
 // 画布相关
 const ctx = ref<any>(null);
 const fabricGroup = ref<any>(null);
@@ -747,7 +752,34 @@ onMounted(() => {
     }
   });
 });
-
+watch(
+  () => templateInfo,
+  (_new, _old) => {
+    if (!_new.headList[2].point.length && !_new.tailsList[2].point.length) {
+      isLock.value = true;
+      return;
+    }
+    if (!_new.headList[1].point.length && !_new.tailsList[1].point.length) {
+      isLock.value = true;
+      return;
+    }
+    if (_new.hasPosition) {
+      if (_new.imgSrc.length === 2) {
+        if (_new.headList[0].point.length !== 4 || _new.tailsList[0].point.length !== 4) {
+          isLock.value = true;
+          return;
+        }
+      } else {
+        if (_new.headList[0].point.length !== 4) {
+          isLock.value = true;
+          return;
+        }
+      }
+    }
+    isLock.value = false;
+  },
+  { deep: true }
+);
 // 初始化画布并添加事件
 const initCanvas = (): void => {
   imgDom.value = document.getElementById("picture-img");
@@ -1311,6 +1343,7 @@ const boxSelectAfter = async (): Promise<void> => {
         lock: true,
         text: `识别中...`,
         background: "rgba(0, 0, 0, 0.7)",
+        body: true,
       });
       const canvas = await html2canvas(imgDom.value, {
         scale: 4,
@@ -2714,7 +2747,7 @@ const btnClick = (str: string): void => {
   if (str === "save") {
     save(true);
   } else {
-    LockListRef.value.getData(data, templateInfo);
+    LockListRef.value.getData(data);
   }
 };
 
diff --git a/src/utils/request/request.ts b/src/utils/request/request.ts
index d7a68f1..c275f46 100644
--- a/src/utils/request/request.ts
+++ b/src/utils/request/request.ts
@@ -101,7 +101,8 @@ class Request {
     return new Promise((resolve, reject) => {
       loading = ElLoading.service({
         lock: true,
-        background: 'rgba(255,255, 255, 0.3)',
+        background: 'rgba(0,0, 0, 0.7)',
+        text: `加载中...`,
         body: true
       })
       if (config.interceptors?.requestInterceptors) {