From 699249fb4085261104d1756150f403305716b472 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 01 十一月 2024 17:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 81 +++++++++++-----------------------------
1 files changed, 23 insertions(+), 58 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index 48bc0df..f4a8835 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -2,30 +2,9 @@
<el-container v-loading="createViewLoading">
<el-aside>
<basic-container>
- <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
- <div class="headerCon">
- <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
- </el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼
- </el-button>
- <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎
- </el-button>
- <el-button icon="el-icon-view" plain size="small" type="primary">鏌ョ湅
- </el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆
- </el-button>
- <el-button class="smallBtn" icon="el-icon-circle-plus-outline" plain size="small"
- style="padding-left: 7px !important;"
- type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘
- </el-button>
- <el-button class="smallBtn" icon="el-icon-menu" plain size="small" style="padding-left: 1px"
- type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�
- </el-button>
- </div>
+ <div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
<!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 300px);">
+ <div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -41,7 +20,16 @@
<el-main>
<basic-container>
- <div style="height: 380px">
+ <div>
+ <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
+ <el-button icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘</el-button>
+ <el-button icon="el-icon-menu" plain size="small" type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�</el-button>
+ </div>
+ <div style="height: 380px;margin-top: 10px">
<el-descriptions :column="2" border class="margin-top" size="medium">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -159,8 +147,8 @@
</el-descriptions>
</div>
- <div style="margin-top: 30px">
- <h3>灞炴�ф睜鍒楄〃</h3>
+ <div style="margin-top: 30px;position: relative">
+ <h3 style="margin: 0;position: absolute;top:0;z-index: 1000;">灞炴�у垪琛�</h3>
<avue-crud
:data="tableData"
:option="tableOption"
@@ -179,7 +167,7 @@
width="70%"
@close="addDialogClose"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
<div class="dialogForm">
<div class="leftForm">
<el-form-item label="鍚嶇О锛�" prop="name">
@@ -300,7 +288,7 @@
</el-form>
<div class="bottomForm">
- <h3>灞炴�ф睜鍒楄〃</h3>
+ <h3 style="margin-bottom: 10px;">灞炴�ф睜鍒楄〃</h3>
<avue-crud
:data="dialogBottomData"
:option="dialogBottomOption"
@@ -313,8 +301,8 @@
</avue-crud>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
<el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button @click="addDialogClose">鍙� 娑�</el-button>
</span>
<!-- 灞炴�ф睜鍒楄〃 -->
@@ -343,8 +331,8 @@
>
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
<el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
+ <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
</span>
</el-dialog>
</el-dialog>
@@ -524,6 +512,7 @@
highlightCurrentRow: true,
height: 450,
searchMenuSpan: 8,
+ header:false,
column: [
{
label: '灞炴�у悕',
@@ -625,7 +614,7 @@
// index:false,
addBtn: false,
menu: false,
- calcHeight: -40,
+ calcHeight: -55,
column: [
{
label: '灞炴�у悕',
@@ -1166,36 +1155,12 @@
.el-form-item .el-select {
width: 100%;
}
-
- .headerCon {
- .el-button {
- width: 82px;
- }
+ .el-tag{
+ line-height:22px;
+ height: 24px;
}
}
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
.dialogForm {
display: flex;
justify-content: space-around;
--
Gitblit v1.10.0