From 2ce8cc68d1d7e780cd1962451477fabb8510d7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 10 Jun 2021 09:28:12 +0800
Subject: [PATCH 1/3] commit
---
.../nonConfomity/pages/businessDivision.vue | 6 +++++-
.../nonConfomity/pages/productDepartment.vue | 6 +++++-
.../nonConfomity/pages/rectificationDatabase.vue | 8 +++++---
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
index 12c8830fd..632b08c87 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
@@ -189,6 +189,10 @@ export default {
data() {
return {
loading: false,
+ // 总数
+ total: 0,
+ // 当前页数
+ pageNo: 1,
causeList: [], //事业部数据
nonConformitySearch: {
standNumOrName: '', // 编号/名称
@@ -268,7 +272,7 @@ export default {
margin-right:10px;
}
.footer {
- margin-bottom: 430px;
+ margin-bottom: 390px;
}
}
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
index 5e7c5a608..b7a2fc8bf 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
@@ -189,6 +189,10 @@ export default {
data() {
return {
loading: false,
+ // 总数
+ total: 0,
+ // 当前页数
+ pageNo: 1,
causeList: [], //事业部数据
nonConformitySearch: {
standNumOrName: '', // 编号/名称
@@ -268,7 +272,7 @@ export default {
margin-right:10px;
}
.footer {
- margin-bottom: 430px;
+ margin-bottom: 390px;
}
}
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index bce9a647f..31ff05619 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -86,7 +86,7 @@
:data="nonList"
tooltip-effect="dark"
style="width: 100%;"
- height="tableHeight"
+ height="100%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@@ -195,7 +195,6 @@ export default {
data () {
return {
loading: false,
- tableHeight: null, //table高度
nonList:[], //未符合项表格数据
// 总数
total: 0,
@@ -273,13 +272,16 @@ export default {
+
From 16f2fd367d63f3666d218f691a359df311184bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 10 Jun 2021 11:24:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E6=B3=95=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/navMenu/index.vue | 11 +-
.../domesticStandardsAndRegulations/index.vue | 7 -
.../foreignStandardsAndRegulations/index.vue | 183 ++++--------------
3 files changed, 44 insertions(+), 157 deletions(-)
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 6d7118a59..59880e236 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -88,16 +88,17 @@ export default {
path: '/domesticStandardsAndRegulations',
menuId: 'A59EFAQ7AC'
},
- {
- title: '标准征求意见',
- path: '/standardForComments',
- menuId: ''
- },
{
title: '海外标准法规',
path: '/foreignStandardsAndRegulations',
menuId: '6K8A2RZYRE'
},
+ {
+ title: '标准征求意见',
+ path: '/standardForComments',
+ menuId: ''
+ },
+
// {
// title: '国内外政策',
// path: '/foreignRegulationsDatabase',
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index d10b5e7c4..039fe35a5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -840,13 +840,6 @@