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:
zhutianqi
2021-10-20 15:44:47 +08:00
parent 56cf5790eb e8d4037ac9
commit 553308b9ec
6 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+2 -2
View File
@@ -182,13 +182,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" 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> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
src/pages/localTool/standAutoSplit/index.vue
+6 -6
View File
@@ -14,12 +14,12 @@
size="mini" size="mini"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
v-btn-permission="''" v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'"
@click="searchStandList">查询</el-button> @click="searchStandList">查询</el-button>
<el-button <el-button
size="mini" size="mini"
class="common-button-default" class="common-button-default"
v-btn-permission="''" v-btn-permission="'0af780936b77df9905c988db9e90bee8'"
@click="clearSearchStand">清空</el-button> @click="clearSearchStand">清空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -28,8 +28,8 @@
</table-tools-bar> </table-tools-bar>
<div class="content"> <div class="content">
<div class="action-bar"> <div class="action-bar">
<el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="''">拆分</el-button> <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button>
<el-button size="small" type="danger" @click="batchDelete" v-btn-permission="''">删除</el-button> <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-button>
</div> </div>
<div class="table-wrap"> <div class="table-wrap">
<div style="position: absolute;height: 100%;width: 100%;"> <div style="position: absolute;height: 100%;width: 100%;">
@@ -113,8 +113,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">查看</el-dropdown-item> <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'17ba4598eb411d6feed468a2e446a301'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item> <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> </template>
src/pages/localTool/standContrast/index.vue
+2
View File
@@ -19,10 +19,12 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-btn-permission="'158298eaaf15a57a221c53f69e9ae563'"
@click="sarStandCompareHisInfo">搜索</el-button> @click="sarStandCompareHisInfo">搜索</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'9001dda4a41c698209a4c7d05c1f76bc'"
@click="clearSearchStand">清空</el-button> @click="clearSearchStand">清空</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+11 -11
View File
@@ -97,18 +97,18 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'" v-btn-permission="'f65b5bdd64ab1c6b03f2aff0ecedeefc'"
@click="searchBtnClick(standCommonlySearch)"> @click="searchBtnClick(standCommonlySearch)">
查询 查询
</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
class="common-button-default" class="common-button-default"
v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'" v-btn-permission="'0177eb3b11ccbab403808461a4ed6977'"
@click="clearAllSearch('standCommonlySearch')">清空 @click="clearAllSearch('standCommonlySearch')">清空
</el-button> </el-button>
<el-button size="mini" type="primary" class="common-button-primary" <el-button size="mini" type="primary" class="common-button-primary"
v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"><i v-btn-permission="'23040dc9eea2b1b75ab70a981c3abcd5'" @click="selectMoreBtn"><i
class="iconfont">&#xe7a5;</i>高级检索 class="iconfont">&#xe7a5;</i>高级检索
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -130,12 +130,12 @@
:loading="searching" :loading="searching"
size="mini" size="mini"
@click="addImportModal(1)" @click="addImportModal(1)"
v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'"><i class="iconfont">&#xe6de;</i>导入 v-btn-permission="'8a8d52ab7788a3685ffa877c2844459e'"><i class="iconfont">&#xe6de;</i>导入
</el-button> </el-button>
<el-button class="common-button-default export-button" <el-button class="common-button-default export-button"
@click="exportStandard()" @click="exportStandard()"
size="mini" size="mini"
v-btn-permission="'b17f1d035219c47344032e261342d87d'" v-btn-permission="'088d8fc00c581bfcb7fb999b24c5414f'"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出 title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出
</el-button> </el-button>
<!-- <el-button class="common-button-default delete-button" <!-- <el-button class="common-button-default delete-button"
@@ -147,12 +147,12 @@
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" size="mini"
@click="configurationStandard" @click="configurationStandard"
v-btn-permission="'8158aefd62cda676a6baf179532328c6'"><i class="iconfont">&#xe669;</i>配置标准 v-btn-permission="'885d2674d9a0248fbfe681068dee6540'"><i class="iconfont">&#xe669;</i>配置标准
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" size="mini"
@click="deleteStandFromKind(2)" @click="deleteStandFromKind(2)"
v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准 v-btn-permission="'b9544b3a05240a6bd2032cebccb54754'"><i class="iconfont">&#xe611;</i>移除标准
</el-button> </el-button>
<!-- <el-button class="common-button-default"--> <!-- <el-button class="common-button-default"-->
<!-- size="mini"--> <!-- size="mini"-->
@@ -272,24 +272,24 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'" <el-dropdown-item v-btn-permission="'130c099bbd01e717b0751e96025b0719'"
v-if="scope.row.collectBtn" v-if="scope.row.collectBtn"
:command="[scope.row, '收藏']" :command="[scope.row, '收藏']"
> >
收藏 收藏
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-btn-permission="'abcf82476e9f7bf2469896b3b0cb84fa'" <el-dropdown-item v-btn-permission="'2c71b19f8216912f88363e802e2ddc94'"
v-else v-else
:command="[scope.row, '取消收藏']" :command="[scope.row, '取消收藏']"
> >
取消收藏 取消收藏
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" <el-dropdown-item :command="[scope.row, '编辑']"
v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 v-btn-permission="'630d36fc00f54e36ae04acc13125bb0e'">编辑
</el-dropdown-item> </el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']" <el-dropdown-item :command="[scope.row, '删除']"
v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除 v-btn-permission="'345f21c54b973c35498dd01fffdd137b'">删除
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+2 -2
View File
@@ -55,7 +55,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" v-btn-permission="'2a80a91dfb95a341d857e607a5540945'"
@click="getTableByPage('')"> @click="getTableByPage('')">
查询 查询
</el-button> </el-button>
@@ -79,7 +79,7 @@
size="mini" size="mini"
@click="exportStandard()" @click="exportStandard()"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
v-btn-permission="'620e6da5808bf104e576c763546a33b6'" v-btn-permission="'c3c8c107fb4ca1ab089d5b4b73cfcee1'"
><i class="iconfont">&#xe6e9;</i>导出</el-button> ><i class="iconfont">&#xe6e9;</i>导出</el-button>
<el-button <el-button
class="common-button-primary" class="common-button-primary"
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+6 -6
View File
@@ -25,9 +25,9 @@
<!-- {{ this.$route.query.item.cname || '-' }}--> <!-- {{ this.$route.query.item.cname || '-' }}-->
<!-- </span>--> <!-- </span>-->
<!-- </p>--> <!-- </p>-->
<p class="transition-box-p"> <div class="transition-box-p">
<label class="transition-box-label">附件：</label> <label class="transition-box-label">附件：</label>
<span class="file-box" v-if="fileInfoList.length > 0"> <div class="file-box" v-if="fileInfoList.length > 0">
<div style="display: flex;"> <div style="display: flex;">
<div v-for="(file,item) in fileInfoList" <div v-for="(file,item) in fileInfoList"
target="_blank" target="_blank"
@@ -35,12 +35,12 @@
@click="handleQueryPdf(file)" @click="handleQueryPdf(file)"
:key="item"> :key="item">
{{ file.name }} {{ file.name }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button> <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
</div> </div>
</div> </div>
</span> </div>
<span class="transition-box-span" v-else>-</span> <span class="transition-box-span" v-else>-</span>
</p> </div>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">上传时间：</label> <label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span> <span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
@@ -56,7 +56,7 @@
<el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')"> <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">
添加 添加
</el-button> </el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button> <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
</div> </div>
<div class="container"> <div class="container">
<el-table <el-table