From 6f547d926fff4ac05785444317026758a5ef21e0 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 25 二月 2023 17:29:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW
---
src/views/maintenance/downlog.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/maintenance/downlog.vue b/src/views/maintenance/downlog.vue
index 3a3743b..0bbda3d 100644
--- a/src/views/maintenance/downlog.vue
+++ b/src/views/maintenance/downlog.vue
@@ -22,6 +22,7 @@
>
<el-input
style="width: 200px"
+ size="small"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -32,9 +33,10 @@
>
<el-select
style="width: 200px"
+ size="small"
:popper-append-to-body="false"
v-model="sizeForm.type"
- :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+ :placeholder="$t('operatManage.operationLogObj.operationTypeHolder')"
>
<el-option
:label="$t('downlog.type1')"
@@ -67,13 +69,14 @@
:label="$t('operatManage.operationLogObj.startTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
style="width: 200px"
type="datetime"
:popper-class="popperclass"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.startTimeHolder')"
></el-date-picker>
</el-form-item>
<el-form-item
@@ -84,9 +87,10 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
+ size="small"
style="width: 200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.endTimeHolder')"
>
</el-date-picker>
</el-form-item>
@@ -110,6 +114,7 @@
</div>
</el-form>
</div>
+ <div class="dividing-line"></div>
<div
class="table_box subpage_Div"
:style="styleVar"
@@ -117,7 +122,7 @@
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
align="center"
@@ -161,7 +166,7 @@
/>
</el-table>
<div
- style="margin-top: 25px"
+ style="margin-top: 10px"
class="pagination_box"
>
<el-pagination
@@ -225,7 +230,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
formatSize(row, column) {
@@ -366,18 +372,17 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
-
+ padding: 0.5% 1%;
.el-input {
width: 300px;
}
.inquire {
- padding: 8px;
- margin-top: 20px;
+ padding: 0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
--
Gitblit v1.9.3