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/eventlogManage.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index d1f71e0..044e909 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -19,6 +19,7 @@
>
<el-input
style="width:200px"
+ size="small"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -29,10 +30,11 @@
>
<el-select
style="width:200px"
+ size="small"
:popper-append-to-body="false"
clearable
v-model="sizeForm.type"
- :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+ :placeholder="$t('operatManage.operationLogObj.operationTypeHolder')"
>
<el-option
:label="$t('operatManage.operationLogObj.check')"
@@ -65,12 +67,13 @@
: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"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.startTimeHolder')"
></el-date-picker>
</el-form-item>
<el-form-item
@@ -78,12 +81,13 @@
:label="$t('operatManage.operationLogObj.endTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
style="width:200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.endTimeHolder')"
>
</el-date-picker>
</el-form-item>
@@ -105,16 +109,17 @@
</el-form-item>
</div>
</div>
-
-
+
+
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box subpage_Div" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
align="center"
@@ -151,10 +156,7 @@
:label="$t('operatManage.ELM.operationType')"
/>
</el-table>
- <div
-
- class="pagination_box"
- >
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -212,7 +214,7 @@
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 + 30}px)`;
});
},
//鏍煎紡鍖栨椂闂�
@@ -320,23 +322,23 @@
.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;
}
-
+
}
.text-center {
--
Gitblit v1.9.3