web端界面优化

public/index.html

@@ -5,8 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.png">
-   
+    <link rel="icon" href="<%= BASE_URL %>header.ico">
+
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

src/assets/styles/ruoyi.scss

@@ -81,7 +81,7 @@
 }
 
 .el-table {
-	
+
 	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
 		th {
 			word-break: break-word;

src/layout/components/Navbar.vue

@@ -126,7 +126,8 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 51px;
+  height: 76px;
+  line-height: 71px;
   overflow: hidden;
   position: relative;
   background-color: #005bac !important;  /* 修改导航栏背景色*/
@@ -154,9 +155,11 @@ export default {
   }
   .title-box{
     margin: 0;
-    font-size: 21px;
+    font-size: 26px;
+    letter-spacing: 5px;
     width: 360px;
-    height: 50px;
+    height: 71px;
+    font-family: Microsoft YaHei;
     color: #fff;
     //padding-left:12px;
     display: inline-grid;
@@ -170,7 +173,7 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
+    line-height: 71px;
 
     &:focus {
       outline: none;
@@ -180,7 +183,7 @@ export default {
       display: inline-block;
       padding: 0 8px;
       height: 100%;
-      font-size: 18px;
+      font-size: 20px;
       color: #5a5e66;
       vertical-align: text-bottom;
 
@@ -194,7 +197,7 @@ export default {
       }
     }
     .user-name-box{
-      font-size: 14px;
+      font-size: 16px;
       color: #fff;
       align-items: center;
       >span{
@@ -203,7 +206,7 @@ export default {
     }
     .avatar-container {
       margin-right: 30px;
-
+      font-size: 16px;
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
@@ -220,7 +223,6 @@ export default {
           position: absolute;
           right: -20px;
           top: 13px;
-          font-size: 12px;
           color: #fff;
         }
       }

src/layout/components/Sidebar/Logo.vue

@@ -56,8 +56,8 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
-  line-height: 50px;
+  height: 74px;
+  line-height: 70px;
   background-color: #005bac !important;  /* 修改logo背景色*/
   text-align: center;
   overflow: hidden;
@@ -67,8 +67,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 150px;
-      height: 26px;
+      width: 185px;
+      height: 32px;
       vertical-align: middle;
       margin: 0 15px;   /*修改logo偏移位置*/
       /* margin-right:  12px;*/

src/views/login.vue

@@ -5,8 +5,11 @@
     <img class="login-text" src="../assets/images/login-text.svg" alt="">
     <img class="login-logo" src="../assets/images/login-logo.svg" alt="">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" label-width="80px">
-      <h3 class="mini-title">欢迎登录</h3>
-      <h3 class="title">安全保卫管理平台</h3>
+
+      <el-form-item prop="username" label="">
+        <h3 class="mini-title">欢迎登录</h3>
+        <h3 class="title">安全保卫管理平台</h3>
+      </el-form-item>
       <el-form-item prop="username" label="用户名">
         <el-input
           v-model="loginForm.username"
@@ -40,11 +43,11 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-bottom:1px !important;">
         <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       </el-form-item>
 
-      <div style="width:80%;margin: 0 auto;">
+<!--      <div style="width:80%;margin: 0 auto;">
         <el-button
           :loading="loading"
           size="medium"
@@ -56,7 +59,17 @@
         <div style="float: right;" v-if="register">
           <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
-      </div>
+      </div>-->
+      <el-form-item prop="password" label="">
+        <el-button
+          :loading="loading"
+          size="medium"
+          style="width:100%;background-color: #00afff;color:#fff;"
+          @click.native.prevent="handleLogin">
+          <span v-if="!loading">登 录</span>
+          <span v-else>登 录 中...</span>
+        </el-button>
+      </el-form-item>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">