From 6c84a71cc8f3397e7f3c4f49208c38774a82531f Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 23 三月 2022 02:34:21 +0800
Subject: [PATCH] 日志管理查询按钮修复
---
src/pages/syslog/views/operationLog.vue | 14 +++----
src/pages/syslog/views/systemLog.vue | 11 ++---
src/pages/syslog/views/eventPushLog.vue | 49 +++++++++---------------
3 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/src/pages/syslog/views/eventPushLog.vue b/src/pages/syslog/views/eventPushLog.vue
index 4eb7083..3cdb001 100644
--- a/src/pages/syslog/views/eventPushLog.vue
+++ b/src/pages/syslog/views/eventPushLog.vue
@@ -44,10 +44,8 @@
<div class="bar">
<div class="name">鐘舵�侊細</div>
- <el-select v-model="level" placeholder="璇烽�夋嫨" size="small" @change="levelChange">
- <el-option label="鍏ㄩ儴" :value="''"> </el-option>
- <el-option v-for="(item, i) in levelOptions" :key="i" :label="item.proc_name" :value="item.proc_name">
- </el-option>
+ <el-select v-model="state" placeholder="璇烽�夋嫨" size="small" @change="stateChange">
+ <el-option v-for="(item, i) in stateOptions" :key="i" :label="item.label" :value="item.value"> </el-option>
</el-select>
</div>
</div>
@@ -138,20 +136,19 @@
tableData: [],
subTableData: [],
dateArr: ["浠婃棩", "杩戜笁澶�", "杩戜竷澶�", "杩戜竴涓湀", "杩戝叚涓湀"],
- levelOptions: [],
hostNameOptions: [],
- resultOptions: [
+ stateOptions: [
{
value: "",
label: "鍏ㄩ儴"
},
{
- value: "鎴愬姛",
- label: "鎴愬姛"
+ value: "瀹屾垚",
+ label: "瀹屾垚"
},
{
- value: "澶辫触",
- label: "澶辫触"
+ value: "杩涜涓�",
+ label: "杩涜涓�"
}
],
value: "",
@@ -160,7 +157,7 @@
activeDateChoise: 0,
hostName: "",
result: "",
- level: "",
+ state: "",
timeStart: "",
timeEnd: "",
fuzzySearch: "",
@@ -186,17 +183,8 @@
this.page = val
// this.getPushLog();
},
- levelChange(val) {
- // this.getPushLog(1);
- // this.hostName = "";
- // getOperations({
- // module: this.level,
- // }).then((res) => {
- // this.hostNameOptions = res.data;
- // });
- },
- clickFaults(row, column, cell, event) {
- this.showSubTable = true
+ stateChange(val) {
+ this.getPushLog(1)
},
choseRange(item, i) {
switch (item) {
@@ -218,7 +206,7 @@
default:
break
}
- // this.getPushLog(1);
+ this.getPushLog(1)
this.activeDateChoise = i
},
getPushLog(typ) {
@@ -230,7 +218,7 @@
timeEnd: this.timeEnd,
page: this.page,
pageSize: this.pageSize,
- state: this.level,
+ state: this.state,
function: this.hostName,
result: this.result,
fuzzySearch: this.fuzzySearch
@@ -242,16 +230,15 @@
getTimeStr(date) {
var month = pad0(date.getMonth() + 1) //鏈�
var day = pad0(date.getDate()) //鏃�
- var hour = pad0(date.getHours()) //鏃�
- var minute = pad0(date.getMinutes()) //鍒�
- var second = pad0(date.getSeconds()) //绉�
- return `${date.getFullYear()}-${month}-${day} ${hour}:${minute}:${second}`
+ return `${date.getFullYear()}-${month}-${day}`
},
getTimeRange(gap) {
var date = new Date() //褰撳墠鏃堕棿
- var preDay = new Date(new Date().getTime() - gap)
- this.timeStart = this.getTimeStr(preDay)
- this.timeEnd = this.getTimeStr(date)
+ // 璁＄畻鍑烘潵鐨勬椂闂翠細澶氫竴澶�, 涓轰簡涓嶄慨鏀逛笂杈圭殑浠ｇ爜, 璁＄畻鏃跺鍔犱竴澶�
+ // 淇鏃堕棿浠庤捣濮嬫棩鏈熺殑, 0鐐瑰紑濮嬪埌24鐐圭粨鏉�
+ var preDay = new Date(new Date().getTime() - gap + 24 * 60 * 60 * 1000)
+ this.timeStart = this.getTimeStr(preDay) + " 00:00:00"
+ this.timeEnd = this.getTimeStr(date) + " 23:59:59"
},
clearSearch() {
this.fuzzySearch = ""
diff --git a/src/pages/syslog/views/operationLog.vue b/src/pages/syslog/views/operationLog.vue
index a90ef46..639d73e 100644
--- a/src/pages/syslog/views/operationLog.vue
+++ b/src/pages/syslog/views/operationLog.vue
@@ -199,7 +199,7 @@
choseRange(item, i) {
switch (item) {
case "浠婃棩":
- this.getTimeRange()
+ this.getTimeRange(24 * 60 * 60 * 1000)
break
case "杩戜笁澶�":
this.getTimeRange(24 * 60 * 60 * 1000 * 3)
@@ -240,15 +240,13 @@
getTimeStr(date) {
var month = pad0(date.getMonth() + 1) //鏈�
var day = pad0(date.getDate()) //鏃�
- var hour = pad0(date.getHours()) //鏃�
- var minute = pad0(date.getMinutes()) //鍒�
- var second = pad0(date.getSeconds()) //绉�
- return `${date.getFullYear()}-${month}-${day} ${hour}:${minute}:${second}`
+ return `${date.getFullYear()}-${month}-${day}`
},
getTimeRange(gap) {
- var preDay
- preDay = gap ? new Date(new Date().getTime() - gap) : new Date(new Date().setHours(0, 0, 0, 0))
- this.timeStart = this.getTimeStr(preDay)
+ var date = new Date()
+ var preDay = new Date(new Date().getTime() - gap + 24 * 60 * 60 * 1000)
+ this.timeStart = this.getTimeStr(preDay) + " 00:00:00"
+ this.timeEnd = this.getTimeStr(date) + " 23:59:59"
},
clearSearch() {
this.fuzzySearch = ""
diff --git a/src/pages/syslog/views/systemLog.vue b/src/pages/syslog/views/systemLog.vue
index 6b4e746..fb9c3a5 100644
--- a/src/pages/syslog/views/systemLog.vue
+++ b/src/pages/syslog/views/systemLog.vue
@@ -244,16 +244,13 @@
getTimeStr(date) {
var month = pad0(date.getMonth() + 1) //鏈�
var day = pad0(date.getDate()) //鏃�
- var hour = pad0(date.getHours()) //鏃�
- var minute = pad0(date.getMinutes()) //鍒�
- var second = pad0(date.getSeconds()) //绉�
- return `${date.getFullYear()}-${month}-${day} ${hour}:${minute}:${second}`
+ return `${date.getFullYear()}-${month}-${day}`
},
getTimeRange(gap) {
var date = new Date() //褰撳墠鏃堕棿
- var preDay = new Date(new Date().getTime() - gap)
- this.timeStart = this.getTimeStr(preDay)
- this.timeEnd = this.getTimeStr(date)
+ var preDay = new Date(new Date().getTime() - gap + 24 * 60 * 60 * 1000)
+ this.timeStart = this.getTimeStr(preDay) + " 00:00:00"
+ this.timeEnd = this.getTimeStr(date) + " 23:59:59"
},
clearSearch() {
this.fuzzySearch = ""
--
Gitblit v1.8.0