From 8e44ce5a0c75861e5fdca999e3dc5b6f61faa585 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 16 二月 2023 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/views/datamanage/versionManage.vue | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index b193eea..1e63074 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -5,12 +5,8 @@
`${$t('dataManage.versionManage')}`,
]"></My-bread>
<el-divider />
- <div class="verSionContent">
- <!-- <div class="verSion_leftTree">
- <ver-dir-tree></ver-dir-tree>
- </div> -->
- <div class="verSion_rightContent subpage_Div">
- <el-form
+ <div class="inquire subpage_Div">
+ <el-form
ref="ruleForm"
:model="ruleForm"
:inline="true"
@@ -20,7 +16,7 @@
:popper-append-to-body="false"
v-model="ruleForm.dirid"
placeholder="璇烽�夋嫨"
- style="width:300px"
+ style="width:200px"
>
<el-option
:value="ruleForm.dirid"
@@ -56,13 +52,7 @@
:placeholder="$t('common.pleaseInput')"
/>
</el-form-item>
- <el-form-item>
- <el-button
- @click="onSubmit('ruleForm')"
- icon="el-icon-search"
- size="small"
- class="primary"
- >{{ $t('common.iquery') }}</el-button>
+ <el-form-item style="float: right;">
<el-button
type="success"
v-if="btnStatus.insert"
@@ -71,6 +61,12 @@
size="small"
>{{ $t('common.append') }}</el-button>
<el-button
+ @click="onSubmit('ruleForm')"
+ icon="el-icon-search"
+ size="small"
+ class="primary"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
type="info"
@click="resetForm('ruleForm')"
icon="el-icon-delete"
@@ -78,12 +74,14 @@
>{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
- <el-divider class="eldivider" />
- <div style="height: 73%">
+ </div>
+ <div class="bottom">
+ <div class="rightTable subpage_Div">
+ <div class="table_box">
<el-table
:data="tableData"
style="width: 100%"
- height="99%"
+ height="95%"
>
<el-table-column
align="center"
@@ -156,8 +154,8 @@
</template>
</el-table-column>
</el-table>
+ </div>
<div
- style="margin-top: 20px; "
class="pagination_box"
>
<el-pagination
@@ -171,9 +169,8 @@
>
</el-pagination>
</div>
- </div>
</div>
- </div>
+ </div>
<el-dialog
:title="$t('dataManage.vmobj.editVersion')"
:visible.sync="dialogFormVisible"
@@ -750,4 +747,36 @@
}
}
}
+.inquire {
+ position: relative;
+
+ padding-bottom: 8px;
+
+ border-radius: 5px;
+ padding: 1%;
+ .el-form-item {
+ margin: 5px;
+ }
+ }
+ .bottom {
+ width: 100%;
+ margin-top: 1%;
+ height: 74%;
+ display: flex;
+ justify-content: space-between;
+
+ .rightTable {
+ width: 98%;
+ height: 92%;
+
+ border-radius: 5px;
+ padding: 1%;
+ .table_box {
+ width: 100%;
+ height: 93%;
+ margin: 0 auto;
+ overflow: auto;
+ }
+ }
+ }
</style>
--
Gitblit v1.9.3