From a478c891e85bc356a8de450a79954b835f0a5500 Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Sat, 6 Nov 2021 04:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9Alogo=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue   |  5 +++--
 src/layouts/navbar/index.vue   |  2 +-
 src/pages/data/list/index.vue  | 20 ++++++++------------
 src/pages/index/list/index.vue |  6 +++---
 src/pages/role/list/index.vue  |  2 +-
 src/pages/user/list/index.vue  |  2 +-
 src/styles/common.scss         | 17 +++++++++++++----
 7 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 149c093..267b470 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,7 +1,8 @@
 <template>
     <div class="header">
         <a class="logo" @click="toIndex">
-            <span v-if="token && isManager && !showSetting">{{schoolName}}</span>
+            <!-- <span v-if="token && isManager && !showSetting">{{schoolName}}</span> -->
+            <img src="@/assets/img/logo.png" alt="">
         </a>
         <div class="inner">
             <div style="height: 64px;"></div>
@@ -240,7 +241,7 @@ export default {
         .logo{
             position: absolute;
             top: 0;
-            left: 30px;
+            left: 80px;
             font-size: 28px;
             color: #568DF2;
             line-height: $height;
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index b9053f5..9e96592 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -112,7 +112,7 @@ export default {
     .nav{
         position: absolute;
         top: 0;
-        left: 250px;
+        left: 280px;
         display: flex;
         li{
             padding: 0 15px;
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index a479419..cd7158a 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -106,18 +106,18 @@
                       <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                       <el-table-column prop="showName" label="数据表名称" align="center"></el-table-column>
                       <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
-                      <el-table-column label="起止时间" width="190" align="center">
+                      <el-table-column label="起止时间" width="220" align="center">
                           <template slot-scope="scope">
-                              {{scope.row.startTime}}-{{scope.row.endTime}}
+                              {{scope.row.startTime.slice(0, 10)}} ~ {{scope.row.endTime.slice(0, 10)}}
                           </template>
                       </el-table-column>
-                      <el-table-column prop="dataSize" label="数据大小" width="110" align="center">
+                      <el-table-column prop="dataSize" label="数据大小" width="90" align="center">
                           <template slot-scope="scope">
                               {{scope.row.dataSize}}M
                           </template>
                       </el-table-column>
                       <el-table-column prop="updateTime" label="更新时间" width="170" align="center"></el-table-column>
-                      <el-table-column label="操作" width="120" align="center">
+                      <el-table-column label="操作" width="140">
                           <template slot-scope="scope">
                               <el-button type="text" @click="preview(scope.row)">预览</el-button>
                               <el-button type="text" @click="download(scope.row)">下载</el-button>
@@ -570,10 +570,6 @@ export default {
             max-width: calc(100% - 220px);
             .page{
                 margin-bottom: 20px;
-                .desc{
-                    margin-bottom: 20px;
-                    color: #333;
-                }
                 .source {
                     margin-bottom: 12px;
                     color: #7EB1F3;
@@ -582,7 +578,7 @@ export default {
         }
         .desc{
             padding: 9px 12px;
-            margin: 30px 0 10px;
+            margin: 20px 0 10px;
             font-size: 12px;
             color: #333;
             background-color: #FAFAFA;
@@ -596,8 +592,8 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        width: 300px;
-        height: 50px;
+        width: 345px;
+        height: 34px;
         padding: 7px 10px;
         margin: 0 auto;
         background-color: #fff;
@@ -605,7 +601,7 @@ export default {
         border-radius: 5px;
 
         input{
-            width: 195px;
+            width: 260px;
             margin-left: 10px;
             font-size: 14px;
             color: #333;
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index a3545d0..03b0711 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="wrap" :class="{index: !keyword}">
+    <div class="wrap" :class="{index: !keyword, result: keyword}">
         <div class="banner">
             <div class="title" v-if="!keyword">准确，多元，海量数据</div>
             <div class="search-wrap">
@@ -36,7 +36,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="createTime" label="更新时间" align="center"></el-table-column>
-                <el-table-column label="操作" width="180" align="center">
+                <el-table-column label="操作" width="180">
                     <template slot-scope="scope">
                         <el-button type="text" @click="preview(scope.row)">预览</el-button>
                         <el-button type="text" @click="download(scope.row)">下载</el-button>
@@ -350,7 +350,7 @@ export default {
                 }
             }
         }
-        &.pd{
+        &.result{
             .banner{
                 padding: 46px 0;
             }
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index a290c3e..988aa14 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -27,7 +27,7 @@
                             <el-input disabled placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark "></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" width="180" align="center">
+                    <el-table-column label="操作" width="180">
                         <template slot-scope="scope">
                             <el-button type="text" @click="showRole(scope.row)" v-auth>查看</el-button>
                             <template v-if="scope.row.roleName != '超级管理员'">
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index ceed4e1..a5f915f 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -66,7 +66,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="lastLoginTime" label="上次登录时间" width="160" align="center"></el-table-column>
-                    <el-table-column label="操作" align="center" width="260">
+                    <el-table-column label="操作" align="center">
                         <template slot-scope="scope">
                             <el-button type="text" @click="show(scope.row)" v-auth>查看</el-button>
                             <el-button type="text" @click="edit(scope.row)" v-auth>编辑</el-button>
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 1657413..16724f4 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -177,13 +177,13 @@
 .el-table{
     border-radius: 4px;
     .cell{
-        font-size: 14px;
+        font-size: 12px;
         .el-checkbox{
             &:before{
                 content: '全选';
                 margin-right: 5px;
                 color: #222326;
-                font-size: 14px;
+                font-size: 12px;
                 opacity: 0;
             }
         }
@@ -192,7 +192,7 @@
         background: #E8F0FF !important;
         .cell{
             color: #222326;
-            font-size: 14px;
+            font-size: 12px;
             font-weight: normal;
             .el-checkbox{
                 &:before{
@@ -201,7 +201,13 @@
             }
         }
     }
-    
+    th, td{
+        padding: 10px 0;
+        border-bottom-color: #E1E6F2;
+    }
+    &.el-table--striped .el-table__body tr.el-table__row--striped td{
+        background-color: #FAFBFF;
+    }
     .el-checkbox__inner{
         border-radius: 4px;
         transition: none !important;
@@ -227,6 +233,9 @@
     .el-switch__label--right span{
         font-size: 12px;
     }
+    .el-button--text{
+        padding: 0;
+    }
 }
 
 .tabs{