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 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + +
数据获取中 @@ -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 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + + +
数据获取中 @@ -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 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + +
数据获取中 @@ -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 @@
数据获取中 - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
数据获取中 @@ -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 @@ - + @@ -208,6 +209,7 @@ +