diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 49fef0264..ddf6cf3eb 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -4,7 +4,7 @@
-
+
@@ -16,23 +16,36 @@ - - + - - + - - {{ opt.label }} + + + {{ opt.label }} @@ -53,8 +66,8 @@ size="mini" :picker-options="pickerBeginDateBefore" format="yyyy-MM-dd" - placeholder="选择开始时间"> - + placeholder="选择开始时间" + /> - + placeholder="选择结束时间" + /> - + placeholder="选择开始时间" + /> - + placeholder="选择结束时间" + /> @@ -97,8 +110,8 @@ size="mini" :picker-options="SSRQDateBefore" format="yyyy-MM-dd" - placeholder="选择开始时间"> - + placeholder="选择开始时间" + /> - + placeholder="选择结束时间" + /> - + placeholder="选择开始时间" + /> - + placeholder="选择结束时间" + /> + > 查询 + > 清空
-
- 导出Excel +
+ + 导出Excel +
-
+
- + align="center" + /> + type="index" + width="55" + label="序号" + align="center" + > @@ -206,7 +227,13 @@ {{ scope.row.itemsNum }} - + @@ -215,12 +242,13 @@ prop="termsConditions" label="条款内容" width="400" - align="center"> + align="center" + > @@ -243,15 +271,22 @@ {{ scope.row.zccssrq }} - - - + + @@ -263,46 +298,58 @@ :total="pageConfig.total" autoSize @pageChange="page => handlePageChange('page', page)" - @pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)"> + @pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)" + />
- + - + - 取消 - 提交 - + 取消 + 提交 + - - + width="50%" + > + + @@ -1151,7 +1197,6 @@ export default { } } - } ::v-deep { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 21dfae7f8..2b405a9f9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -2,48 +2,34 @@ @@ -409,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 d81c28c15..bec349057 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -8,31 +8,34 @@ + /> + /> + @click="searchSarAccess" + > 查询 清空 + @click="clearSearch" + > + 清空 @@ -40,46 +43,50 @@
新增 - + > + 新增 + 批量删除 + > + 批量删除
数据获取中
- + align="center" + /> + type="index" + width="55" + label="序号" + align="center" + > @@ -87,8 +94,8 @@ - + align="center" + /> + align="center" + >