From 949aa9e6974a1571d05279ec0c7a934cf5c6ea3f Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 15 一月 2025 16:52:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
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 c2d4177..ab0a66b 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,13 +17,19 @@
</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">
<el-tab-pane v-for="item in iconList" :label="item.lable" :name="item.lable" style="height: calc(100vh - 270px);overflow: auto ">
- <div class="iconList">
+ <div class="iconList" :key="key">
<div class="iconItem" v-for="svg in item.list"
:data-value="svg.name" v-right-click="{action:checkSvg,data:svg}">
<div class="svgContent" v-html="svg.content"></div>
@@ -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",
@@ -103,6 +110,7 @@
},
data() {
return {
+ key:1,
types: [],
checkedTypes:[],
searchText:'',
@@ -215,6 +223,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){
@@ -250,6 +265,7 @@
if (this.iconList.length > 0) {
this.activeName = this.iconList[0].lable;
}
+ this.key++;
} else {
this.$message.error(res.data.msg);
}
@@ -473,7 +489,14 @@
}
</script>
-<style scoped>
+<style scoped lang="scss">
+::v-deep{
+ svg{
+ font-size: inherit;
+ height: 100%;
+ width:100%;
+ }
+}
.tag-group{font-size: 14px;}
.el-tag{
margin: 0 0 10px 10px;
@@ -490,7 +513,10 @@
text-align: center;
}
.iconList .iconItem .svgContent{
- font-size: 26px;
+ font-size: 24px;
+ width: 24px;
+ height: 24px;
+ margin: 0 auto;
}
.iconList .iconItem .svgContent:hover{
transform: scale(1.5);
--
Gitblit v1.9.3