From 88c5cf35a5ea870378d7964086ed2c09ddc299c8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 九月 2024 17:52:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 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 a5d706a..b8cc2f9 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
@@ -36,6 +36,18 @@
         <!--瀵煎叆    -->
         <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
                      @updata="uploadCallBack"></upload-file>
+        <div>
+          <fieldset>
+            <legend>&nbsp;鏌ヨ鏉′欢&nbsp;</legend>
+            <form-query-dialog ref="formQuery"
+                               style="height: 260px;"
+                               :readOnly="true"
+                               :queryCondition="queryCondition"
+                               :queryTree="queryTree"
+                               :levelFlag.sync="levelFlag"
+            ></form-query-dialog>
+          </fieldset>
+        </div>
       </basic-container>
     </el-main>
   </el-container>
@@ -48,10 +60,11 @@
 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";
 
 export default {
   name: "index",
-  components: {FormDialog},
+  components: {FormDialog,formQueryDialog},
   data() {
     return {
       treeOption: {
@@ -83,7 +96,7 @@
         selection: true,
         menu: false,
         height: "auto",
-        calcHeight: -40,
+        calcHeight: 300,
         tip: false,
         header:false,
         column: [{
@@ -151,6 +164,11 @@
       ],
       upFileType: ['vciqtf'],
       fileUrl: 'api/templateController/impLinkTemplate',
+      //楂樼骇鏌ヨ鏉′欢
+      queryTree:{},
+      //鏅�氭煡璇㈡潯浠�
+      queryCondition:[],
+      levelFlag:0
     }
   },
   created() {
@@ -182,12 +200,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;
@@ -323,5 +349,13 @@
   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;
+}
 </style>

--
Gitblit v1.9.3