From 8f6576fd595f67a3b17ef2e5e8054e8f194078f7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 05 九月 2024 20:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 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 3fbb71a..06a359e 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
@@ -2,9 +2,9 @@
   <el-container>
     <el-aside>
       <basic-container>
-        <div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
+        <div ref="TreeBox" style="height: calc(100vh - 164px);!important;">
           <!-- 宸︿晶鏍�         -->
-          <div style="height:  calc(100vh - 190px);">
+          <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">
@@ -35,16 +35,12 @@
         <form-dialog ref="formRef" @refresh="getTemp"></form-dialog>
       </basic-container>
     </el-main>
-    <div style="width: 300px;">111</div>
   </el-container>
 </template>
 
 <script>
 import {gridLink} from "@/api/modeling/linkType/api";
-import { gridTemplate, saveTemplate, updateTemplate} from "@/api/queryTemplate/queryDefine";
 import {getObjTypeQTs,deleteLinkTemplate} from "@/api/queryTemplate/linkTypeQuery";
-import func from "@/util/func";
-import {dateFormat} from "@/util/date";
 import basicOption from "@/util/basic-option";
 import FormDialog from "./formDialog.vue"
 
@@ -107,6 +103,7 @@
         }, {
           label: '鏂瑰悜',
           prop: 'direction',
+          width:80,
           formatter:function (row, value) {
             if (row.queryTemplate.direction == 'positive') {
               return '姝ｅ悜'
@@ -117,8 +114,39 @@
         }, {
           label: '涓氬姟绫诲瀷',
           prop: 'btmType',
+          width: 130,
           formatter:function (row, value) {
             return row.queryTemplate.btmType;
+          }
+        }, {
+          label: '鐗堟湰鐗堟',
+          prop: 'version',
+          formatter:function (row, value) {
+            if(row.queryTemplate.version==1){
+              return '褰撳墠鐗堟湰褰撳墠鐗堟'
+            }else  if(row.queryTemplate.version==2){
+              return '褰撳墠鐗堟湰鏈�鏂扮増娆�'
+            }else if(row.queryTemplate.version==3){
+              return '鏈�鏂扮増鏈渶鏂扮増娆�'
+            }else if(row.queryTemplate.version==7){
+              return '宸插彂甯冪殑鏈�鏂扮増鏈�'
+            }else {
+              return ''
+            }
+          }
+        }, {
+          label: '鏌ヨ鏄惁鏈変笅绾�',
+          prop: 'queryISLeaf',
+          width: 120,
+          formatter:function (row, value) {
+            return row.queryTemplate.queryISLeaf
+          }
+        }, {
+          label: '瀛愯妭鐐瑰眰娆℃暟',
+          prop: 'level',
+          width: 100,
+          formatter:function (row, value) {
+            return row.queryTemplate.level;
           }
         }]
       },
@@ -171,6 +199,10 @@
     //鍒涘缓
     addHandler() {
       this.$refs.formRef.openDialog(this.nodeRow.label,'鍒涘缓','add',{treeData:this.nodeRow});
+      this.$nextTick(()=>{
+        this.$refs.formRef.formItems[0].disabled = false;
+        this.$refs.formRef.$refs.form.getInit(this.$refs.formRef.formItems)
+      });
     },
     //淇敼
     editHandler() {
@@ -179,6 +211,10 @@
         return;
       }
       this.$refs.formRef.openDialog(this.nodeRow.label,'淇敼','edit',{treeData:this.nodeRow,selectData:this.selectionRow[0]});
+      this.$nextTick(()=>{
+        this.$refs.formRef.formItems[0].disabled = true;
+        this.$refs.formRef.$refs.form.getInit(this.$refs.formRef.formItems)
+      });
     },
     //鍒犻櫎
     delHandler() {
@@ -194,9 +230,10 @@
         let names=this.selectionRow.map(item=>{
           return item.qtName
         })
-        deleteLinkTemplate(names).then(res => {
+        deleteLinkTemplate({names:names.join(',')}).then(res => {
           if (res.data.code === 200) {
             this.$message.success(res.data.obj);
+            this.getTemp();
           }
         })
       }).catch(() => {

--
Gitblit v1.9.3