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/authority/ui/typeAction/index.vue | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) 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 7cd0fb4..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 @@ -2,14 +2,14 @@ <!--绫诲瀷Action--> <el-container> <el-aside> - <basic-container> + <basic-container v-loadng="treeLoading"> <div ref="TreeBox" style="height: calc(100vh - 154px);!important;"> <!-- 宸︿晶鏍� --> <div style="height: calc(100vh - 190px);"> <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"> <span slot-scope="{ node, data }" class="el-tree-node__label"> - <span style="font-size: 15px"> - <i class="el-icon-s-promotion"></i> + <span> + <icon-show :name="data.icon"></icon-show> {{ (node || {}).label }} </span> </span> @@ -32,8 +32,14 @@ @selection-change="selectChangeHandler" @row-click="rowClickHandler"> <template slot="menuLeft"> - <el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">娣诲姞</el-button> - <el-button 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> @@ -49,12 +55,14 @@ import {getTypeActionByType,savePLTypeAction,delPLTypeActions} from "@/api/authority/ui/typeAction" import func from "@/util/func"; import actionDialog from "@/views/modelingMenu/ui/Aciton/components/dialog" +import {mapGetters} from "vuex"; export default { name: "index", components:{actionDialog}, data() { return { + treeLoading:false, treeOption: { height: 'auto', defaultExpandAll: true, @@ -130,18 +138,27 @@ data: [], } }, + computed:{ + ...mapGetters(["permission"]), + permissionList() { + return { + addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false), + delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false), + }; + }, + }, created() { this.getTreeList(); }, methods: { //鏍戣〃鏌ヨ getTreeList() { - const loading = this.$loading({}); + this.treeLoading = true; getBizTree().then(res => { this.treeData = [res.data.obj]; - loading.close(); + this.treeLoading = false; }).catch(error => { - loading.close(); + this.treeLoading = false; }) }, // 鏍戠偣鍑� @@ -176,7 +193,7 @@ this.lastIndex = newIndex; }, () => { - this.selectList = []; + this.selectList = [row]; } ); }, -- Gitblit v1.9.3