Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic

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;
 

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>

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;
 

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);
 }