From bc3252387eadbc3b39f72eb75aba725a66186719 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 1 Jun 2021 17:02:19 +0800 Subject: [PATCH] commit --- src/components/advancedQuery/index.vue | 4 +- src/components/navMenu/index.vue | 10 +- .../accessStandardsAndRegulations/index.vue | 700 +-------- .../page/listOfCountries.vue | 676 +++++++++ .../page/listOther.vue | 661 +++++++++ .../page/listProject.vue | 667 +++++++++ .../page/listTracking.vue | 661 +++++++++ .../pages/addEdit.vue | 922 +++++++----- .../pages/details.vue | 1270 ++++++++++------- .../pages/standInvolveProjectDetail.vue | 183 ++- .../pages/technologyInvolveProject.vue | 184 +-- 11 files changed, 4186 insertions(+), 1752 deletions(-) create mode 100644 src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue create mode 100644 src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue create mode 100644 src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue create mode 100644 src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue diff --git a/src/components/advancedQuery/index.vue b/src/components/advancedQuery/index.vue index eee804871..5b33954b3 100644 --- a/src/components/advancedQuery/index.vue +++ b/src/components/advancedQuery/index.vue @@ -189,7 +189,7 @@
- 高级检索 + 高级检索 重置
@@ -381,7 +381,7 @@
- 查询 + 查询 重置
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 200fe83fd..3ff3f0852 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -158,11 +158,11 @@ export default { // path: '/enterpriseStandardFiling', // menuId: 'MQBAGJQMSRZDRX3X5AVR' // }, - // { - // title: '标准合规评估结果', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 - // path: '/standInvolveProject', - // menuId: 'JURHS3LVP35US88ABULS' - // } + { + title: '标准合规评估结果', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 + path: '/standInvolveProject', + menuId: 'JURHS3LVP35US88ABULS' + } // { // title: '动态信息', // path: '/information', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index ac7dcf6df..d683c5072 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -1,627 +1,58 @@ -x` + @@ -629,46 +60,31 @@ export default { @import '~@/assets/styles/style'; @import '~@/assets/styles/mixins'; #accessStandardsAndRegulations { - height: 100%; - display: flex; - flex-direction: column; - .container { + height: 100%; + padding: 0 10px; + background: #fff; display: flex; flex-direction: column; - position: relative; - flex: auto; - width: 100%; - //height: calc(~'100% - 105px - 56px') !important; - .pagination { - position: static; - /deep/ .pagination-slot { - padding: 0; - } + /deep/.el-tabs{ + flex: auto; + display: flex; + flex-direction: column; + /deep/ .el-tabs__header{ + margin:0 !important; + } + .el-tabs__content { + height: 100% !important; + flex: auto; + position: relative; + display: flex; + flex-direction: column; + .el-tab-pane { + height: 100%; + flex: auto; + display: flex; + flex-direction: column; + } + } } - } - .el-divider{ - .el-divider__text{ - font-size: 16px; - color: #0c91e5; - } - } - .standards-drawer-table-one{ - position: relative; - height: 350px; - .pagination{ - bottom: 0; - } - } - .standards-drawer-table{ - margin-top: 10px; - } - .see-drawer{ - .searchAngNewBtn{ - float: right; - } - .el-divider{ - clear: both; - } - } } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue new file mode 100644 index 000000000..42cce532f --- /dev/null +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -0,0 +1,676 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue new file mode 100644 index 000000000..2af54d069 --- /dev/null +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -0,0 +1,661 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue new file mode 100644 index 000000000..596cd2efa --- /dev/null +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -0,0 +1,667 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue new file mode 100644 index 000000000..18d6d042e --- /dev/null +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -0,0 +1,661 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index f320f259d..2c4a756c1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -143,7 +143,7 @@ icon="el-icon-search" type="primary" class="common-button-primary" - round + size="small" @click="searchLawsStands"> @@ -151,7 +151,7 @@ @@ -168,7 +168,10 @@ @click="moreSearch">{{$t('m.hideMultiAttributeSearch')}} --> - 高级查询 + + + 高级查询 + 添加 + size="mini" @click="addSarAccess">添加 {{$t('m.showAddDataList')}} 新增 + + + + 编辑 - 上移 下移 - 导入 - 导出 - 模板下载 + + + + + + + + + + + + + + + + + 删除 - - -
- - + - - + - - - + {{ scope.row.code }} + {{ scope.row.code }} + + + - - - + + + - - - + {{ scope.row.enName }} + {{ scope.row.enName }} + + + - - + - - + - - - + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + {{ scope.row.ZRBMName || scope.row.zrbmname || '' }} + + + + + + - - - + {{ scope.row.FOName || scope.row.foname || '' }} + + + - - - - - - - - - - - - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
+ show-overflow-tooltip + label="文本说明"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +