From a53ab71161c5a546c70fa22ec5530cc4b2c7a672 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 03 十二月 2024 17:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue |   84 ++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 47 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 2134676..c150e3e 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>
@@ -43,14 +55,16 @@
 
 <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";
 
 export default {
   name: "index",
-  components: {FormDialog},
+  components: {FormDialog,formQueryDialog},
   data() {
     return {
       treeOption: {
@@ -70,16 +84,6 @@
         oid: 'topNode',
         children: []
       }],
-      templateForm: '',
-      templateData: [],
-      form: {
-        name: ''
-      },
-      rules: {
-        name: [
-          {required: true, message: '璇疯緭鍏ユ煡璇㈡ā鏉垮悕绉�', trigger: 'blur'}
-        ]
-      },
       title: '',
       visible: false,
       tableLoading: false,
@@ -92,7 +96,7 @@
         selection: true,
         menu: false,
         height: "auto",
-        calcHeight: -40,
+        calcHeight: 300,
         tip: false,
         header:false,
         column: [{
@@ -160,6 +164,11 @@
       ],
       upFileType: ['vciqtf'],
       fileUrl: 'api/templateController/impLinkTemplate',
+      //楂樼骇鏌ヨ鏉′欢
+      queryTree:{},
+      //鏅�氭煡璇㈡潯浠�
+      queryCondition:[],
+      levelFlag:0
     }
   },
   created() {
@@ -176,6 +185,8 @@
         });
         this.treeData[0].children = data;
         loading.close();
+      }).catch(error=>{
+        loading.close();
       })
     },
 
@@ -191,12 +202,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,7 +279,7 @@
       }
 
       let qtNames = this.selectionRow.map(item => item.qtName).join(',');
-      expLinkTemplate({qtNames: qtNames}).then(res => {
+      expLinkTemplate(qtNames).then(res => {
         func.downloadFileByBlobHandler(res);
         this.$message.success('瀵煎嚭鎴愬姛');
       })
@@ -297,40 +316,11 @@
   .el-scrollbar__wrap {
     overflow: auto !important;
   }
-  .headerCon{
-    .el-button{
-      width: 82px;
-    }
-  }
 }
 
-.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