From fbbd60a85c9e9b2e6f34332fe7b72c262abfe380 Mon Sep 17 00:00:00 2001 From: wangting <wangting@vci-tech.com> Date: 星期二, 14 一月 2025 11:23:55 +0800 Subject: [PATCH] 调整查询模板显示以及bug --- Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue | 164 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 107 insertions(+), 57 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 7f0d303..af91b00 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,49 @@ <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> + <div> + <fieldset> + <legend> 鏌ヨ鏉′欢 </legend> + <form-query-dialog ref="formQuery" + style="height: 260px;" + :readOnly="true" + :queryCondition="queryCondition" + :queryTree="queryTree" + :levelFlag.sync="levelFlag" + ></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="getTemp"></upload-file> + @updata="uploadCallBack"></upload-file> </basic-container> </el-main> </el-container> @@ -43,14 +71,17 @@ <script> import {gridLink} from "@/api/modeling/linkType/api"; -import {getObjTypeQTs,deleteLinkTemplate,expLinkTemplate,impLinkTemplate} from "@/api/queryTemplate/linkTypeQuery"; +import {deleteLinkTemplate,expLinkTemplate,impLinkTemplate} from "@/api/queryTemplate/linkTypeQuery"; +import {getObjTypeQTs} from "@/api/queryTemplate/queryDefine"; import basicOption from "@/util/basic-option"; 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", - components: {FormDialog}, + components: {FormDialog,formQueryDialog}, data() { return { treeOption: { @@ -70,16 +101,6 @@ oid: 'topNode', children: [] }], - templateForm: '', - templateData: [], - form: { - name: '' - }, - rules: { - name: [ - {required: true, message: '璇疯緭鍏ユ煡璇㈡ā鏉垮悕绉�', trigger: 'blur'} - ] - }, title: '', visible: false, tableLoading: false, @@ -92,7 +113,7 @@ selection: true, menu: false, height: "auto", - calcHeight: -40, + calcHeight: 305, tip: false, header:false, column: [{ @@ -160,7 +181,24 @@ ], upFileType: ['vciqtf'], fileUrl: 'api/templateController/impLinkTemplate', + //楂樼骇鏌ヨ鏉′欢 + queryTree:{}, + //鏅�氭煡璇㈡潯浠� + queryCondition:[], + 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(); @@ -176,14 +214,24 @@ }); this.treeData[0].children = data; loading.close(); + }).catch(error=>{ + loading.close(); }) }, // 鏍戠偣鍑� 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() { @@ -191,12 +239,20 @@ this.crudData = res.data.data; this.tableLoading = false; this.selectionClear(); + + this.queryCondition=[]; + this.queryTree={}; + this.levelFlag=0; }) }, rowClick(row) { this.$refs.crud.toggleSelection(); this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛� this.selectionRow = [row]; + + this.queryCondition=row.queryTemplate.condition; + this.queryTree=row.tree; + this.levelFlag=row.levelFlag; }, selectionChange(list) { this.selectionRow = list; @@ -260,13 +316,33 @@ } let qtNames = this.selectionRow.map(item => item.qtName).join(','); - expLinkTemplate({qtNames: qtNames}).then(res => { + expLinkTemplate(qtNames).then(res => { func.downloadFileByBlobHandler(res); this.$message.success('瀵煎嚭鎴愬姛'); }) }, upLoadClickHandler(){ this.$refs.upload.visible = true; + }, + uploadCallBack(res){ + function getText(child){ + let text='' + if(child[0].children && child[0].children.length>0){ + text=getText(child[0].children) + }else{ + text=child[0].text ||child[0]; + } + return text + } + if(res.obj) { + if (res.obj.children) { + this.$message.info(getText(res.obj.children)); + } + } + if(res.data){ + this.crudData = res.data; + } + //this.getTemp(); } } } @@ -277,40 +353,14 @@ .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; - } +fieldset { + padding: 10px 6px; + margin: 10px 0 0 0; + border: 1px solid #EBEEF5; } - -.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; -} - </style> -- Gitblit v1.9.3