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/styleManage.vue | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index d886d54..b4c1f9a 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -5,7 +5,7 @@
`${$t('dataManage.styleManage')}`,
]"></My-bread>
<el-divider />
- <div class="searchComp subpage_Div">
+ <div class="searchComp subpage_Div" style="padding: 1%;">
<el-form
ref="ruleForm"
:model="ruleForm"
@@ -18,21 +18,10 @@
<el-input
v-model="ruleForm.name"
:placeholder="$t('common.pleaseInput')"
+ style="width:200px"
/>
</el-form-item>
- <el-form-item>
- <el-button
- @click="submitForm('ruleForm')"
- icon="el-icon-search"
- type="primary"
- size="small"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- @click="resetForm('ruleForm')"
- icon="el-icon-refresh"
- type="info"
- size="small"
- >{{ $t('common.empty') }}</el-button>
+ <el-form-item style="float: right;">
<el-button
v-if="btnStatus.insert"
@click="setInsertShow()"
@@ -47,16 +36,28 @@
type="danger"
size="small"
>{{ $t('common.delete') }}</el-button>
+ <el-button
+ @click="submitForm('ruleForm')"
+ icon="el-icon-search"
+ type="primary"
+ size="small"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ @click="resetForm('ruleForm')"
+ icon="el-icon-refresh"
+ type="info"
+ size="small"
+ >{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="bottom">
- <div class="rightTable">
+ <div class="rightTable subpage_Div">
<div class="table_box">
<el-table
:data="tableData"
style="width: 100%"
- height="100%"
+ height="95%"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -142,7 +143,6 @@
</el-table>
</div>
<div
- style="margin-top: 20px; margin-left: 400px"
class="pagination_box"
>
<el-pagination
@@ -1661,13 +1661,20 @@
}
.bottom {
width: 100%;
- height: 85%;
+ margin-top: 1%;
+ height: 74%;
+ display: flex;
+ justify-content: space-between;
+
.rightTable {
- height: 100%;
- width: 100%;
+ width: 98%;
+ height: 92%;
+
+ border-radius: 5px;
+ padding: 1%;
.table_box {
width: 100%;
- height: 80%;
+ height: 93%;
margin: 0 auto;
overflow: auto;
}
--
Gitblit v1.9.3