From e87863fbd2ee41c8418ae8d0ec37faafaa96e98d Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 6 Dec 2021 15:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/index.vue   |   5 +-
 .../page/listOfCountries.vue                  | 180 +++++++++--------
 .../page/listOther.vue                        | 186 +++++++++---------
 .../page/listProject.vue                      | 166 ++++++++--------
 .../page/listTracking.vue                     | 127 ++++++------
 .../localProductsOrProjectLibrary/index.vue   |  24 ++-
 6 files changed, 367 insertions(+), 321 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index dee7151d1..ab065ceaf 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -124,7 +124,8 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #accessStandardsAndRegulations {
-  height: 100%;
+  //min-height: calc(100% - 20px);
+  height: inherit;
   padding: 0 10px;
   background: #fff;
   display: flex;
@@ -147,7 +148,7 @@ export default {
       flex-direction: column;
 
       .el-tab-pane {
-        height: 100%;
+        height: 10px;
         flex: auto;
         display: flex;
         flex-direction: column;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 49b0ddd9d..5f82860d2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -67,95 +67,97 @@
     </div>
     <div class="container">
       <loading :loading="tableLoading">数据获取中</loading>
-      <el-table
-        :data="sarAccessListDatas"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="table_info">
+        <el-table
+          :data="sarAccessListDatas"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          height="100%"
+          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectOne"
-        ref="selection"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="countryAreaShow"
-          label="国家/地区"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="detailedListName"
-          label="清单名称"
-          align="center"
-          width="260px"
+          @selection-change="selectOne"
+          ref="selection"
         >
-          <template slot-scope="scope">
-            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="detailedListState"
-          label="清单状态"
-          align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.detailedListState === '0'">未发布</span>
-            <span v-if="scope.row.detailedListState === '1'">已发布</span>
-            <span v-if="scope.row.detailedListState === '3'">审核中</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="detailedListVision"
-          label="清单版本"
-          align="center">
-          <template slot-scope="scope">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="countryAreaShow"
+            label="国家/地区"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="detailedListName"
+            label="清单名称"
+            align="center"
+            width="260px"
+          >
+            <template slot-scope="scope">
+              <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="detailedListState"
+            label="清单状态"
+            align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.detailedListState === '0'">未发布</span>
+              <span v-if="scope.row.detailedListState === '1'">已发布</span>
+              <span v-if="scope.row.detailedListState === '3'">审核中</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="detailedListVision"
+            label="清单版本"
+            align="center">
+            <template slot-scope="scope">
             <span
               v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
                 scope.row.detailedListVision
               }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="updateTime"
-          label="更新时间"
-          align="center">
-          <template slot-scope="scope">
-            <div>{{
-                scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="updatePeople"
-          label="更新人"
-          align="center">
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="50" fixed="right">
-          <template slot-scope="scope">
-            <div @click.stop style="display: inline-block">
-              <el-dropdown trigger="click" @command="handleCommand">
-                <i class="iconfont">&#xe61e;</i>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">
-                    查看
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">
-                    编辑
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">
-                    删除
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updateTime"
+            label="更新时间"
+            align="center">
+            <template slot-scope="scope">
+              <div>{{
+                  scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updatePeople"
+            label="更新人"
+            align="center">
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="50" fixed="right">
+            <template slot-scope="scope">
+              <div @click.stop style="display: inline-block">
+                <el-dropdown trigger="click" @command="handleCommand">
+                  <i class="iconfont">&#xe61e;</i>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">
+                      查看
+                    </el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">
+                      编辑
+                    </el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">
+                      删除
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <loading :loading="loading">数据获取中</loading>
       <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
                   @pageSizeChange="pageSizeChange"></pagination>
@@ -394,9 +396,11 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #listOfCountries {
-  height: 100%;
+  //height: 100%;
   display: flex;
   flex-direction: column;
+  min-height: calc(100% - 100px);
+  overflow-y: auto;
 
   .container {
     display: flex;
@@ -404,10 +408,14 @@ export default {
     position: relative;
     flex: auto;
     width: 100%;
-    height: calc(100% - 110px) !important;
+    //height: calc(100% - 110px) !important;
+    height: calc(~'100% - 30px');
+    .table_info {
+      height: calc(70vh - 90px);
+    }
 
     .pagination {
-      position: static;
+      position: inherit;
 
       /deep/ .pagination-slot {
         padding: 0;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 3faec3093..26a325bda 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -58,98 +58,100 @@
     </div>
     <div class="container">
       <loading :loading="tableLoading">数据获取中</loading>
-      <el-table
-        :data="sarAccessListDatas"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="table_info">
+        <el-table
+          :data="sarAccessListDatas"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          height="100%"
+          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectOne"
-        ref="selection"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="detailedList"
-          label="清单类别"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="detailedListName"
-          label="清单名称"
-          align="center"
-          width="260px"
+          @selection-change="selectOne"
+          ref="selection"
         >
-          <template slot-scope="scope">
-            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="detailedListState"
-          label="清单状态"
-          align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.detailedListState === '0'">未发布</span>
-            <span v-if="scope.row.detailedListState === '1'">已发布</span>
-            <span v-if="scope.row.detailedListState === '3'">审核中</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="detailedListVision"
-          label="清单版本"
-          align="center">
-          <template slot-scope="scope">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="detailedList"
+            label="清单类别"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="detailedListName"
+            label="清单名称"
+            align="center"
+            width="260px"
+          >
+            <template slot-scope="scope">
+              <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="detailedListState"
+            label="清单状态"
+            align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.detailedListState === '0'">未发布</span>
+              <span v-if="scope.row.detailedListState === '1'">已发布</span>
+              <span v-if="scope.row.detailedListState === '3'">审核中</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="detailedListVision"
+            label="清单版本"
+            align="center">
+            <template slot-scope="scope">
             <span
               v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
               }}</span>
-          </template>
-        </el-table-column>
-<!--        <el-table-column
-          prop="applicationScope"
-          label="适用领域"
-          align="center">
-          <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-          </template>
-        </el-table-column>-->
-        <el-table-column
-          prop="updateTime"
-          label="更新时间"
-          align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="updatePeople"
-          label="更新人"
-          align="center">
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="50" fixed="right">
-          <template slot-scope="scope">
-            <div @click.stop style="display: inline-block">
-              <el-dropdown trigger="click" @command="handleCommand">
-                <i class="iconfont">&#xe61e;</i>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'30bfbe928d7ee6e6bcef9408b762bc97'">查看
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'69ebe6847ad7bf7e90bae8025080678c'">编辑
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'adec3450d97917a4ffa803d40a46dba9'">删除
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+          <!--        <el-table-column
+                    prop="applicationScope"
+                    label="适用领域"
+                    align="center">
+                    <template slot-scope="scope">
+                      <span
+                        v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+                        }}</span>
+                    </template>
+                  </el-table-column>-->
+          <el-table-column
+            prop="updateTime"
+            label="更新时间"
+            align="center">
+            <template slot-scope="scope">
+              <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updatePeople"
+            label="更新人"
+            align="center">
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="50" fixed="right">
+            <template slot-scope="scope">
+              <div @click.stop style="display: inline-block">
+                <el-dropdown trigger="click" @command="handleCommand">
+                  <i class="iconfont">&#xe61e;</i>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'30bfbe928d7ee6e6bcef9408b762bc97'">查看
+                    </el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'69ebe6847ad7bf7e90bae8025080678c'">编辑
+                    </el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'adec3450d97917a4ffa803d40a46dba9'">删除
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <loading :loading="loading">数据获取中</loading>
       <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
                   @pageSizeChange="pageSizeChange"></pagination>
@@ -374,9 +376,11 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #listOfCountries {
-  height: 100%;
+  //height: 100%;
   display: flex;
   flex-direction: column;
+  min-height: calc(100% - 100px);
+  overflow-y: auto;
 
   .container {
     display: flex;
@@ -385,8 +389,12 @@ export default {
     flex: auto;
     width: 100%;
     //height: calc(~'100% - 105px - 56px') !important;
+    height: calc(~'100% - 30px');
+    .table_info {
+      height: calc(70vh - 90px);
+    }
     .pagination {
-      position: static;
+      position: inherit;
 
       /deep/ .pagination-slot {
         padding: 0;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 032525351..2cdd5f528 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -68,88 +68,90 @@
     </div>
     <div class="container">
       <loading :loading="tableLoading">数据获取中</loading>
-      <el-table
-        :data="sarAccessListDatas"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="table_info">
+        <el-table
+          :data="sarAccessListDatas"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          height="100%"
+          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectOne"
-        ref="selection"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="carTypeShow"
-          label="车型类别"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="detailedListName"
-          label="清单名称"
-          align="center"
-          width="260px"
+          @selection-change="selectOne"
+          ref="selection"
         >
-          <template slot-scope="scope">
-            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="detailedListState"
-          label="清单状态"
-          align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.detailedListState === '0'">未发布</span>
-            <span v-if="scope.row.detailedListState === '1'">已发布</span>
-            <span v-if="scope.row.detailedListState === '3'">审核中</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="detailedListVision"
-          label="清单版本"
-          align="center">
-          <template slot-scope="scope">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="carTypeShow"
+            label="车型类别"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="detailedListName"
+            label="清单名称"
+            align="center"
+            width="260px"
+          >
+            <template slot-scope="scope">
+              <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="detailedListState"
+            label="清单状态"
+            align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.detailedListState === '0'">未发布</span>
+              <span v-if="scope.row.detailedListState === '1'">已发布</span>
+              <span v-if="scope.row.detailedListState === '3'">审核中</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="detailedListVision"
+            label="清单版本"
+            align="center">
+            <template slot-scope="scope">
             <span
               v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
               }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="updateTime"
-          label="更新时间"
-          align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="updatePeople"
-          label="更新人"
-          align="center">
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="50" fixed="right">
-          <template slot-scope="scope">
-            <div @click.stop style="display: inline-block">
-              <el-dropdown trigger="click" @command="handleCommand">
-                <i class="iconfont">&#xe61e;</i>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'cfe3ce86cd64c5924c2e6d13e7f7ea31'">查看
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'9d0783096e61390a54e0fea1eda461dc'">编辑
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'4136d025d20d4c9b55c732b74dfa581d'">删除
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updateTime"
+            label="更新时间"
+            align="center">
+            <template slot-scope="scope">
+              <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updatePeople"
+            label="更新人"
+            align="center">
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="50" fixed="right">
+            <template slot-scope="scope">
+              <div @click.stop style="display: inline-block">
+                <el-dropdown trigger="click" @command="handleCommand">
+                  <i class="iconfont">&#xe61e;</i>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'cfe3ce86cd64c5924c2e6d13e7f7ea31'">查看
+                    </el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'9d0783096e61390a54e0fea1eda461dc'">编辑
+                    </el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'4136d025d20d4c9b55c732b74dfa581d'">删除
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <loading :loading="loading">数据获取中</loading>
       <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
                   @pageSizeChange="pageSizeChange"></pagination>
@@ -427,9 +429,11 @@ export default {
 @import '~@/assets/styles/mixins';
 
 #listOfCountries {
-  height: 100%;
+  //height: 100%;
   display: flex;
   flex-direction: column;
+  min-height: calc(100% - 100px);
+  overflow-y: auto;
 
   .container {
     display: flex;
@@ -438,8 +442,12 @@ export default {
     flex: auto;
     width: 100%;
     //height: calc(~'100% - 105px - 56px') !important;
+    height: calc(~'100% - 30px');
+    .table_info {
+      height: calc(70vh - 90px);
+    }
     .pagination {
-      position: static;
+      position: inherit;
 
       /deep/ .pagination-slot {
         padding: 0;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 734d5021f..5d8122512 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -57,65 +57,67 @@
     </div>
     <div class="container">
       <loading :loading="tableLoading">数据获取中</loading>
-      <el-table
-        :data="sarAccessListDatas"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="table_info">
+        <el-table
+          :data="sarAccessListDatas"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          height="100%"
+          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectOne"
-        ref="selection"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="lawCode"
-          width="250"
-          label="标准编号/政策编号"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="lawName"
-          label="标准名称/政策名称"
-          align="center"
-          width="300px"
+          @selection-change="selectOne"
+          ref="selection"
         >
-        </el-table-column>
-        <el-table-column
-          prop="productType"
-          label="产品类型"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="implTime"
-          sortable
-          label="实施时间"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="implRequire"
-          label="实施要求"
-          align="center">
-        </el-table-column>
-        <el-table-column label="操作" min-width="50" align="center">
-          <template slot-scope="scope">
-            <div @click.stop style="display: inline-block">
-              <el-dropdown trigger="click" @command="handleCommand">
-                <i class="iconfont">&#xe61e;</i>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="lawCode"
+            width="250"
+            label="标准编号/政策编号"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="lawName"
+            label="标准名称/政策名称"
+            align="center"
+            width="300px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            label="产品类型"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="implTime"
+            sortable
+            label="实施时间"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="implRequire"
+            label="实施要求"
+            align="center">
+          </el-table-column>
+          <el-table-column label="操作" min-width="50" align="center">
+            <template slot-scope="scope">
+              <div @click.stop style="display: inline-block">
+                <el-dropdown trigger="click" @command="handleCommand">
+                  <i class="iconfont">&#xe61e;</i>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <loading :loading="loading">数据获取中</loading>
       <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
     </div>
@@ -1370,9 +1372,11 @@ export default {
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
 #listTracking {
-  height: 100%;
+  //height: 100%;
   display: flex;
   flex-direction: column;
+  min-height: calc(100% - 100px);
+  overflow-y: auto;
     /deep/.el-form-item__label{
       color: #333333;
     }
@@ -1382,9 +1386,12 @@ export default {
     position: relative;
     flex: auto;
     width: 100%;
-    height: calc(100% - 110px) !important;
+    height: calc(~'100% - 30px');
+    .table_info {
+      height: calc(70vh - 90px);
+    }
     .pagination {
-      position: static;
+      position: inherit;
       /deep/ .pagination-slot {
         padding: 0;
       }
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index b100be5e9..cfe589da2 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -83,13 +83,14 @@
           <el-tab-pane label="未维护" name="notMaintenance"></el-tab-pane>
         </el-tabs>
       </div>
-      <el-table
+      <div class="table_info">
+        <el-table
         ref="multipleTable"
         :data="localProTableList"
         tooltip-effect="dark"
         style="width: 100%"
         border
-        max-height="600"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">
@@ -208,6 +209,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         :page="page"
         :pageSize="pageSize"
@@ -1618,11 +1620,22 @@ export default {
 @import '~@/assets/styles/style';
 
 .local-products-or-project-library {
+  //height: calc(100% - 69px);
   //position: relative;
-  height: calc(100% - 100px);
+  min-height: calc(100% - 100px);
+  overflow-y: auto;
 
   .container {
-    height: calc(~'100% - 55px');
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    //height: calc(100% - 110px);
+    height: calc(~'100% - 30px');
+    .table_info {
+      height: calc(70vh - 90px);
+    }
   }
 
   .el-drawer-form {
@@ -1630,7 +1643,8 @@ export default {
   }
 
   /deep/ .pagination {
-    position: absolute;
+    position:inherit;
+    //position: unset;
   }
 
   .row-col-box {