From 354cad3d3ab22ba147169beb6a0f6f51b9bab3a8 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 09:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue | 18 ++++
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue | 38 +++++++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 34 +++++---
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue | 13 ++-
Source/plt-web/plt-web-ui/src/styles/ui.scss | 5 +
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 15 +++
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue | 44 +++++++----
Source/plt-web/plt-web-ui/src/views/systemModel/systemMonitor/index.vue | 14 +++
Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue | 29 +++++--
Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue | 10 ++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 2
Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue | 13 ++-
13 files changed, 175 insertions(+), 62 deletions(-)
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 8798e74..a14a8d6 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -633,6 +633,11 @@
align-items: center;
}
+.avue-crud__menu{
+ display: flex;
+ justify-content: space-around;
+}
+
.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/authority/function/functionView/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue
index 3f19ee1..c1d1132 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue
@@ -22,9 +22,14 @@
<basic-container v-loading="treeLoading">
<h3 style="margin: 0 0 10px 0">鍔熻兘鏉冮檺閰嶇疆</h3>
<div>
- <el-button v-if="permissionList.rightBtn" icon="el-icon-place" plain size="small" type="primary" @click="saveHandler">鎺堟潈</el-button>
- <el-button v-if="permissionList.resetBtn" icon="el-icon-close" plain size="small" style="margin-right: 40px;" type="primary"
- @click="clearValue">閲嶇疆
+ <el-button v-if="permissionList.rightBtn" class="button-custom-icon" plain size="small" type="primary" @click="saveHandler">
+ <icon-show :name="permissionList.rightBtn.source"></icon-show>
+ 鎺堟潈
+ </el-button>
+ <el-button v-if="permissionList.resetBtn" class="button-custom-icon" plain size="small" style="margin-right: 40px;" type="primary"
+ @click="clearValue">
+ <icon-show :name="permissionList.resetBtn.source"></icon-show>
+ 閲嶇疆
</el-button>
</div>
<div style="height: calc(100vh - 232px);margin-top: 10px;">
@@ -89,7 +94,7 @@
permissionList() {
return {
rightBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
- resetBtn: this.vaildData(this.permission[this.$route.query.id].reset, false),
+ resetBtn: this.vaildData(this.permission[this.$route.query.id].RESET, false),
};
},
},
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
index bf9d7e3..0e133e6 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
@@ -23,7 +23,7 @@
...mapGetters(["permission"]),
permissionList() {
return {
- saveBtn: this.vaildData(this.permission[this.$route.query.id].save, false),
+ saveBtn: this.vaildData(this.permission[this.$route.query.id].SAVE, false),
};
},
formOption() {
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index d50aab4..23e05b4 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -28,9 +28,18 @@
@refresh-change="handleRefresh"
@current-row-change="rowClickHandler">
<template slot="menuLeft">
- <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-plus" 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" 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 icon="el-icon-view" plain size="small" type="primary" @click="viewAuthHandler">鏌ョ湅鎺堟潈缁撴灉</el-button>-->
</template>
</avue-crud>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
index ba18242..d7ca5a6 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
@@ -32,8 +32,14 @@
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
<template slot="menuLeft">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">娣诲姞</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.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>
<action-dialog ref="actionDialog" :is-muti="true" @updataAction="actionSaveHandler"></action-dialog>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
index 47483e0..8a6717e 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
@@ -22,9 +22,14 @@
<basic-container v-loading="mainLoading">
<h3 style="margin: 0 0 10px 0">UI鏉冮檺閰嶇疆</h3>
<div>
- <el-button v-if="permissionList.rightBtn" icon="el-icon-place" plain size="small" type="primary" @click="saveHandler">鎺堟潈</el-button>
- <el-button v-if="permissionList.resetBtn" icon="el-icon-close" plain size="small" style="margin-right: 40px;" type="primary"
- @click="clearValue">閲嶇疆
+ <el-button v-if="permissionList.rightBtn" class="button-custom-icon" plain size="small" type="primary" @click="saveHandler">
+ <icon-show :name="permissionList.rightBtn.source"></icon-show>
+ 鎺堟潈
+ </el-button>
+ <el-button v-if="permissionList.resetBtn" class="button-custom-icon" plain size="small" style="margin-right: 40px;" type="primary"
+ @click="clearValue">
+ <icon-show :name="permissionList.resetBtn.source"></icon-show>
+ 閲嶇疆
</el-button>
涓氬姟绫诲瀷锛�
<el-select v-model="type" :clearable="true" placeholder="璇烽�夋嫨" size="small"
@@ -112,7 +117,7 @@
permissionList() {
return {
rightBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
- resetBtn: this.vaildData(this.permission[this.$route.query.id].reset, false),
+ resetBtn: this.vaildData(this.permission[this.$route.query.id].RESET, 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 2b52b85..1c8e48f 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
@@ -53,7 +53,7 @@
<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" size="small" type="text"
@click="rowDeleteHandler(scope.row)">
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
index ee6bbae..4bdb4a0 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
@@ -17,8 +17,14 @@
</div>
<div style="height: calc(100vh - 190px)">
<div>
- <el-button icon="el-icon-plus" type="primary" size="mini" @click="addHandler">娣诲姞</el-button>
- <el-button icon="el-icon-upload" type="primary" size="mini" @click="uploadHandler">涓婁紶</el-button>
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" type="primary" size="small" @click="addHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 娣诲姞
+ </el-button>
+ <el-button v-if="permissionList.uploadBtn" class="button-custom-icon" type="primary" size="small" @click="uploadHandler">
+ <icon-show :name="permissionList.uploadBtn.source"></icon-show>
+ 涓婁紶
+ </el-button>
</div>
<el-tabs v-model="activeName" @tab-click="handleClick">
@@ -87,6 +93,7 @@
import {getStore} from "@/util/store";
import store from "@/store";
import {getToken} from "@/util/auth";
+import {mapGetters} from "vuex";
export default {
name: "index",
@@ -215,6 +222,13 @@
"Authorizationtoken":getToken(),
};
},
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
+ uploadBtn: this.vaildData(this.permission[this.$route.query.id].UPLOAD, false),
+ };
+ },
},
watch:{
'form.groups'(val){
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index 70e5cd8..fa92e85 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -26,12 +26,30 @@
<el-main>
<basic-container>
<div v-if="!tableStatus" style="display: flex;justify-content: left;margin-top: 15px">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">澧炲姞</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.cloneBtn" icon="el-icon-document-add" plain size="small" type="primary" @click="copyClickHandler">鍏嬮殕
+ <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.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 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.cloneBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="copyClickHandler">
+ <icon-show :name="permissionList.cloneBtn.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
@@ -58,9 +76,13 @@
</div>
</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>
@@ -197,7 +219,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),
- cloneBtn: this.vaildData(this.permission[this.$route.query.id].clone, false),
+ cloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
};
},
tableStatus() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
index eb27bb3..65fac14 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
@@ -33,30 +33,42 @@
@search-reset="handleReset"
@row-click="rowClickHandler">
<template slot="menuLeft">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">
+ <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 icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
- <el-button 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 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.RIGHTBtn" icon="el-icon-place" plain size="small" type="primary"
- @click="uiAuthorHandler">鎺堟潈
+ <el-button v-if="permissionList.RIGHTBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uiAuthorHandler">
+ <icon-show :name="permissionList.RIGHTBtn.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="rowEditBtnClick(scope.row)">缂栬緫
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="rowEditBtnClick(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>
- <el-button v-if="permissionList.cloneBtn" icon="el-icon-document-copy" size="small" type="text"
- @click="rowCloneHandler(scope.row)">鍏嬮殕
+ <el-button v-if="permissionList.cloneBtn" size="small" type="text"
+ @click="rowCloneHandler(scope.row)">
+ <icon-show :name="permissionList.cloneBtn.source"></icon-show>
+ 鍏嬮殕
</el-button>
</template>
<template slot="plName" slot-scope="{row}">
@@ -376,7 +388,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),
- cloneBtn: this.vaildData(this.permission[this.$route.query.id].clone, false),
+ cloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
RIGHTBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
};
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index ad110fe..747c645 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -13,20 +13,30 @@
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionChildrenList.UiPageLayoutAddBtn" icon="el-icon-plus" plain size="small" type="primary"
- @click="addClickHandler">澧炲姞
+ <el-button v-if="permissionChildrenList.UiPageLayoutAddBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionChildrenList.UiPageLayoutAddBtn.source"></icon-show>
+ 澧炲姞
</el-button>
</template>
<template slot="menu" slot-scope="scope">
- <el-button v-if="permissionChildrenList.UiPageLayoutDesignBtn" icon="el-icon-edit-outline" size="small" type="text"
- @click="btnDesignClickHandler(scope.row)">鎸夐挳璁捐
+ <el-button v-if="permissionChildrenList.UiPageLayoutDesignBtn" size="small" type="text"
+ @click="btnDesignClickHandler(scope.row)">
+ <icon-show :name="permissionChildrenList.UiPageLayoutDesignBtn.source"></icon-show>
+ 鎸夐挳璁捐
</el-button>
- <el-button v-if="permissionChildrenList.UiPageLayoutEditBtn" icon="el-icon-edit" size="small" type="text" @click="editBtnClick(scope.row)">缂栬緫
+ <el-button v-if="permissionChildrenList.UiPageLayoutEditBtn" size="small" type="text" @click="editBtnClick(scope.row)">
+ <icon-show :name="permissionChildrenList.UiPageLayoutEditBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionChildrenList.UiPageLayoutDelBtn" icon="el-icon-delete" size="small" type="text" @click="rowDeleteHandler(scope.row)">鍒犻櫎
+ <el-button v-if="permissionChildrenList.UiPageLayoutDelBtn" size="small" type="text" @click="rowDeleteHandler(scope.row)">
+ <icon-show :name="permissionChildrenList.UiPageLayoutDelBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionChildrenList.UiPageLayoutCloneBtn" icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">鍏嬮殕
+ <el-button v-if="permissionChildrenList.UiPageLayoutCloneBtn" size="small" type="text" @click="rowCloneHandler(scope.row)">
+ <icon-show :name="permissionChildrenList.UiPageLayoutCloneBtn.source"></icon-show>
+ 鍏嬮殕
</el-button>
</template>
@@ -862,11 +872,11 @@
...mapGetters(["permission"]),
permissionChildrenList() {
return {
- UiPageLayoutAddBtn: this.vaildData(this.permission[this.$route.query.id].UiPageLayoutAdd, false),
- UiPageLayoutEditBtn: this.vaildData(this.permission[this.$route.query.id].UiPageLayoutEdit, false),
- UiPageLayoutDelBtn: this.vaildData(this.permission[this.$route.query.id].UiPageLayoutDel, false),
- UiPageLayoutCloneBtn: this.vaildData(this.permission[this.$route.query.id].UiPageLayoutClone, false),
- UiPageLayoutDesignBtn: this.vaildData(this.permission[this.$route.query.id].UiPageLayoutDesign, false),
+ UiPageLayoutAddBtn: this.vaildData(this.permission[this.$route.query.id].CLSRIGHT, false),
+ UiPageLayoutEditBtn: this.vaildData(this.permission[this.$route.query.id].DATARIGHT, false),
+ UiPageLayoutDelBtn: this.vaildData(this.permission[this.$route.query.id].ATTRRIGHT, false),
+ UiPageLayoutCloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
+ UiPageLayoutDesignBtn: this.vaildData(this.permission[this.$route.query.id].UPLOAD, false),
}
}
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
index 3d1f196..d8a1f23 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
@@ -13,14 +13,27 @@
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
<template slot="menuLeft">
- <el-button v-if="permissionChildrenList.UiTabAddBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</el-button>
+ <el-button v-if="permissionChildrenList.UiTabAddBtn" class="button-custom-icon" size="small" type="primary" @click="addHandler">
+ <icon-show :name="permissionChildrenList.UiTabAddBtn.source"></icon-show>
+ 鍒涘缓
+ </el-button>
<!--<el-button icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>-->
</template>
<template slot="menu" slot-scope="scope">
- <el-button v-if="permissionChildrenList.UiTabEditBtn" icon="el-icon-edit" size="small" type="text" @click="rowEditBtnClick(scope.row)">缂栬緫</el-button>
- <el-button v-if="permissionChildrenList.UiTabDelBtn" icon="el-icon-delete" size="small" type="text" @click="rowDeleteHandler(scope.row)">鍒犻櫎</el-button>
- <el-button v-if="permissionChildrenList.UiTabCloneBtn" icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">鍏嬮殕</el-button>
+ <el-button v-if="permissionChildrenList.UiTabEditBtn" size="small" type="text"
+ @click="rowEditBtnClick(scope.row)">
+ <icon-show :name="permissionChildrenList.UiTabEditBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionChildrenList.UiTabDelBtn" size="small" type="text" @click="rowDeleteHandler(scope.row)">
+ <icon-show :name="permissionChildrenList.UiTabDelBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionChildrenList.UiTabCloneBtn" size="small" type="text" @click="rowCloneHandler(scope.row)">
+ <icon-show :name="permissionChildrenList.UiTabCloneBtn.source"></icon-show>
+ 鍏嬮殕
+ </el-button>
</template>
<template slot="plIsOpen" slot-scope="{row}">
<el-tag v-if="row.plIsOpen === 1" type="success">鍚敤</el-tag>
@@ -213,10 +226,10 @@
...mapGetters(["permission"]),
permissionChildrenList() {
return {
- UiTabAddBtn: this.vaildData(this.permission[this.$route.query.id].UiTabADD, false),
- UiTabEditBtn: this.vaildData(this.permission[this.$route.query.id].UiTabEdit, false),
- UiTabDelBtn: this.vaildData(this.permission[this.$route.query.id].UiTabDel, false),
- UiTabCloneBtn: this.vaildData(this.permission[this.$route.query.id].UiTabClone, false),
+ UiTabAddBtn: this.vaildData(this.permission[this.$route.query.id].BATCHAPPLY, false),
+ UiTabEditBtn: this.vaildData(this.permission[this.$route.query.id].BATCHUPDATE, false),
+ UiTabDelBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ UiTabCloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
}
}
},
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/systemMonitor/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/systemMonitor/index.vue
index 0c0351c..881f785 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/systemMonitor/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/systemMonitor/index.vue
@@ -2,7 +2,10 @@
<basic-container>
<div style="display: flex;justify-content: space-between;align-items: center">
<h3>褰撳墠鍦ㄧ嚎浜哄憳淇℃伅</h3>
- <el-button type="primary" size="small" plain style="margin-right: 10px" @click="getOnlinUsersHandler">鍒锋柊</el-button>
+ <el-button v-if="permissionList.referBtn" class="button-custom-icon" type="primary" size="small" plain style="margin-right: 10px" @click="getOnlinUsersHandler">
+ <icon-show :name="permissionList.referBtn.source"></icon-show>
+ 鍒锋柊
+ </el-button>
</div>
<avue-crud :data="data" :option="option" :table-loading="loading" ></avue-crud>
</basic-container>
@@ -14,6 +17,7 @@
} from "@/api/systemModel/systemConfig/api"
import basicOption from '@/util/basic-option';
import func from "@/util/func";
+import {mapGetters} from "vuex";
export default {
name: "index",
data() {
@@ -55,6 +59,14 @@
}
}
},
+ computed:{
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ referBtn: this.vaildData(this.permission[this.$route.query.id].REFRESH, false),
+ };
+ },
+ },
created() {
this.getOnlinUsersHandler();
},
--
Gitblit v1.9.3