From 69176ebed09b32111ef7287ecc9f917bb972e45e Mon Sep 17 00:00:00 2001 From: youyuzihan Date: Thu, 3 Jun 2021 10:35:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/pags/categoryDetails.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue index de3ad4474..6493d5103 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue @@ -5,7 +5,7 @@
-
{{ personShareEO.oldStandName }}
+
管理征求意见
@@ -64,11 +64,7 @@ label="提出人" width="170"> - - +
From a9da09f095563bcf54a73596feceec2e280d6694 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 3 Jun 2021 14:05:13 +0800 Subject: [PATCH 2/2] commit --- src/components/navMenu/index.vue | 10 +- .../localProductsOrProjectLibrary/index.vue | 1197 ++--------------- 2 files changed, 106 insertions(+), 1101 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 3ff3f0852..cd7f837d3 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -138,11 +138,11 @@ export default { // // title: '子公司标准库', // // path: '/subsidiaryStandardLibrary' // // } - // { - // title: '车型/项目库', - // path: '/localProductsOrProjectLibrary', - // menuId: 'PCZKM8TQJAH5UP5EAXTJ' - // }, + { + title: '车型/项目库', + path: '/localProductsOrProjectLibrary', + menuId: 'PCZKM8TQJAH5UP5EAXTJ' + }, // { // title: '未符合项跟踪', // path: '/nonConfomity', diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 9c0ca5f97..f2f82ff0f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -12,14 +12,6 @@ clearable > - 高级查询 @@ -71,42 +63,8 @@
-
- 新增 - - 批量删除 - - - - - - - - 导出项目标准关系 - 项目信息同步 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据获取中 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据获取中 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据获取中 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据获取中 - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数据获取中
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - 正在获取中…… -
- -
-
- - - -
- 导出 - 取消 -
-
- - { - this.tableHeight = $('.regulatory-repository').height() - 55 - 50 - 40 - 40 - 15 - 15 - 60 - 15 - 15 + this.tableHeight = $('.regulatory-repository').height() - 110 window.onresize = () => { - this.tableHeight = $('.container').height() - 55 - 50 - 40 - 40 - 15 - 15 - 60 - 15 - 15 + this.tableHeight = $('.container').height() - 110 } }) }, @@ -2433,14 +1445,7 @@ export default { //position: relative; height: 100%; .container { - height: calc(~'100% - 105px'); - .el-tabs{ - height: 100%; - /deep/.el-tabs__content{ - height: calc(~'100% - 55px'); - overflow-y: auto; - } - } + height: calc(~'100% - 55px'); } .el-drawer-form{ padding-left: 25px;