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:
zqx0221
2021-07-20 09:51:45 +08:00
parent b4581b9733 6f391017fe
commit 35c002df6e
23 changed files with 531 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/attributeCustom/components/stand.vue
+4 -4
View File
@@ -2,8 +2,8 @@
<template>
<div class="attribute-custom v-class">
<div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="'df57f63c9e993bbfb2a4b400d5257577'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-default" size="mini" v-btn-permission="'9557b51320a50728d7047448d01c57c6'" @click="showDisplayLocationDialog">展示区域管理</el-button>
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div>
<loading :loading="attributeDataLoading">数据处理中</loading>
<div class="content">
@@ -76,8 +76,8 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'abba040e019fad5092624ffd71a70372'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item v-btn-permission="'730c9240a8f80bcdb88c71adb37f2aa7'" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item v-btn-permission="''" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/config/pages/attributeCustom/index.vue
+2 -2
View File
@@ -6,11 +6,11 @@
<stand v-if="tabValue === 'stand'"></stand>
</div>
</el-tab-pane>
<el-tab-pane label="国内外政策" name="laws">
<!-- <el-tab-pane label="国内外政策" name="laws">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<laws v-if="tabValue === 'laws'"></laws>
</div>
</el-tab-pane>
</el-tab-pane>-->
<el-tab-pane label="企业标准库" name="buss">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<buss v-if="tabValue === 'buss'"></buss>