From 2bea732496b4f5051233ed94e206160992351596 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 15 一月 2025 11:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue | 117 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 53 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
index 36166ce..b3519cc 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 200px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
@@ -21,21 +21,32 @@
<el-main>
<basic-container>
<div v-if="this.nodeRow && this.nodeRow.label">
- <el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</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 icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</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">
+ :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>
@@ -48,6 +59,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>
</el-container>
@@ -61,6 +77,7 @@
import FormDialog from "./formDialog.vue"
import func from "@/util/func";
import formQueryDialog from "@/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue";
+import {mapGetters} from "vuex";
export default {
name: "index",
@@ -96,7 +113,7 @@
selection: true,
menu: false,
height: "auto",
- calcHeight: 300,
+ calcHeight: 305,
tip: false,
header:false,
column: [{
@@ -124,7 +141,11 @@
prop: 'btmType',
width: 130,
formatter:function (row, value) {
- return row.queryTemplate.btmType;
+ if (row.queryTemplate.btmType == '*') {
+ return '鎵�鏈夌被鍨�'
+ } else {
+ return row.queryTemplate.btmType;
+ }
}
}, {
label: '鐗堟湰鐗堟',
@@ -147,7 +168,11 @@
prop: 'queryISLeaf',
width: 120,
formatter:function (row, value) {
- return row.queryTemplate.queryISLeaf
+ if(row.queryTemplate.queryISLeaf=='false' || row.queryTemplate.queryISLeaf==false){
+ return '鍚�'
+ }else{
+ return '鏄�'
+ }
}
}, {
label: '瀛愯妭鐐瑰眰娆℃暟',
@@ -171,6 +196,18 @@
levelFlag:0
}
},
+ 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),
+ 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),
+ };
+ },
+ },
created() {
this.getTreeList();
},
@@ -192,9 +229,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() {
@@ -316,47 +361,13 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
- .headerCon{
- .el-button{
- width: 82px;
- }
+ .el-main .avue-crud .avue-crud__body .el-card__body .el-form .el-table--small{
+ min-height: 300px;
}
}
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
-}
fieldset {
- border-radius: 5px;
- -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
padding: 10px 6px;
- box-sizing: border-box;
margin: 10px 0 0 0;
border: 1px solid #EBEEF5;
}
--
Gitblit v1.9.3