From cfe502b8a5da0455aadcdab63ebc12cab0c26da5 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Tue, 7 May 2024 16:32:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/modal/ImgDetailModal.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/task/modal/ImgDetailModal.vue b/src/views/task/modal/ImgDetailModal.vue
index 3b9688b..1b6bf7b 100644
--- a/src/views/task/modal/ImgDetailModal.vue
+++ b/src/views/task/modal/ImgDetailModal.vue
@@ -310,10 +310,13 @@ defineExpose({
           不通过
         </n-button>
         <n-button
+        class="btn3"
           style="
      width:72px;
      height:38px;
       position: absolute;
+      border: 1px solid #cad2dd;
+      color:black;
     right: 36px;" @click="closeModal"
         >
           取消
@@ -591,4 +594,12 @@ defineExpose({
   background-color: #fff !important;
   border: 1px solid #cad2dd !important;
 }
+.btn3{
+border: 1px solid #cad2dd !important;
+color: black;
+}
+.btn3:hover{
+border: 1px solid #cad2dd !important;
+color: black;
+}
 </style>

From 2f60346e13ade3ed2ce17e39220d86d59870d723 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Tue, 7 May 2024 19:32:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E6=95=88=E6=9E=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue
index 9cd690d..3a4b793 100644
--- a/src/views/worksheet/index.vue
+++ b/src/views/worksheet/index.vue
@@ -42,7 +42,7 @@ function ApprovalOver(packageId) {
   flex-direction: row;
   box-sizing: border-box;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   padding-bottom: 16px;
   //height: calc(100% - 170px);
 }

From 0bda98a8d2726361d2b5633aca1ed508dc0ad207 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Wed, 8 May 2024 14:59:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=B7=A6=E4=BE=A7=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/aside/TaskList.vue           | 2 +-
 src/views/worksheet/aside/WorkSheetList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index e4bf28a..edbc350 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -185,7 +185,7 @@ defineExpose({
 
 <style lang="less" scoped>
 .list {
-  height: calc(100vh - 146px);
+  height: calc(100vh - 102px);
   overflow-y: scroll;
   overflow-x: hidden;
 
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 0573d40..e0cc321 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -188,7 +188,7 @@ defineExpose({
 
 <style lang="less" scoped>
 .list {
-  height: calc(100vh - 146px);
+  height: calc(100vh - 78px);
   overflow-y: scroll;
   overflow-x: hidden;