From 081c12d1154de7b4bdb395b2f90221847e503c19 Mon Sep 17 00:00:00 2001
From: zhangyanduan
Date: Thu, 15 Sep 2022 11:35:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E6=9D=83?=
=?UTF-8?q?=E9=99=90=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/navMenu/index.vue | 22 ++++++-------
.../details/otherStandardDetails/index.vue | 31 ++++++++++---------
.../otherStandardExternalDetails/index.vue | 31 ++++++++++---------
src/pages/details/process/ruku/index.vue | 2 +-
src/pages/phone/domesticDetails.vue | 3 +-
src/router/index.js | 29 ++++++++---------
6 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 8ec8655e0..7bb3bf15a 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -154,7 +154,7 @@
{
title: '问答库', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
path: '/standQA',
- menuId: ''
+ menuId: '2621269642ea4c6c8c42905863b2dc09'
},
// {
// title: '零部件编号申请',
@@ -444,7 +444,7 @@
title: '个人中心',
path: '/personal',
'icon-class': 'el-icon-s-check',
- menuId: '32143ffasdf',
+ // menuId: '32143ffasdf',
children: [
// {
// title: '我的消息',
@@ -458,8 +458,8 @@
// },
{
title: '我的收藏',
- path: '/collection',
- menuId: '63e999c65b1f2b1339119a00eb1d50cf'
+ path: '/collection'
+ // menuId: '63e999c65b1f2b1339119a00eb1d50cf'
},
// {
// title: '我的浏览',
@@ -478,14 +478,14 @@
// },
{
title: '我的问答',
- path: '/questions',
- menuId: ''
+ path: '/questions'
+ // menuId: ''
},
- {
- title: '我的板块',
- path: '/plate',
- menuId: 'e4a94f03223df6f4ad70732b96f07221'
- }
+ // {
+ // title: '我的板块',
+ // path: '/plate'
+ // // menuId: 'e4a94f03223df6f4ad70732b96f07221'
+ // }
// {
// title: '个人信息',
// path: '/info',
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 1f8bd484b..7d031c6eb 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -411,13 +411,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -493,13 +493,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45': 'a772afab2a6708883335500f3f86e771'"
/>
@@ -513,13 +513,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -560,13 +560,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -575,13 +575,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -655,13 +655,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -678,13 +678,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -785,7 +785,7 @@
+ >
导出
编辑
diff --git a/src/pages/details/otherStandardExternalDetails/index.vue b/src/pages/details/otherStandardExternalDetails/index.vue
index fdb7714fc..dacd252d7 100644
--- a/src/pages/details/otherStandardExternalDetails/index.vue
+++ b/src/pages/details/otherStandardExternalDetails/index.vue
@@ -423,13 +423,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -505,13 +505,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -525,13 +525,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -581,13 +581,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -604,13 +604,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -685,13 +685,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -708,13 +708,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
@@ -815,7 +815,7 @@
+ >
导出
编辑
diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue
index 74fab4799..1674c8193 100644
--- a/src/pages/details/process/ruku/index.vue
+++ b/src/pages/details/process/ruku/index.vue
@@ -350,7 +350,7 @@
导出
+ @click="exportStandardItem" >导出
+ >
导出
编辑
diff --git a/src/router/index.js b/src/router/index.js
index 3d9ee3cac..7f7175f3a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -211,16 +211,17 @@ const routes = [
path: '/personal',
name: 'Personal',
redirect: () => {
- if (hasRouterPermission('ZY9RFA4M35') && hasRouterPermission('JCEV4AEV32')) {
- return '/dynamics'
- } else {
- return getRedirectPath('ZY9RFA4M35') || '/info'
- }
+ return '/collection'
+ // if (hasRouterPermission('ZY9RFA4M35') && hasRouterPermission('JCEV4AEV32')) {
+ // return '/collection'
+ // } else {
+ // return getRedirectPath('ZY9RFA4M35') || '/info'
+ // }
},
component: resolve => require(['@/pages/personal'], resolve),
meta: {
- title: '个人',
- menuId: 'ZY9RFA4M35'
+ title: '个人中心'
+ // menuId: 'ZY9RFA4M35'
},
children: [
// {
@@ -248,9 +249,9 @@ const routes = [
name: 'MyCollection',
component: resolve => require(['@/pages/personal/pages/my-collection'], resolve),
meta: {
- requireAuth: true,
- title: '我的收藏',
- menuId: 'JY5LKL2HPD'
+ requireAuth: false,
+ title: '我的收藏'
+ // menuId: 'JY5LKL2HPD'
}
},
{
@@ -318,9 +319,9 @@ const routes = [
name: 'MyQuestions',
component: resolve => require(['@/pages/personal/pages/my-questions'], resolve),
meta: {
- requireAuth: true,
- title: '我的问答',
- menuId: ''
+ requireAuth: false,
+ title: '我的问答'
+ // menuId: ''
}
},
{
@@ -328,7 +329,7 @@ const routes = [
name: 'QuestionDetail',
component: resolve => require(['@/pages/personal/pages/my-questions/components/questionDetail.vue'], resolve),
meta: {
- requireAuth: true,
+ requireAuth: false,
title: '问题详情',
menuId: ''
}
From 4f2ad8eb15f38b7a9ba74563b71d9be28681ca34 Mon Sep 17 00:00:00 2001
From: zhangyanduan
Date: Thu, 15 Sep 2022 20:22:55 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/details/otherBussStandardDetails/index.vue | 4 ++--
src/pages/details/otherBussStandardExternalDetails/index.vue | 4 ++--
.../accessStandardsAndRegulations/page/listTracking.vue | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index ce4b62ae6..c2b806b82 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -943,13 +943,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
+ v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"
/>
diff --git a/src/pages/details/otherBussStandardExternalDetails/index.vue b/src/pages/details/otherBussStandardExternalDetails/index.vue
index e8fcfaf17..5d685618b 100644
--- a/src/pages/details/otherBussStandardExternalDetails/index.vue
+++ b/src/pages/details/otherBussStandardExternalDetails/index.vue
@@ -946,13 +946,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
+ v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"
/>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 241173801..b999a5ca0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -37,7 +37,7 @@
清空
From e29bfa8cc9eef080098f084c407ad9c8d24d4067 Mon Sep 17 00:00:00 2001
From: zyd
Date: Fri, 16 Sep 2022 00:19:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E7=AE=A1=E6=8E=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../standLawsAttrManage/pages/standLawsAttrDetails.vue | 2 +-
.../localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +-
src/pages/personal/pages/my-collection/index.vue | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
index 7f4c3690a..fe991d61a 100644
--- a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
+++ b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
@@ -83,7 +83,7 @@
- 查看
+ 查看
编辑
删除
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7addb1936..c1306b4b9 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -44,7 +44,7 @@
批量复制
合并条款
- 审核
+
Date: Fri, 16 Sep 2022 10:44:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E8=AF=86=E5=88=AB?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8E=BB?=
=?UTF-8?q?=E6=8E=89=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=20=20=20=E6=A0=87=E5=87=86=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B9=E7=9B=AE=E5=88=86=E5=8F=91=E8=8A=82?=
=?UTF-8?q?=E7=82=B9=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=97=B6=E6=94=BE=E5=BC=80=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E7=AE=A1=E6=8E=A7=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../localTool/standardRecognition/index.vue | 20 +++++++++----------
.../pages/creatProcess/bzpg/step3.vue | 10 +++++++++-
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index dc2090731..e83ac8d4e 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -763,16 +763,16 @@ export default {
// standId: ''
},
upFileRules: {
- standNumber: [
- { required: true, message: "标准号/政策号不能为空", trigger: "blur" },
- ],
- standName: [
- {
- required: true,
- message: "标准名称/政策名称不能为空",
- trigger: "blur",
- },
- ],
+ // standNumber: [
+ // { required: true, message: "标准号/政策号不能为空", trigger: "blur" },
+ // ],
+ // standName: [
+ // {
+ // required: true,
+ // message: "标准名称/政策名称不能为空",
+ // trigger: "blur",
+ // },
+ // ],
fileType: [
{ required: true, message: "文本状态称不能为空", trigger: "change" },
],
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 8a681e075..2152d9f46 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -344,6 +344,14 @@
align="center"
prop="uname"
label="项目经理"/>
+
+
+ {{ scope.row.flag ==="1" ? '已维护' : '未维护'}}
+
+
{{$t('m.dataAcquisition')}}
@@ -571,7 +579,7 @@ export default {
getProductData() {
this.replaceLoading = true
// 已维护 状态 1 , 为维护 状态 0
- this.projectSearch.flag = '1'
+ // this.projectSearch.flag = '1'
this.$http.get("sarStandProjectLibrary/queryProjects", {
projectGroup: this.projectGroup,
current: this.pageNo,