From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 111 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 44 deletions(-)
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 048eb04..d6f2c2e 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
@@ -3,16 +3,15 @@
<el-aside>
<basic-container>
<div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
-
<!-- 宸︿晶鏍� -->
<div style="height: calc(100vh - 190px);">
<avue-tree ref="tree" v-loading="treeLoading" :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>
- {{ (node || {}).label }}
- </span>
- </span>
+ <span slot-scope="{ node, data }" class="el-tree-node__label">
+ <span>
+ <icon-show :name="data.icon"></icon-show>
+ {{ (node || {}).label }}
+ </span>
+ </span>
</avue-tree>
</div>
</div>
@@ -21,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;">
@@ -298,8 +319,8 @@
</avue-crud>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -329,8 +350,8 @@
>
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
- <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="dialogAttrClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -373,8 +394,8 @@
:table-loading="conCheckLoading">
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="repairClickHandler">淇� 澶�</el-button>
- <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="repairClickHandler">淇� 澶�</el-button>
+ <el-button size="small" @click="conCheckVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -438,8 +459,8 @@
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="indexClickAddHandler">淇� 瀛�</el-button>
- <el-button @click="indexDialogClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="indexClickAddHandler">淇� 瀛�</el-button>
+ <el-button size="small" @click="indexDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -837,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),
};
},
},
@@ -867,6 +888,7 @@
const data = res.data.data.map(item => {
this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
item.attributes.TreeName = item.attributes.id;
+ item.attributes.icon = item.attributes.imageName;
return item.attributes; // 杩斿洖澶勭悊鍚庣殑 attributes
});
this.treeData[0].children = data;
@@ -880,6 +902,7 @@
if (item.children && item.children.length > 0) {
item.attributes.children = item.children.map(child => {
child.attributes.TreeName = child.attributes.id;
+ child.attributes.icon = child.attributes.imageName;
this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
return child.attributes; // 鍙繑鍥炲瓙鑺傜偣鐨� attributes
});
@@ -1060,7 +1083,7 @@
this.attrLastIndex = newIndex;
},
() => {
- this.selectList = [];
+ this.dialogAttrSelectList = [row];
}
);
},
--
Gitblit v1.9.3