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/formDialog.vue |   10 ++++-
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue  |   29 ++++++++++----
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue      |   30 ++++++++++----
 3 files changed, 49 insertions(+), 20 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 70f3010..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
@@ -48,11 +48,6 @@
                     @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>&nbsp;鏌ヨ鏉′欢&nbsp;</legend>
@@ -65,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>
 
@@ -125,7 +125,7 @@
         selection: true,
         menu: false,
         height: "auto",
-        calcHeight: 300,
+        calcHeight: 305,
         tip: false,
         header:false,
         column: [{
@@ -197,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() {
@@ -319,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;
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index 06fff09..ea2e0b1 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -2,7 +2,7 @@
   <el-dialog v-dialogDrag
              :title="dialog.title"
              :visible.sync="dialog.showDialog"
-             width="1620px"
+             width="1650px"
              :append-to-body="true"
              class="avue-dialog"
              :destroy-on-close="true"
@@ -124,7 +124,7 @@
         prop: 'qtName',
         type: 'input',
         span:4.5,
-        labelWidth: 100,
+        labelWidth: 110,
         rules: [{
           required: true,
           message: "璇疯緭鍏ユ煡璇㈡ā鏉垮悕绉�",
@@ -149,6 +149,12 @@
         prop: 'btmType',
         type: 'select',
         labelWidth:110,
+        clearable:false,
+        rules: [{
+          required: true,
+          message: "璇烽�夋嫨涓氬姟绫诲瀷",
+          trigger: "blur"
+        }],
         dicData: []
       }, {
         label: '鐗堟湰鐗堟',
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 c8b8209..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
@@ -45,12 +45,8 @@
         <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>&nbsp;鏌ヨ鏉′欢&nbsp;</legend>
@@ -63,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>
@@ -112,7 +113,7 @@
         selection: true,
         menu: false,
         height: "auto",
-        calcHeight: 300,
+        calcHeight: 305,
         tip: false,
         header:false,
         column: [{
@@ -220,9 +221,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() {
@@ -344,6 +353,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 {

--
Gitblit v1.9.3