From 370b26066c560f15f6a84caca2be149e48e86556 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期二, 07 一月 2025 15:52:05 +0800
Subject: [PATCH] 系统菜单 默认显示&&系统配置、对象建模按钮权限以及按钮图标
---
Source/plt-web/plt-web-ui/src/views/system/role/index.vue | 74 ++++-
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 52 ++-
Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue | 46 ++
Source/plt-web/plt-web-ui/src/views/system/password/index.vue | 13
Source/plt-web/plt-web-ui/src/views/system/log/index.vue | 6
Source/plt-web/plt-web-ui/src/styles/ui.scss | 21 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue | 42 ++
Source/plt-web/plt-web-ui/src/store/modules/user.js | 11
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 40 ++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue | 27 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue | 25 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue | 15
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 96 +++++-
Source/plt-web/plt-web-ui/src/config/website.js | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue | 25 +
Source/plt-web/plt-web-ui/src/views/system/user/index.vue | 88 ++++--
Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue | 26 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 50 ++-
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 53 ++-
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 78 +++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 32 +
21 files changed, 600 insertions(+), 222 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/config/website.js b/Source/plt-web/plt-web-ui/src/config/website.js
index 3d4ce67..2265454 100644
--- a/Source/plt-web/plt-web-ui/src/config/website.js
+++ b/Source/plt-web/plt-web-ui/src/config/website.js
@@ -33,7 +33,7 @@
},
//閰嶇疆鑿滃崟鐨勫睘鎬�
menu: {
- iconDefault: 'codicon:gear',
+ iconDefault: null,
props: {
label: 'name',
path: 'path',//璺敱path
diff --git a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
index 2bbc1ff..d90ab50 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
@@ -7,8 +7,13 @@
:index="item[pathKey]"
@click="open(item)">
<div style="display: flex">
- <icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <span slot="title" style="margin-left: 8px;"
+ <icon-show v-if="item[iconKey]" :name="item[iconKey]" :style="{ height: iconSize, width: iconSize }"
+ class="iconShowSpan"></icon-show>
+ <div v-else :style="{ height: iconSize, width: iconSize }" class="iconShow iconShowSpan">
+ <i :style="{ fontSize: iconSize, width: iconSize,marginTop: '3px'}" class="el-icon-setting"></i>
+ </div>
+ <span slot="title"
+ style="margin-left: 8px"
:alt="item[pathKey]"
:class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
</div>
@@ -18,8 +23,13 @@
:index="item[pathKey]">
<template slot="title">
<div style="display: flex">
- <icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <span slot="title" style="margin-left: 8px;"
+ <icon-show v-if="item[iconKey]" :name="item[iconKey]" :style="{ height: iconSize, width: iconSize }"
+ class="iconShowSpan"></icon-show>
+ <div v-else :style="{ height: iconSize, width: iconSize }" class="iconShow iconShowSpan">
+ <i :style="{ fontSize: iconSize, width: iconSize,marginTop: '3px'}" class="el-icon-setting"></i>
+ </div>
+ <span slot="title"
+ style="margin-left: 8px"
:class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
</div>
</template>
@@ -30,8 +40,12 @@
:index="child[pathKey],cindex"
@click="open(child)">
<div style="display: flex">
- <icon-show :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <span slot="title" style="margin-left: 8px;">{{ generateTitle(child) }}</span>
+ <icon-show v-if="child[iconKey]" :name="child[iconKey]" :style="{ height: iconSize, width: iconSize }"
+ class="iconShowSpan"></icon-show>
+ <div v-else :style="{ height: iconSize, width: iconSize }" class="iconShow iconShowSpan">
+ <i :style="{ fontSize: iconSize, width: iconSize,marginTop: '3px'}" class="el-icon-setting"></i>
+ </div>
+ <span slot="title" style="margin-left: 8px">{{ generateTitle(child) }}</span>
</div>
</el-menu-item>
<sidebar-item v-else
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index 3a33a35..216bac7 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js
@@ -244,7 +244,7 @@
return new Promise((resolve) => {
getButtons().then(res => {
const data = res.data.data;
- console.log('getButton',data)
+ console.log('getButton', data)
commit('SET_PERMISSION', data);
resolve();
})
@@ -303,7 +303,14 @@
let children = {};
if (item.children && item.children.length > 0) {
item.children.forEach(child => {
- Vue.set(children, child.code, true);
+ // const childObject = {
+ // [child.code]: true,
+ // source: child.source
+ // };
+ // Object.assign(children, childObject);
+ children[child.code] = {
+ source: child.source
+ }
});
}
Vue.set(permission_new, item.id, children);
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index 1d7a736..8798e74 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -568,6 +568,18 @@
margin-right: 6px;
}
+.el-table td.el-table__cell div.iconShow{
+ font-size: 14px !important;
+ width: 14px !important;
+ height: 14px !important;
+ margin-top: -1px;
+ margin-right: 3px;
+}
+
+.avue-crud .avue-crud__menu .el-button--text >span {
+ display: flex;
+}
+
/*
鏍�
*/
@@ -612,6 +624,15 @@
content: '';
}
+.avue-crud .avue-crud__menu .el-button{
+ margin-top: 5px;
+}
+
+.avue-crud__left{
+ display: flex;
+ align-items: center;
+}
+
.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index f42d5d8..3cf1cd1 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -18,33 +18,49 @@
@current-change="currentChange"
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary"
- @click="rowSaveHandlerClick">鍒涘缓
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="rowSaveHandlerClick">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="allDelHandler">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="allDelHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary"
- @click="chekView">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small"
+ type="primary"
+ @click="chekView">
+ <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show>
+ 鏌ョ湅浣跨敤鑼冨洿
</el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
type="primary" @click="downloadTemplateHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
涓嬭浇瀵煎叆妯℃澘
</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadHandler">瀵煎叆
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="upLoadHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary"
- @click="downLoadHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="downLoadHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
<template slot="menu" slot-scope="scope">
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="text"
- @click="editBtnClick(scope.row)">缂栬緫
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="editBtnClick(scope.row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="text"
- @click="rowDeleteHandler(scope.row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click="rowDeleteHandler(scope.row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
</avue-crud>
@@ -773,8 +789,8 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
- viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].VIRTUALVIEW, false),
};
},
lastItem() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 07b84b2..c010a36 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -20,38 +20,60 @@
<el-main>
<basic-container>
<div>
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary"
- @click="addClickHandler">鍒涘缓
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary"
- @click="editClickHandler">淇敼
+ <el-button v-if="permissionList.editBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="editClickHandler">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 淇敼
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="deleteClickHandler">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="deleteClickHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadClickHandler">瀵煎叆
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="upLoadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary"
- @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
- <el-button v-if="permissionList.createViewBtn" icon="el-icon-circle-plus-outline" plain size="small"
- type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘
+ <el-button v-if="permissionList.createViewBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="createViewClickHandler">
+ <icon-show :name="permissionList.createViewBtn.source"></icon-show>
+ 鍒涘缓瑙嗗浘
</el-button>
- <el-button v-if="permissionList.createIndexBtn" icon="el-icon-circle-plus-outline" plain size="small"
- type="primary" @click="indexClickHandler">鍒涘缓绱㈠紩
+ <el-button v-if="permissionList.createIndexBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="indexClickHandler">
+ <icon-show :name="permissionList.createIndexBtn.source"></icon-show>
+ 鍒涘缓绱㈠紩
</el-button>
- <el-button v-if="permissionList.consistencyCheckBtn" icon="el-icon-menu" plain size="small" type="primary"
- @click="checkClickHandler">涓�鑷存�ф鏌�
+ <el-button v-if="permissionList.consistencyCheckBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="checkClickHandler">
+ <icon-show :name="permissionList.consistencyCheckBtn.source"></icon-show>
+ 涓�鑷存�ф鏌�
</el-button>
- <el-button v-if="permissionList.deleteDataBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="checkClickHandler">鍒犻櫎鏁版嵁
+ <el-button v-if="permissionList.deleteDataBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="checkClickHandler">
+ <icon-show :name="permissionList.deleteDataBtn.source"></icon-show>
+ 鍒犻櫎鏁版嵁
</el-button>
- <el-button v-if="permissionList.deleteEveryTypeBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷
+ <el-button v-if="permissionList.deleteEveryTypeBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="checkClickHandler">
+ <icon-show :name="permissionList.deleteEveryTypeBtn.source"></icon-show>
+ 鍒犻櫎鍏ㄩ儴绫诲瀷
</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="checkViewClickHandler">
+ <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show>
+ 鏌ョ湅浣跨敤鑼冨洿
</el-button>
</div>
<div style="display: flex;justify-content:left;margin-top: 15px;">
@@ -836,12 +858,12 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- consistencyCheckBtn: this.vaildData(this.permission[this.$route.query.id].consistencyCheck, false),
- createIndexBtn: this.vaildData(this.permission[this.$route.query.id].createIndex, false),
- createViewBtn: this.vaildData(this.permission[this.$route.query.id].createView, false),
- deleteDataBtn: this.vaildData(this.permission[this.$route.query.id].deleteData, false),
- deleteEveryTypeBtn: this.vaildData(this.permission[this.$route.query.id].deleteEveryType, false),
- viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ consistencyCheckBtn: this.vaildData(this.permission[this.$route.query.id].USE, false),
+ createIndexBtn: this.vaildData(this.permission[this.$route.query.id].DATARIGHT, false),
+ createViewBtn: this.vaildData(this.permission[this.$route.query.id].ATTRRIGHT, false),
+ deleteDataBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ deleteEveryTypeBtn: this.vaildData(this.permission[this.$route.query.id].RESET, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].VIRTUALVIEW, false),
};
},
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
index 871e58d..2b52b85 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
@@ -16,32 +16,49 @@
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary"
- @click="rowSaveHandlerClick">鍒涘缓
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="rowSaveHandlerClick">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="allDelHandler">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="allDelHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary"
- @click="chekView">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small"
+ type="primary"
+ @click="chekView">
+ <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show>
+ 鏌ョ湅浣跨敤鑼冨洿
</el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
- type="primary" @click="downloadTemplateHandler">涓嬭浇瀵煎叆妯℃澘
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downloadTemplateHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="uploadUser">瀵煎叆
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uploadUser">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary"
- @click="downloadHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="downloadHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
<template slot="menu" slot-scope="scope">
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="text"
- @click="editBtnClick(scope.row)">缂栬緫
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="editBtnClick(scope.row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="text"
- @click="rowDeleteHandler(scope.row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click="rowDeleteHandler(scope.row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
@@ -358,8 +375,8 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
- viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].VIRTUALVIEW, false),
};
},
lastItem() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
index 42274bd..d983cd8 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
@@ -4,17 +4,30 @@
<basic-container>
<div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
<div class="headerCon">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼
+ <el-button v-if="permissionList.editBtn" class="button-custom-icon" plain size="small" type="primary" @click="editClickHandler">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 淇敼
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delClickHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="uploadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small" type="primary" @click="checkViewClickHandler">
+ <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show>
+ 鏌ョ湅浣跨敤鑼冨洿
</el-button>
</div>
<!-- 宸︿晶鏍� -->
@@ -160,7 +173,7 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].VIRTUALVIEW, false),
};
},
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index f7cdc9e..4ffacbf 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -21,13 +21,35 @@
<el-main>
<basic-container>
<div>
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
- <el-button v-if="permissionList.createViewBtn" icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘</el-button>
- <el-button v-if="permissionList.consistencyCheckBtn" icon="el-icon-menu" plain size="small" type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�</el-button>
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
+ </el-button>
+ <el-button v-if="permissionList.editBtn" class="button-custom-icon" plain size="small" type="primary" @click="editClickHandler">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 淇敼
+ </el-button>
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="deleteClickHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="upLoadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ <el-button v-if="permissionList.createViewBtn" class="button-custom-icon" plain size="small" type="primary" @click="createViewClickHandler">
+ <icon-show :name="permissionList.createViewBtn.source"></icon-show>
+ 鍒涘缓瑙嗗浘
+ </el-button>
+ <el-button v-if="permissionList.consistencyCheckBtn" class="button-custom-icon" plain size="small" type="primary" @click="checkClickHandler">
+ <icon-show :name="permissionList.consistencyCheckBtn.source"></icon-show>
+ 涓�鑷存�ф鏌�
+ </el-button>
</div>
<el-descriptions style="margin: 10px 0 20px" :column="2" border class="margin-top" size="medium">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
@@ -660,8 +682,8 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- consistencyCheckBtn: this.vaildData(this.permission[this.$route.query.id].consistencyCheck, false),
- createViewBtn: this.vaildData(this.permission[this.$route.query.id].createView, false),
+ consistencyCheckBtn: this.vaildData(this.permission[this.$route.query.id].USE, false),
+ createViewBtn: this.vaildData(this.permission[this.$route.query.id].ATTRRIGHT, false),
};
},
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index f11283b..0dc26ce 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -13,22 +13,38 @@
@current-change="currentChange"
>
<template slot="menuLeft">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delClickHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
+ <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small" type="primary" @click="checkViewClickHandler">
+ <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show>
+ 鏌ョ湅浣跨敤鑼冨洿
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="uploadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
<template slot="menu" slot-scope="{row,index}">
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="text" @click="editClickHandler(row)">淇敼
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="editClickHandler(row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="text" @click="delRowClickHandler(row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" plain size="small" type="text" @click="delRowClickHandler(row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
@@ -211,7 +227,7 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].VIRTUALVIEW, false),
};
},
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
index cdbf72a..8253787 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
@@ -9,19 +9,36 @@
@selection-change="selectChange"
@row-click="rowClickHandler">
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="checkViewClickHandler">
+ <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show>
+ 鏌ョ湅浣跨敤鑼冨洿
</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uploadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
- <template slot="menu" slot-scope="scope">
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="text" @click="editClickHandler(scope.row)">缂栬緫
+ <template slot="menu" slot-scope="{row,index}">
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="editClickHandler(row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="text" @click="delClickHandler(scope.row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" size="small" type="text" @click="delClickHandler(row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
</avue-crud>
@@ -35,7 +52,7 @@
width="800px"
@close="visibleCloseHandler"
>
- <el-form ref="form" size="small" :model="form" :rules="rules" label-width="95px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="95px" size="small">
<el-row>
<el-col :span="24">
<el-form-item label="鍚嶇О锛�" prop="id">
@@ -190,7 +207,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
- header:false,
+ header: false,
column: [
{
label: '鍚嶇О',
@@ -274,7 +291,7 @@
lastIndex: null,
}
},
- computed:{
+ computed: {
...mapGetters(["permission"]),
permissionList() {
return {
@@ -283,7 +300,7 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].VIRTUALVIEW, false),
};
},
},
@@ -474,6 +491,7 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
+
.el-input-number--small {
width: 100%;
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
index a39c8a4..8b26aae 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
@@ -22,11 +22,26 @@
<el-main>
<basic-container>
<div v-if="this.nodeRow && this.nodeRow.label">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary" @click="addHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
+ </el-button>
+ <el-button v-if="permissionList.editBtn" class="button-custom-icon" plain size="small" type="primary" @click="editHandler">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 淇敼
+ </el-button>
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="upLoadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
</div>
<avue-crud ref="crud"
@selection-change="selectionChange"
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
index 61a7b02..c8b8209 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
@@ -21,11 +21,26 @@
<el-main>
<basic-container>
<div v-if="this.nodeRow && this.nodeRow.label">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary" @click="addHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
+ </el-button>
+ <el-button v-if="permissionList.editBtn" class="button-custom-icon" plain size="small" type="primary" @click="editHandler">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 淇敼
+ </el-button>
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="upLoadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
</div>
<avue-crud ref="crud"
@selection-change="selectionChange"
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
index aec2422..8c57a29 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
@@ -28,9 +28,18 @@
<avue-crud ref="queryCrud"
:data="attrData" :option="attrOption" :table-loading="tableLoading" style="margin-top: 10px">
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary" @click="addHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
+ </el-button>
+ <el-button v-if="permissionList.editBtn" class="button-custom-icon" plain size="small" type="primary" @click="editHandler">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 淇敼
+ </el-button>
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
</template>
</avue-crud>
</basic-container>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index 46cd11f..56840c0 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -34,22 +34,42 @@
@row-update="rowTreeUpdataHandler"
@refresh-change="handleRefresh">
<template slot="menuLeft">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addTreeClickHandler(treeNodeRow)">鍒涘缓
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addTreeClickHandler(treeNodeRow)">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</el-button>
<!--<el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editTreeClickHandler">淇敼
</el-button>
<el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delTreeClickHandler">鍒犻櫎
</el-button>-->
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="uploadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
- <template #menu="{ row, size }">
- <el-button v-if="permissionList.addBtn" :size="size" icon="el-icon-plus"
+ <template #menu="{ row, index, size }">
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="$refs.treeCrud.rowEdit(row, index)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click.stop="rowTreeDelHandler(row,index)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.addBtn" :size="size"
text
type="text"
- @click="addTreeClickHandler(row)">鏂板瀛愮骇</el-button>
+ @click="addTreeClickHandler(row)">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂板瀛愮骇
+ </el-button>
</template>
</avue-crud>
</div>
@@ -85,10 +105,26 @@
</el-tag>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="treeNodeRow.id !== 'root' && permissionList.actionTopAddBtn" icon="el-icon-plus" plain size="small" type="primary"
- @click="addClickHandler">澧炲姞
+ <el-button v-if="treeNodeRow.id !== 'root' && permissionList.actionTopAddBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.actionTopAddBtn.source"></icon-show>
+ 澧炲姞
</el-button>
- <el-button v-if="permissionList.actionTopExportBtn" icon="el-icon-download" plain size="small" type="success" @click="downLoadHandler">瀵煎嚭
+ <el-button v-if="permissionList.actionTopExportBtn" class="button-custom-icon" plain size="small" type="success" @click="downLoadHandler">
+ <icon-show :name="permissionList.actionTopExportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ </template>
+ <template #menu="{row,index,size}">
+ <el-button v-if="permissionList.actionTopEditBtn" size="small" type="text"
+ @click="$refs.crud.rowEdit(row, index)">
+ <icon-show :name="permissionList.actionTopEditBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.actionTopDelBtn" size="small" type="text"
+ @click.stop="rowDelHandler(row,index)">
+ <icon-show :name="permissionList.actionTopDelBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
</avue-crud>
@@ -106,7 +142,21 @@
@row-del="BottomRowDelHandler"
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.actionBottomAddBtn" icon="el-icon-plus" plain size="small" type="primary" @click="bottomAddClickHandler">澧炲姞
+ <el-button v-if="permissionList.actionBottomAddBtn" class="button-custom-icon" plain size="small" type="primary" @click="bottomAddClickHandler">
+ <icon-show :name="permissionList.actionBottomAddBtn.source"></icon-show>
+ 澧炲姞
+ </el-button>
+ </template>
+ <template #menu="{row,index,size}">
+ <el-button v-if="permissionList.actionBottomEditBtn" size="small" type="text"
+ @click="$refs.BottomCrud.rowEdit(row, index)">
+ <icon-show :name="permissionList.actionBottomEditBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.actionBottomDelBtn" size="small" type="text"
+ @click.stop="BottomRowDelHandler(row,index)">
+ <icon-show :name="permissionList.actionBottomDelBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
<template slot="menuForm" slot-scope="scope">
@@ -203,20 +253,20 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- actionTopAddBtn: this.vaildData(this.permission[this.$route.query.id].actionTopAdd, false),
- actionTopDelBtn: this.vaildData(this.permission[this.$route.query.id].actionTopDel, false),
- actionTopEditBtn: this.vaildData(this.permission[this.$route.query.id].actionTopEdit, false),
- actionTopExportBtn: this.vaildData(this.permission[this.$route.query.id].actionTopExport, false),
- actionBottomAddBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomAdd, false),
- actionBottomDelBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomDel, false),
- actionBottomEditBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomEdit, false),
+ actionTopAddBtn: this.vaildData(this.permission[this.$route.query.id].USE, false),
+ actionTopDelBtn: this.vaildData(this.permission[this.$route.query.id].RESET, false),
+ actionTopEditBtn: this.vaildData(this.permission[this.$route.query.id].RECYCLE, false),
+ actionTopExportBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ actionBottomAddBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ actionBottomDelBtn: this.vaildData(this.permission[this.$route.query.id].BATCHAPPLY, false),
+ actionBottomEditBtn: this.vaildData(this.permission[this.$route.query.id].CODEAPPLY, false),
};
},
treeCrudOption(){
return {
...basicOption,
- editBtn: this.permissionList.editBtn,
- delBtn: this.permissionList.delBtn,
+ editBtn: false,
+ delBtn: false,
addBtn: false,
calcHeight: -50,
highlightCurrentRow: true,
@@ -259,8 +309,8 @@
option() {
return {
...basicOption,
- editBtn:this.permissionList.actionTopEditBtn,
- delBtn:this.permissionList.actionTopDelBtn,
+ editBtn:false,
+ delBtn:false,
addBtn: false,
height: 350,
highlightCurrentRow: true,
@@ -375,8 +425,8 @@
return {
...basicOption,
addBtn: false,
- editBtn:this.permissionList.actionBottomEditBtn,
- delBtn:this.permissionList.actionBottomDelBtn,
+ editBtn:false,
+ delBtn:false,
calcHeight: -20,
selection: false,
refreshBtn: false,
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index b65c440..8f6cebd 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -15,31 +15,45 @@
@current-row-change="handleCurrentRowChange"
>
<template slot="menu" slot-scope="{row,size,type}">
- <el-button v-if="permissionList.departmentAddChildrenBtn" icon="el-icon-circle-plus-outline" size="small"
- type="text" @click="handleAdd()">鏂板瀛愮骇
+ <el-button v-if="permissionList.departmentAddChildrenBtn" size="small"
+ type="text" @click="handleAdd()">
+ <icon-show :name="permissionList.departmentAddChildrenBtn.source"></icon-show>
+ 鏂板瀛愮骇
</el-button>
- <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.editBtn" icon="el-icon-edit" size="small"
+ <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.editBtn" size="small"
type="text"
- @click="editBtnClick(row)">缂栬緫
+ @click="editBtnClick(row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.delBtn" icon="el-icon-delete" size="small"
+ <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.delBtn" size="small"
type="text"
- @click="rowDeleteHandler(row)">鍒犻櫎
+ @click="rowDeleteHandler(row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.assignMembersBtn" icon="el-icon-school" plain size="small" type="primary"
- @click="assignMembersHandler">鍒嗛厤鎴愬憳
+ <el-button v-if="permissionList.assignMembersBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="assignMembersHandler">
+ <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
+ 鍒嗛厤鎴愬憳
</el-button>
- <el-button v-if="permissionList.statisticsBtn" icon="el-icon-user" plain size="small" type="primary"
- @click="statisticsHandler">缁熻
+ <el-button v-if="permissionList.statisticsBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="statisticsHandler">
+ <icon-show :name="permissionList.statisticsBtn.source"></icon-show>
+ 缁熻
</el-button>
- <el-button v-if="permissionList.importDepartmentBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadHandler">瀵煎叆閮ㄩ棬
+ <el-button v-if="permissionList.importDepartmentBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="upLoadHandler">
+ <icon-show :name="permissionList.importDepartmentBtn.source"></icon-show>
+ 瀵煎叆閮ㄩ棬
</el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
- type="primary" @click="downLoadHandler">涓嬭浇瀵煎叆妯℃澘
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downLoadHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
</el-button>
</template>
</avue-crud>
@@ -170,11 +184,11 @@
return {
delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
- assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].assignMembers, false),
- departmentAddChildrenBtn: this.vaildData(this.permission[this.$route.query.id].departmentAddChildren, false),
- downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
- importDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].importDepartment, false),
- statisticsBtn: this.vaildData(this.permission[this.$route.query.id].statistics, false),
+ assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ departmentAddChildrenBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ importDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].MGR, false),
+ statisticsBtn: this.vaildData(this.permission[this.$route.query.id].DISCARD, false),
};
},
},
diff --git a/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue b/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
index 3f47257..b30aeee 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
@@ -10,16 +10,40 @@
@on-load="getTableList"
@row-save="rowSaveHandler"
@row-update="rowUpdateHandler"
- @row-del="rowDeleteHandler"
@row-click="rowClickHandler"
@selection-change="selectionChange"
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary"
+ @click="$refs.crud.rowAdd()">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂� 澧�
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
</template>
- <!--<template #menu="{row,index,size}">
- <el-button icon="el-icon-user" type="text" size="small" @click="userHandler(row,index)">鍒嗛厤鎴愬憳</el-button>
- </template>-->
+ <template slot="menu" slot-scope="{ row, index }">
+ <el-button
+ v-if="permissionList.editBtn"
+ size="small"
+ type="text"
+ @click="handleEdit(row, index)"
+ >
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button
+ v-if="permissionList.delBtn"
+ size="small"
+ type="text"
+ @click="handleDel(row, index)"
+ >
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ </template>
</avue-crud>
<!-- 鍒嗛厤鎴愬憳绌挎妗� -->
<transfer ref="transfer" :left-role-data="leftRoleData" :right-role-data="rightRoleData"
@@ -70,9 +94,9 @@
option(){
return {
...basicOption,
- addBtn:this.permissionList.addBtn,
- editBtn:this.permissionList.editBtn,
- delBtn:this.permissionList.delBtn,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
calcHeight: -60,
align:'left',
headerAlign:'center',
@@ -161,6 +185,10 @@
});
},
+ handleEdit(row,index){
+ this.$refs.crud.rowEdit(row, index);
+ },
+
// 缂栬緫
rowUpdateHandler(row, index, done, loading) {
updatePvolume(row).then(res => {
@@ -175,7 +203,7 @@
},
// 鍒犻櫎
- rowDeleteHandler(row) {
+ handleDel(row,index) {
let params = {
ids: row.id
}
diff --git a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
index 3eedc62..cc714ab 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
@@ -15,8 +15,10 @@
@current-change="currentChange"
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary"
- @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
</avue-crud>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/password/index.vue b/Source/plt-web/plt-web-ui/src/views/system/password/index.vue
index a621b37..4e52112 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/password/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/password/index.vue
@@ -14,23 +14,30 @@
@row-save="rowSaveHandler"
@row-update="rowUpdateHandler"
>
+ <template slot="menuLeft" slot-scope="{ row, index }">
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small"
+ type="primary" @click="$refs.passWordCrud.rowAdd()">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂� 澧�
+ </el-button>
+ </template>
<template slot="menu" slot-scope="{ row, index }">
<el-button
v-if="permissionList.editBtn"
- icon="el-icon-edit"
size="small"
type="text"
@click="handleEdit(row, index)"
>
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
缂栬緫
</el-button>
<el-button
v-if="permissionList.delBtn"
- icon="el-icon-delete"
size="small"
type="text"
@click="handleDel(row, index)"
>
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
鍒犻櫎
</el-button>
</template>
@@ -89,7 +96,7 @@
option() {
return {
...basicOption,
- addBtn: this.permissionList.addBtn,
+ addBtn: false,
selection: false,
menuWidth: 150,
editBtn: false,
diff --git a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
index 55308b2..cc5ca1e 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
@@ -14,22 +14,57 @@
@row-click="rowClickHandler"
@row-save="rowSaveHandler"
@row-update="rowUpdateHandler"
- @row-del="rowDeleteHandler"
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="allDelHandler">鍒犻櫎
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary"
+ @click="$refs.roleCrud.rowAdd()">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂� 澧�
</el-button>
- <el-button v-if="permissionList.assignMembersBtn" icon="el-icon-school" plain size="small" type="primary"
- @click="assignMembersHandler">鍒嗛厤鎴愬憳
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="allDelHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.statisticsBtn" icon="el-icon-user" plain size="small" type="primary"
- @click="statisticsHandler">缁熻
+ <el-button v-if="permissionList.assignMembersBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="assignMembersHandler">
+ <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
+ 鍒嗛厤鎴愬憳
</el-button>
- <el-button v-if="permissionList.importRoleBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadRole">瀵煎叆瑙掕壊
+ <el-button v-if="permissionList.statisticsBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="statisticsHandler">
+ <icon-show :name="permissionList.statisticsBtn.source"></icon-show>
+ 缁熻
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary">瀵煎嚭
+ <el-button v-if="permissionList.importRoleBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="upLoadRole">
+ <icon-show :name="permissionList.importRoleBtn.source"></icon-show>
+ 瀵煎叆瑙掕壊
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ </template>
+
+ <template slot="menu" slot-scope="{ row, index }">
+ <el-button
+ v-if="permissionList.editBtn"
+ size="small"
+ type="text"
+ @click="handleEdit(row, index)"
+ >
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button
+ v-if="permissionList.delBtn"
+ size="small"
+ type="text"
+ @click="handleDel(row, index)"
+ >
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
@@ -153,17 +188,17 @@
delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
- assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].assignMembers, false),
- importRoleBtn: this.vaildData(this.permission[this.$route.query.id].importRole, false),
- statisticsBtn: this.vaildData(this.permission[this.$route.query.id].statistics, false),
+ assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ importRoleBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
+ statisticsBtn: this.vaildData(this.permission[this.$route.query.id].DISCARD, false),
};
},
option() {
return {
...basicOption,
- addBtn: this.permissionList.addBtn,
- delBtn: this.permissionList.delBtn,
- editBtn: this.permissionList.editBtn,
+ addBtn: false,
+ delBtn: false,
+ editBtn: false,
dialogTop: 0,
dialogWidth: '30%',
column: column,
@@ -181,6 +216,11 @@
this.page.total = res.data.total;
this.tableLoading = false;
})
+ },
+
+ // 缂栬緫鎸夐挳
+ handleEdit(row, index) {
+ this.$refs.roleCrud.rowEdit(row, index);
},
// 鍒楀ご鍒锋柊
@@ -248,7 +288,7 @@
},
// 鍒犻櫎
- rowDeleteHandler(row) {
+ handleDel(row, index) {
let params = {
ids: row.oid
}
diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index 5f92502..acf4e73 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -28,36 +28,64 @@
</template>
<template #menu="{row,index,size}">
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="text"
- @click.stop="rowEditHandler(row,index)">缂栬緫
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click.stop="rowEditHandler(row,index)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="text"
- @click.stop="rowDeleteHandler(row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click.stop="rowDeleteHandler(row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.stopActionBtn" size="small" type="text" @click.stop="stopUserHandler(row)">
- <span v-if="row.status === 0" style="color: #fa3434"><i class="el-icon-video-pause"></i> 鍋滅敤</span>
- <span v-if="row.status === 1" style="color: #55b61d"><i class="el-icon-video-play"></i> 鍚敤</span>
+ <el-button size="small" type="text" @click.stop="stopUserHandler(row)">
+ <span v-if="row.status === 0 && permissionList.stopBtn" style="color: #fa3434;display: flex">
+ <icon-show :name="permissionList.stopBtn.source"></icon-show>
+ 鍋滅敤
+ </span>
+ <span v-if="row.status === 1 && permissionList.actionBtn" style="color: #55b61d;display: flex">
+ <icon-show :name="permissionList.actionBtn.source"></icon-show>
+ 鍚敤
+ </span>
</el-button>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.editBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="allDelHandler">鍒犻櫎
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary"
+ @click="$refs.userCrud.rowAdd()">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂� 澧�
</el-button>
- <el-button v-if="permissionList.assigningRolesBtn" icon="el-icon-user" plain size="small" type="primary"
- @click="roleHandler">鍒嗛厤瑙掕壊
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="allDelHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.distributionDepartmentBtn" icon="el-icon-school" plain size="small"
- type="primary" @click="departmentHandler">鍒嗛厤閮ㄩ棬
+ <el-button v-if="permissionList.assigningRolesBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="roleHandler">
+ <icon-show :name="permissionList.assigningRolesBtn.source"></icon-show>
+ 鍒嗛厤瑙掕壊
</el-button>
- <el-button v-if="permissionList.setPasswordPolicyBtn" icon="el-icon-key" plain size="small" type="success"
- @click="setPwsHandler">璁剧疆瀵嗙爜绛栫暐
+ <el-button v-if="permissionList.distributionDepartmentBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="departmentHandler">
+ <icon-show :name="permissionList.distributionDepartmentBtn.source"></icon-show>
+ 鍒嗛厤閮ㄩ棬
</el-button>
- <el-button v-if="permissionList.importPersonnelBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="uploadUser">瀵煎叆浜哄憳
+ <el-button v-if="permissionList.setPasswordPolicyBtn" class="button-custom-icon" plain size="small"
+ type="success"
+ @click="setPwsHandler">
+ <icon-show :name="permissionList.setPasswordPolicyBtn.source"></icon-show>
+ 璁剧疆瀵嗙爜绛栫暐
</el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
- type="primary" @click="downloadHandler">涓嬭浇瀵煎叆妯℃澘
+ <el-button v-if="permissionList.importPersonnelBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uploadUser">
+ <icon-show :name="permissionList.importPersonnelBtn.source"></icon-show>
+ 瀵煎叆浜哄憳
+ </el-button>
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downloadHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
</el-button>
</template>
</avue-crud>
@@ -212,18 +240,19 @@
addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
- assigningRolesBtn: this.vaildData(this.permission[this.$route.query.id].assigningRoles, false),
- distributionDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].distributionDepartment, false),
- downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
- importPersonnelBtn: this.vaildData(this.permission[this.$route.query.id].importPersonnel, false),
- setPasswordPolicyBtn: this.vaildData(this.permission[this.$route.query.id].setPasswordPolicy, false),
- stopActionBtn: this.vaildData(this.permission[this.$route.query.id].stopAction, false),
+ assigningRolesBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
+ distributionDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ importPersonnelBtn: this.vaildData(this.permission[this.$route.query.id].CLSRIGHT, false),
+ setPasswordPolicyBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
+ stopBtn: this.vaildData(this.permission[this.$route.query.id].UNFREZE, false),
+ actionBtn: this.vaildData(this.permission[this.$route.query.id].RECYCLE, false),
};
},
option() {
return {
...basicOption,
- addBtn: this.permissionList.addBtn,
+ addBtn: false,
editBtn: false,
delBtn: false,
dialogWidth: '50%',
@@ -238,10 +267,13 @@
this.tableLoading = true;
getDataUsers(this.page.currentPage, this.page.pageSize, this.searchParams).then(res => {
const data = res.data.data;
- data.map(item => {item.secretGrade = item.secretGrade.toString()})
+ data.map(item => {
+ item.secretGrade = item.secretGrade.toString()
+ })
this.tableData = data;
this.page.total = res.data.total;
- this.tableLoading = false;s
+ this.tableLoading = false;
+ s
})
this.departmentQueryOnLoad()
},
--
Gitblit v1.9.3