From f31d6505363fa191fb715976826369484c26cf16 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期二, 03 十二月 2024 12:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

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 c1411cc..4147ca2 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
@@ -46,8 +46,8 @@
             <legend>&nbsp;閾炬帴绫诲瀷鍊欓�夋潯浠�&nbsp;</legend>
             <div>
               鏌ヨ妯℃澘瀹氫箟
-              <avue-select @change="linkQueryDefineChange" class="el-input--small" v-model="linkQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="linkQueryDefineDic" style="width:240px"></avue-select>
-              <avue-tree style="height: 265px" :data="linkTreeData" :option="treeOption"  @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
+              <avue-select @change="linkQueryDefineChange" class="el-input--small" v-model="linkQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="linkQueryDefineDic" style="width:245px"></avue-select>
+              <avue-tree style="width:335px;height: 268px" :data="linkTreeData" :option="treeOption"  @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
               </avue-tree>
             </div>
           </fieldset>
@@ -70,8 +70,8 @@
             <legend>&nbsp;涓氬姟绫诲瀷鍊欓�夋潯浠�&nbsp;</legend>
             <div>
               鏌ヨ妯℃澘瀹氫箟
-              <avue-select @change="businessQueryDefineChange" class="el-input--small" v-model="businessQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="businessQueryDefineDic" style="width: 240px;"></avue-select>
-              <avue-tree style="height: 265px" :data="businessTreeData" :option="treeOption"  @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
+              <avue-select @change="businessQueryDefineChange" class="el-input--small" v-model="businessQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="businessQueryDefineDic" style="width: 245px;"></avue-select>
+              <avue-tree style="width:335px;height: 268px" :data="businessTreeData" :option="treeOption"  @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
               </avue-tree>
             </div>
           </fieldset>
@@ -79,7 +79,7 @@
       </el-container>
     </div>
     <div class="dialog-footer avue-dialog__footer">
-      <el-button type="primary" plain size="small" @click="submitDialog" >淇� 瀛�</el-button>
+      <el-button type="primary" size="small" @click="submitDialog" >淇� 瀛�</el-button>
       <el-button size="small" @click="cancelDialog">鍙� 娑�</el-button>
     </div>
   </el-dialog>
@@ -123,7 +123,8 @@
         label: '鏌ヨ妯℃澘鍚嶇О',
         prop: 'qtName',
         type: 'input',
-        span:5,
+        span:4.5,
+        labelWidth: 100,
         rules: [{
           required: true,
           message: "璇疯緭鍏ユ煡璇㈡ā鏉垮悕绉�",
@@ -134,8 +135,8 @@
         prop: 'direction',
         type: 'radio',
         value:'positive',
-        labelWidth:70,
-        span: 3,
+        labelWidth:80,
+        span: 3.5,
         dicData: [{
           label: '姝ｅ悜',
           value: 'positive'
@@ -153,7 +154,8 @@
         label: '鐗堟湰鐗堟',
         prop: 'version',
         type: 'select',
-        span:5,
+        span:4,
+        labelWidth:110,
         dicData: [{
           label: '褰撳墠鐗堟湰褰撳墠鐗堟',
           value: 1
@@ -172,7 +174,7 @@
         label: '鏌ヨ鏄惁鏈変笅绾�',
         prop: 'queryISLeaf',
         type: 'switch',
-        labelWidth:140,
+        labelWidth:150,
         dicData: [ {
           label: '鍚�',
           value: false
@@ -185,7 +187,7 @@
         label: '瀛愯妭鐐瑰眰娆℃暟',
         prop: 'level',
         type: 'number',
-        span:3,
+        labelWidth:130,
         value:1
       }],
       form:{
@@ -195,7 +197,7 @@
         queryTemplate:{}
       },
       //宸叉湁鎺掑簭鍒楄〃閰嶇疆
-      crudOption: {
+        crudOption: {
         ...basicOption,
         addBtn: false,
         editBtn: false,
@@ -622,11 +624,7 @@
 
 <style scoped>
 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: 0;
   border: 1px solid #EBEEF5;
 }

--
Gitblit v1.9.3