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:
super_liu
2021-11-10 15:37:33 +08:00
parent 84f0d9601f 0c4cc491fa
commit 82bb5916cd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+4 -4
View File
@@ -53,13 +53,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
@@ -599,13 +599,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
/>
<div v-if="relateNowList.length >1">
<el-divider></el-divider>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -112,8 +112,8 @@
v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'"
@click="clearAllSearch('standCommonlySearch')">清空
</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'">&#xe7a5;</i>高级查询
<el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'" @click="selectMoreBtn">
<i class="iconfont" >&#xe7a5;</i>高级查询
</el-button>
</el-form-item>
</el-form>
src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
+1 -1
View File
@@ -88,7 +88,7 @@
class="common-button-primary"
type="primary"
size="mini"
v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
v-btn-permission="''"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
><i class="iconfont">&#xe6e9;</i>导出
</el-button>