From c5dfaf2d4f16988f7be7f9d65df04c0c0d96b6ce Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 16:35:33 +0800
Subject: [PATCH] 暂存

---
 src/pages/syslog/views/operationLog.vue |    4 +-
 src/pages/syslog/views/systemLog.vue    |   95 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/src/pages/syslog/views/operationLog.vue b/src/pages/syslog/views/operationLog.vue
index 8ba295e..f904cfb 100644
--- a/src/pages/syslog/views/operationLog.vue
+++ b/src/pages/syslog/views/operationLog.vue
@@ -392,13 +392,13 @@
     }
     .second {
       display: flex;
-      margin: 20px 0;
+      margin: 15px 0 20px 0;
       padding: 0 20px;
       .bar {
         display: flex;
         align-items: baseline;
         width: fit-content;
-        margin-right: 20px;
+        margin-right: 30px;
         min-width: 120px;
 
         .el-select {
diff --git a/src/pages/syslog/views/systemLog.vue b/src/pages/syslog/views/systemLog.vue
index 5fca5fc..4bd479f 100644
--- a/src/pages/syslog/views/systemLog.vue
+++ b/src/pages/syslog/views/systemLog.vue
@@ -24,11 +24,18 @@
             size="small"
             class="input-with-select"
           >
-            <el-button
+            <span
+              class="icon iconfont"
+              @click="getOperationLog(1)"
+              slot="append"
+            >
+              &#xe714;
+            </span>
+            <!-- <el-button
               slot="append"
               icon="el-icon-search"
               @click="getOperationLog(1)"
-            ></el-button>
+            ></el-button> -->
           </el-input>
         </div>
       </div>
@@ -272,14 +279,15 @@
   flex-direction: column;
   overflow: auto;
   .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;
@@ -287,51 +295,106 @@
         .title {
           margin-right: 10px;
           min-width: fit-content;
-          font-size: 14px;
+          font-weight: bold;
+          font-size: 12px;
         }
         .opts {
           display: flex;
           justify-content: space-between;
           .opt {
+            box-sizing: border-box;
+            border: 2px solid #efeff6;
             min-width: fit-content;
-            width: 50px;
-            height: 32px;
+            width: 100px;
+            height: 36px;
             padding: 0 15px;
             border-radius: 4px;
             cursor: pointer;
-            margin-right: 10px;
+            margin-right: 2px;
             line-height: 32px;
-            font-size: 14px;
+            font-size: 12px;
+            color: #333;
           }
           .opt:hover {
-            background-color: rgba(61, 104, 225, 1);
-            color: #fff;
+            border-color: #4e94ff;
           }
           .opt-active {
             color: #fff;
-            background-color: rgba(61, 104, 225, 1);
+            background-color: #4e94ff;
+            border-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 + .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;
       .bar {
         display: flex;
         align-items: baseline;
         width: fit-content;
-        margin-right: 20px;
+        margin-right: 30px;
         min-width: 120px;
+
+        .el-select {
+          width: 200px;
+          height: 36px;
+
+          .el-input {
+            width: 100%;
+            height: 100%;
+
+            input {
+              width: 100%;
+              height: 100%;
+              border: 2px solid #f2f2f7;
+              border-radius: 20px;
+            }
+          }
+        }
         .name {
-          margin-right: 5px;
+          margin-right: 15px;
           min-width: fit-content;
-          font-size: 14px;
+          font-weight: bold;
+          font-size: 12px;
         }
       }
     }

--
Gitblit v1.8.0