From bac758243189e7c21da1248c11591dab9d228f13 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 12 十一月 2021 16:37:12 +0800
Subject: [PATCH] 暂存
---
src/pages/syslog/views/operationLog.vue | 27 +++++++++++++
src/pages/syslog/views/systemLog.vue | 23 +++++++++++
src/pages/syslog/views/pollingLog.vue | 29 +++++++++++++-
src/pages/syslog/views/eventPushLog.vue | 23 +++++++++++
4 files changed, 96 insertions(+), 6 deletions(-)
diff --git a/src/pages/syslog/views/eventPushLog.vue b/src/pages/syslog/views/eventPushLog.vue
index 5dd8941..6cbeea0 100644
--- a/src/pages/syslog/views/eventPushLog.vue
+++ b/src/pages/syslog/views/eventPushLog.vue
@@ -23,14 +23,25 @@
v-model="fuzzySearch"
size="small"
class="input-with-select"
+ @keyup.enter.native="getOperationLog(1)"
>
<span
- class="icon iconfont"
+ class="icon iconfont icon_clear"
+ @click="clearSearch"
+ slot="append"
+ v-if="fuzzySearch"
+ >
+ 
+ </span>
+ <span
+ class="icon iconfont icon_search"
@click="getOperationLog(1)"
slot="append"
+ v-else
>

</span>
+
<!-- <el-button
slot="append"
icon="el-icon-search"
@@ -321,6 +332,10 @@
this.timeStart = this.getTimeStr(preDay);
this.timeEnd = this.getTimeStr(date);
},
+ clearSearch() {
+ this.fuzzySearch = "";
+ this.getOperationLog(1);
+ },
},
};
</script>
@@ -491,6 +506,12 @@
}
tr {
+ td:first-child {
+ border-radius: 4px 0 0 4px;
+ }
+ td:last-child {
+ border-radius: 0 4px 4px 0;
+ }
&.current-row td {
background-color: #4e94ff !important;
color: #fff;
diff --git a/src/pages/syslog/views/operationLog.vue b/src/pages/syslog/views/operationLog.vue
index 5c67956..d5d2dc2 100644
--- a/src/pages/syslog/views/operationLog.vue
+++ b/src/pages/syslog/views/operationLog.vue
@@ -23,14 +23,25 @@
v-model="fuzzySearch"
size="small"
class="input-with-select"
+ @keyup.enter.native="getOperationLog(1)"
>
<span
- class="icon iconfont"
+ class="icon iconfont icon_clear"
+ @click="clearSearch"
+ slot="append"
+ v-if="fuzzySearch"
+ >
+ 
+ </span>
+ <span
+ class="icon iconfont icon_search"
@click="getOperationLog(1)"
slot="append"
+ v-else
>

</span>
+
<!-- <el-button
slot="append"
icon="el-icon-search"
@@ -311,6 +322,10 @@
: new Date(new Date().setHours(0, 0, 0, 0));
this.timeStart = this.getTimeStr(preDay);
},
+ clearSearch() {
+ this.fuzzySearch = "";
+ this.getOperationLog(1);
+ },
},
};
</script>
@@ -376,6 +391,10 @@
height: 36px;
display: flex;
align-items: center;
+
+ .icon_clear:hover {
+ color: #4e94ff;
+ }
.input-with-select {
width: 100%;
@@ -462,6 +481,12 @@
display: none;
}
tr {
+ td:first-child {
+ border-radius: 4px 0 0 4px;
+ }
+ td:last-child {
+ border-radius: 0 4px 4px 0;
+ }
&.current-row td {
background-color: #4e94ff !important;
color: #fff;
diff --git a/src/pages/syslog/views/pollingLog.vue b/src/pages/syslog/views/pollingLog.vue
index 895c3cf..e8f92d5 100644
--- a/src/pages/syslog/views/pollingLog.vue
+++ b/src/pages/syslog/views/pollingLog.vue
@@ -16,21 +16,32 @@
<div class="search">
<el-input
placeholder="鎼滅储"
- v-model="procName"
+ v-model="fuzzySearch"
size="small"
class="input-with-select"
+ @keyup.enter.native="getOperationLog(1)"
>
<span
- class="icon iconfont"
+ class="icon iconfont icon_clear"
+ @click="clearSearch"
+ slot="append"
+ v-if="fuzzySearch"
+ >
+ 
+ </span>
+ <span
+ class="icon iconfont icon_search"
@click="getOperationLog(1)"
slot="append"
+ v-else
>

</span>
+
<!-- <el-button
slot="append"
icon="el-icon-search"
- @click="getScheduleLog"
+ @click="getOperationLog(1)"
></el-button> -->
</el-input>
</div>
@@ -290,6 +301,11 @@
},
handleSelectionChange() {},
handleClose() {},
+ getOperationLog() {},
+ clearSearch() {
+ this.fuzzySearch = "";
+ this.getOperationLog(1);
+ },
},
};
</script>
@@ -458,6 +474,13 @@
}
tr {
+ td:first-child {
+ border-radius: 4px 0 0 4px;
+ }
+ td:last-child {
+ border-radius: 0 4px 4px 0;
+ }
+
&.current-row td {
background-color: #4e94ff !important;
color: #fff;
diff --git a/src/pages/syslog/views/systemLog.vue b/src/pages/syslog/views/systemLog.vue
index 3c1abcd..5a52519 100644
--- a/src/pages/syslog/views/systemLog.vue
+++ b/src/pages/syslog/views/systemLog.vue
@@ -23,14 +23,25 @@
v-model="fuzzySearch"
size="small"
class="input-with-select"
+ @keyup.enter.native="getOperationLog(1)"
>
<span
- class="icon iconfont"
+ class="icon iconfont icon_clear"
+ @click="clearSearch"
+ slot="append"
+ v-if="fuzzySearch"
+ >
+ 
+ </span>
+ <span
+ class="icon iconfont icon_search"
@click="getOperationLog(1)"
slot="append"
+ v-else
>

</span>
+
<!-- <el-button
slot="append"
icon="el-icon-search"
@@ -272,6 +283,10 @@
this.timeStart = this.getTimeStr(preDay);
this.timeEnd = this.getTimeStr(date);
},
+ clearSearch() {
+ this.fuzzySearch = "";
+ this.getOperationLog(1);
+ },
},
};
</script>
@@ -424,6 +439,12 @@
}
tr {
+ td:first-child {
+ border-radius: 4px 0 0 4px;
+ }
+ td:last-child {
+ border-radius: 0 4px 4px 0;
+ }
&.current-row td {
background-color: #4e94ff !important;
color: #fff;
--
Gitblit v1.8.0