FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhangjun
2022-09-16 11:11:32 +08:00
parent 36297fbd87 24cf574fb9
commit a4c5a8a1ee
14 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+11 -11
View File
@@ -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',
src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
+1 -1
View File
@@ -83,7 +83,7 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<div v-if="relateDicId">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '查看']" >查看</el-dropdown-item>
</div>
<el-dropdown-item :command="[scope.row, '编辑']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'48723deaa90798f56e939aea6aa49a23'">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'982b2f92a26c3c91b6b868419f0e2d3b'">删除</el-dropdown-item>
src/pages/details/otherBussStandardDetails/index.vue
+2 -2
View File
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"
/>
<div v-if="relateNowList.length >1">
<el-divider></el-divider>
src/pages/details/otherBussStandardExternalDetails/index.vue
+2 -2
View File
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"
/>
<div v-if="relateNowList.length >1">
<el-divider></el-divider>
src/pages/details/otherStandardDetails/index.vue
+16 -15
View File
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</template>
<template v-else>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</template>
</p>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -785,7 +785,7 @@
<div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
>
导出
</el-button>
<el-button
@@ -801,6 +801,7 @@
type="primary"
class="common-button-primary"
@click="editResolveList"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
>编辑
</el-button>
</div>
src/pages/details/otherStandardExternalDetails/index.vue
+16 -15
View File
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
@@ -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'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template>
@@ -815,7 +815,7 @@
<div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
>
导出
</el-button>
<el-button
@@ -831,6 +831,7 @@
type="primary"
class="common-button-primary"
@click="editResolveList"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
>编辑
</el-button>
</div>
src/pages/details/process/ruku/index.vue
+1 -1
View File
@@ -350,7 +350,7 @@
<!--<el-button class="common-button-default" :loading="searching" @click="uploadImportModal">模板下载</el-button>-->
<!--<el-button class="common-button-default in-button" :loading="searching" icon="in" @click="addImportModal(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '9ca97b05b2' : '6JM97X9W9C'">导入</el-button>-->
<el-button class="common-button-default export-button" icon="export"
@click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">导出</el-button>
@click="exportStandardItem" >导出</el-button>
<!--<el-button class="common-button-default delete-button" icon="delete" @click="deleteStandItem(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '8ac1820c42' : 'LRQHPT8E2Y'">删除</el-button>-->
<el-button
round
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1 -1
View File
@@ -44,7 +44,7 @@
<el-button v-btn-permission="'6c51b9f4bb333aaf4895c98f8c2ea896'" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="'b5eb643881b814cadd477a1e414e568e'" size="mini" @click="combineItems">合并条款</el-button>
<!-- <el-button v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>-->
<el-button v-if="auditFlag==='1'" size="mini" v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" @click="splitCheckBtn">审核</el-button>
<!-- <el-button v-if="auditFlag==='1'" size="mini" v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" @click="splitCheckBtn">审核</el-button>-->
<!--<el-button size="mini" @click="$message.warning('需求暂不明确')" v-if="this.$route.query.result === '1'">提交</el-button>-->
</div>
<el-table
src/pages/localTool/standardRecognition/index.vue
+10 -10
View File
@@ -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" },
],
src/pages/personal/pages/my-collection/index.vue
+4 -4
View File
@@ -24,8 +24,8 @@ export default {
const list = [
{
title: '已收藏的标准法规',
name: 'CollectionStandard',
permission:'f3686f4736acca57b1c0a97a990f96fc'
name: 'CollectionStandard'
// permission:'f3686f4736acca57b1c0a97a990f96fc'
},
// {
// title: '已收藏的动态&资料 ',
@@ -33,8 +33,8 @@ export default {
// },
{
title: '已收藏的政策',
name: 'CollectionLaws',
permission:'200212748ffc5fd3d93179789446535a'
name: 'CollectionLaws'
// permission:'200212748ffc5fd3d93179789446535a'
},
// {
// title: '已收藏的标准拆分',
src/pages/phone/domesticDetails.vue
+2 -1
View File
@@ -525,7 +525,7 @@
<div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem"
v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
>
导出
</el-button>
<el-button
@@ -541,6 +541,7 @@
type="primary"
class="common-button-primary"
@click="editResolveList"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
>编辑
</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+9 -1
View File
@@ -344,6 +344,14 @@
align="center"
prop="uname"
label="项目经理"/>
<el-table-column
align="center"
prop="flag"
label="是否维护">
<template slot-scope="scope">
<span>{{ scope.row.flag ==="1" ? '已维护' : '未维护'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -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,
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+1 -1
View File
@@ -37,7 +37,7 @@
<el-button
class="common-button-default"
size="small"
v-btn-permission="'23e01cb6ac6bfcedd39537f236a769e5'"
v-btn-permission="'41945d15f5cb658665ef4916f62354a2'"
@click="clearSearch">清空</el-button>
</el-form-item>
</el-form>
src/router/index.js
+15 -14
View File
@@ -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: ''
}