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/queryTemplate/businessTypeQuery/index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
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..bdcce3f 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
@@ -9,7 +9,7 @@
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span>
- <i class="el-icon-s-promotion"></i>
+ <icon-show :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
@@ -22,22 +22,32 @@
<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"
@row-click="rowClick"
:data="crudData" :option="crudOption" :table-loading="tableLoading" style="margin-top: 10px">
</avue-crud>
- <form-dialog ref="formRef" @refresh="getTemp"></form-dialog>
- <!--瀵煎叆 -->
- <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
- @updata="uploadCallBack"></upload-file>
-
<div>
<fieldset>
<legend> 鏌ヨ鏉′欢 </legend>
@@ -50,6 +60,11 @@
></form-query-dialog>
</fieldset>
</div>
+ <!--娣诲姞 淇敼寮圭獥-->
+ <form-dialog ref="formRef" @refresh="getTemp"></form-dialog>
+ <!--瀵煎叆 -->
+ <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
+ @updata="uploadCallBack"></upload-file>
</basic-container>
</el-main>
@@ -110,7 +125,7 @@
selection: true,
menu: false,
height: "auto",
- calcHeight: 300,
+ calcHeight: 305,
tip: false,
header:false,
column: [{
@@ -160,6 +175,7 @@
const data = res.data.data.map(item => {
this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
item.attributes.label = item.attributes.id;
+ item.attributes.icon = item.attributes.imageName;
return item.attributes;
});
this.treeData[0].children = data;
@@ -173,6 +189,7 @@
if (item.children && item.children.length > 0) {
item.attributes.children = item.children.map(child => {
child.attributes.label = child.attributes.id;
+ child.attributes.icon = child.attributes.imageName;
this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
return child.attributes; // 鍙繑鍥炲瓙鑺傜偣鐨� attributes
});
@@ -180,9 +197,17 @@
},
// 鏍戠偣鍑�
nodeClick(row) {
- this.nodeRow = row;
- this.tableLoading = true;
- this.getTemp();
+ if(row.oid=="topNode"){
+ this.nodeRow = null;
+ this.crudData=[];
+ this.queryCondition=[];
+ this.queryTree={};
+ this.levelFlag=0;
+ }else{
+ this.nodeRow = row;
+ this.tableLoading = true;
+ this.getTemp();
+ }
},
//妯℃澘鍒楄〃鏁版嵁
getTemp() {
@@ -302,6 +327,9 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
+ .el-main .avue-crud .avue-crud__body .el-card__body .el-form .el-table--small{
+ min-height: 300px;
+ }
}
fieldset {
padding: 10px 6px;
--
Gitblit v1.9.3