From 9e8e7fa9a379eb5a633ad1087211bd5dd38d014a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 10 十一月 2021 17:45:51 +0800
Subject: [PATCH] 暂存
---
src/pages/syslog/views/operationLog.vue | 22 +++++++++--
src/pages/syslog/views/systemLog.vue | 9 ++--
src/pages/syslog/views/pollingLog.vue | 69 +++++++++++++++++++++++++++-------
src/pages/syslog/views/eventPushLog.vue | 9 ++--
4 files changed, 83 insertions(+), 26 deletions(-)
diff --git a/src/pages/syslog/views/eventPushLog.vue b/src/pages/syslog/views/eventPushLog.vue
index b17cb4b..7125ace 100644
--- a/src/pages/syslog/views/eventPushLog.vue
+++ b/src/pages/syslog/views/eventPushLog.vue
@@ -387,13 +387,14 @@
border: 2px solid #f2f2f7;
border-right: none;
- // &:focus + .el-input-group__append {
- // border-color: #409eff;
- // }
+ &:focus,
+ &:focus + .el-input-group__append {
+ border-color: #409eff;
+ }
}
.el-input-group__append {
- // transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+ transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
background-color: #fff;
border: 2px solid #f2f2f7;
border-radius: 0 18px 18px 0;
diff --git a/src/pages/syslog/views/operationLog.vue b/src/pages/syslog/views/operationLog.vue
index f904cfb..a7425ec 100644
--- a/src/pages/syslog/views/operationLog.vue
+++ b/src/pages/syslog/views/operationLog.vue
@@ -172,6 +172,7 @@
import { queryOperationLog, getOperations, getModules } from "@/api/log";
export default {
+ name: "operationLog",
data() {
return {
loading: false,
@@ -233,7 +234,19 @@
},
getOptions() {
getModules().then((res) => {
+ const indexArr = [];
+ res.data.forEach((item, index) => {
+ if (item.proc_name == "") {
+ indexArr.push(index);
+ }
+ });
+ if (indexArr.length != 0) {
+ indexArr.forEach((i) => {
+ res.data.splice(i);
+ });
+ }
this.moduleOptions = res.data;
+ console.log(this.moduleOptions);
});
},
choseRange(item, i) {
@@ -368,13 +381,14 @@
border: 2px solid #f2f2f7;
border-right: none;
- // &:focus + .el-input-group__append {
- // border-color: #409eff;
- // }
+ &:focus,
+ &:focus + .el-input-group__append {
+ border-color: #409eff;
+ }
}
.el-input-group__append {
- // transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+ transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
background-color: #fff;
border: 2px solid #f2f2f7;
border-radius: 0 18px 18px 0;
diff --git a/src/pages/syslog/views/pollingLog.vue b/src/pages/syslog/views/pollingLog.vue
index a6773e1..db7f82b 100644
--- a/src/pages/syslog/views/pollingLog.vue
+++ b/src/pages/syslog/views/pollingLog.vue
@@ -11,7 +11,7 @@
<div class="opts">
<div class="opt" @click="openDialog">閫夋嫨鎽勫儚鏈�</div>
</div>
- <div class="pick-num">宸查�� : {{ pickNum }}</div>
+ <div class="pick-num">宸查�� : ( {{ pickNum }} )</div>
</div>
<div class="search">
<el-input
@@ -294,14 +294,15 @@
}
}
.top {
- height: 100px;
+ height: 132px;
background: #fff;
border-radius: 5px;
.first {
display: flex;
justify-content: space-between;
+ align-items: center;
height: 45px;
- padding: 0 20px;
+ padding: 20px 20px 0 20px;
.time-option {
display: flex;
justify-content: space-between;
@@ -309,44 +310,84 @@
.title,
.pick-num {
margin-right: 10px;
- font-size: 14px;
min-width: fit-content;
+ font-weight: bold;
+ font-size: 12px;
}
+
.opts {
display: flex;
justify-content: space-between;
.opt {
- width: 70px;
- height: 32px;
+ width: 100px;
+ height: 36px;
padding: 0 15px;
border-radius: 4px;
cursor: pointer;
margin-right: 20px;
- line-height: 32px;
- font-size: 14px;
+ line-height: 36px;
+ font-size: 12px;
+ font-weight: 700;
color: #fff;
- background-color: rgba(61, 104, 225, 1);
+ background-color: #4e94ff;
}
}
}
.search {
+ width: 280px;
+ height: 36px;
display: flex;
align-items: center;
+
+ .input-with-select {
+ width: 100%;
+ height: 100%;
+
+ input {
+ height: 100%;
+ border-radius: 18px 0 0 18px;
+ border: 2px solid #f2f2f7;
+ border-right: none;
+
+ &:focus,
+ &:focus + .el-input-group__append {
+ border-color: #409eff;
+ }
+ }
+
+ .el-input-group__append {
+ transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+ background-color: #fff;
+ border: 2px solid #f2f2f7;
+ border-radius: 0 18px 18px 0;
+ border-left: none;
+ }
+ }
+
+ span {
+ cursor: pointer;
+ color: rgb(47, 45, 61);
+ font-weight: 700;
+ font-size: 19px;
+ }
}
}
.second {
display: flex;
- margin: 10px 0;
+ margin: 15px 0 20px 0;
padding: 0 20px;
- align-items: center;
- font-size: 14px;
.bar {
display: flex;
align-items: baseline;
width: fit-content;
- padding-left: 20px;
+ margin-right: 30px;
+ min-width: 120px;
+
.name {
- margin-right: 5px;
+ margin-right: 15px;
+ min-width: fit-content;
+ font-weight: bold;
+ font-size: 12px;
}
}
}
diff --git a/src/pages/syslog/views/systemLog.vue b/src/pages/syslog/views/systemLog.vue
index 4bd479f..364d658 100644
--- a/src/pages/syslog/views/systemLog.vue
+++ b/src/pages/syslog/views/systemLog.vue
@@ -341,13 +341,14 @@
border: 2px solid #f2f2f7;
border-right: none;
- // &:focus + .el-input-group__append {
- // border-color: #409eff;
- // }
+ &:focus,
+ &:focus + .el-input-group__append {
+ border-color: #409eff;
+ }
}
.el-input-group__append {
- // transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+ transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
background-color: #fff;
border: 2px solid #f2f2f7;
border-radius: 0 18px 18px 0;
--
Gitblit v1.8.0