From f2712d2e91bc19b676a0ffcf4ee42423c05c5b5b Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 8 Jan 2024 17:05:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6):=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue              |  8 ++++----
 .../page/listOfCountries.vue                         | 12 +++++++-----
 .../accessStandardsAndRegulations/page/listOther.vue | 12 +++++++-----
 .../page/listProject.vue                             | 12 +++++++-----
 .../page/listTracking.vue                            |  6 ++++--
 .../localProductsOrProjectLibrary/index.vue          | 10 ++++++----
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index b3fcc2a4e..ddf6cf3eb 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -4,7 +4,7 @@
     <div class="dynamic-content">
       <!-- 实施预警 -->
       <div class="dynamic">
-        <div class="container">
+        <div class="container" style="height: 100%">
           <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
           <!--            <el-tab-pane label="标准预警" name="STANDARD">-->
           <div class="dynamic-content">
@@ -166,7 +166,7 @@
                 </el-row>
               </el-form>
             </div>
-            <div style="float: right;margin: 0 3% 10px 0">
+            <div style="margin: 0 3% 10px 0;display: flex;justify-content: right">
               <el-button
                 v-btn-permission="'a34dcbc3a44a297a6b6cc95e450b28ea'"
                 type="primary"
@@ -176,13 +176,13 @@
                 导出Excel
               </el-button>
             </div>
-            <div class="content">
+            <div class="content" style="height: calc(100% - 224px);padding-bottom: 0">
               <!--              <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
               <el-table
                 v-loading="warningTableLoading"
                 :data="warningTableDatas"
                 style="overflow-y: auto;"
-                height="100%"
+                height="calc(100% - 57px)"
                 border
                 :resizable="false"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index ba8a2fdbe..eab79719b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -423,22 +423,24 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #listOfCountries {
-  //height: 100%;
+  height: 100%;
   display: flex;
   flex-direction: column;
-  min-height: calc(100% - 100px);
+  //min-height: calc(100% - 100px);
   overflow-y: auto;
 
   .container {
     display: flex;
     flex-direction: column;
     position: relative;
-    flex: auto;
+    //flex: auto;
     width: 100%;
     //height: calc(100% - 110px) !important;
-    height: calc(~'100% - 30px');
+    //height: calc(~'100% - 30px');
+    height: calc(~'100% - 106px');
     .table_info {
-      height: calc(70vh - 90px);
+      //height: calc(70vh - 90px);
+      height: calc(100% - 57px);
     }
 
     .pagination {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index d0ab67210..bec349057 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -403,22 +403,24 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #listOfCountries {
-  //height: 100%;
+  height: 100%;
   display: flex;
   flex-direction: column;
-  min-height: calc(100% - 100px);
+  //min-height: calc(100% - 100px);
   overflow-y: auto;
 
   .container {
     display: flex;
     flex-direction: column;
     position: relative;
-    flex: auto;
+    //flex: auto;
     width: 100%;
     //height: calc(~'100% - 105px - 56px') !important;
-    height: calc(~'100% - 30px');
+    //height: calc(~'100% - 30px');
+    height: calc(~'100% - 106px');
     .table_info {
-      height: calc(70vh - 90px);
+      //height: calc(70vh - 90px);
+      height: calc(100% - 57px);
     }
     .pagination {
       position: inherit;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 7844d1e3b..eff519613 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -454,22 +454,24 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #listOfCountries {
-  //height: 100%;
+  height: 100%;
   display: flex;
   flex-direction: column;
-  min-height: calc(100% - 100px);
+  //min-height: calc(100% - 100px);
   overflow-y: auto;
 
   .container {
     display: flex;
     flex-direction: column;
     position: relative;
-    flex: auto;
+    //flex: auto;
     width: 100%;
     //height: calc(~'100% - 105px - 56px') !important;
-    height: calc(~'100% - 30px');
+    //height: calc(~'100% - 30px');
+    height: calc(~'100% - 106px');
     .table_info {
-      height: calc(70vh - 90px);
+      //height: calc(70vh - 90px);
+      height: calc(100% - 57px);
     }
     .pagination {
       position: inherit;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index b856030c2..5c06b85f0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -1486,7 +1486,8 @@ export default {
   //height: 100%;
   display: flex;
   flex-direction: column;
-  min-height: calc(100% - 100px);
+  //min-height: calc(100% - 100px);
+  height: 100%;
   overflow-y: auto;
     /deep/.el-form-item__label{
       color: #333333;
@@ -1499,7 +1500,8 @@ export default {
     width: 100%;
     height: calc(~'100% - 30px');
     .table_info {
-      height: calc(70vh - 90px);
+      //height: calc(70vh - 90px);
+      flex: 1;
     }
     .pagination {
       position: inherit;
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 7adf56a17..5bd041afd 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1748,20 +1748,22 @@ export default {
 .local-products-or-project-library {
   //height: calc(100% - 69px);
   //position: relative;
-  min-height: calc(100% - 100px);
+  //min-height: calc(100% - 100px);
+  height: 100%;
   overflow-y: auto;
 
   .container {
     display: flex;
     flex-direction: column;
     position: relative;
-    flex: auto;
+    //flex: auto;
     width: 100%;
     //height: calc(100% - 110px);
-    height: calc(~'100% - 30px');
+    height: calc(~'100% - 53px');
 
     .table_info {
-      height: calc(70vh - 90px);
+      flex: 1;
+      //height: calc(70vh - 90px);
     }
   }