Merge remote-tracking branch 'origin/master'

ruoyi-ui/package.json

@@ -42,6 +42,7 @@
     "core-js": "3.8.1",
     "echarts": "4.9.0",
     "element-ui": "2.15.0",
+    "express": "^4.17.1",
     "file-saver": "2.0.4",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -72,6 +72,7 @@
       white-space: nowrap !important;
     }
 
+
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
@@ -95,13 +96,25 @@
 
     & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
     & .theme-dark .el-submenu .el-menu-item {
-      background-color: $subMenuBg !important;
+      background-color: $subMenuBg;
 
       &:hover {
         background-color: $subMenuHover !important;
+        color: #fff!important;
       }
     }
   }
+  .el-menu-item.is-active {
+      color: #fff!important;
+      background-color: #41A7F6!important;
+  }
+  .el-submenu__title{
+    color: #fff!important;
+  }
+  .el-menu-item {
+    color: #90D3FD!important;
+  }
+
 
   .hideSidebar {
     .sidebar-container {
@@ -113,6 +126,7 @@
     }
 
     .submenu-title-noDropdown {
+		background: #fff!important;
       padding: 0 !important;
       position: relative;
 

ruoyi-ui/src/assets/styles/variables.scss

@@ -9,11 +9,11 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // sidebar
-$menuText:#bfcbd9;
+$menuText:#fff;
 $menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText:#fff; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156;
+$menuBg:#1C84C6;
 $menuHover:#263445;
 $sidebarTitle: #ffffff;
 
@@ -21,8 +21,8 @@ $menuLightBg:#ffffff;
 $menuLightHover:#f0f1f5;
 $sidebarLightTitle: #001529;
 
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg:#1C84C6;
+$subMenuHover:#41A7F6;
 
 $sideBarWidth: 200px;
 

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -36,7 +36,8 @@ export default {
   data() {
     return {
       title: '招商引资管理系统',
-      logo: logoImg
+      // logo: logoImg
+      logo: ''
     }
   }
 }
@@ -57,7 +58,7 @@ export default {
   width: 100%;
   height: 50px;
   line-height: 50px;
-  background: #2b2f3a;
+  background: #1C84C6;
   text-align: center;
   overflow: hidden;
 

ruoyi-ui/src/views/login.vue

@@ -1,13 +1,17 @@
 <template>
   <div class="login">
+    <div class="log_box">
+    <div class="log_img">
+      <img src="../assets/images/logo.png" alt="" class="img">
+    </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">招商引资管理系统</h3>
-      <el-form-item prop="username">
+      <!-- <h3 class="title">招商引资管理系统</h3> -->
+      <el-form-item prop="username" style="height:45px;">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="password">
+      <el-form-item prop="password" style="height:45px;">
         <el-input
           v-model="loginForm.password"
           type="password"
@@ -32,13 +36,13 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>-->
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
+      <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> -->
+      <el-form-item style="width:100%;height:45px;margin: 0;">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width:100%;background-color: #1C83C6;color: #CDCDCD;"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
@@ -46,9 +50,10 @@
         </el-button>
       </el-form-item>
     </el-form>
+    </div>
     <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2021  All Rights Reserved.</span>
+   <div class="el-login-footer">
+      <span>潜山市招商引资局  版权所有  © 2018-2028</span>
     </div>
   </div>
 </template>
@@ -140,6 +145,21 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+  .log_box{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    height: 100vh;
+    padding-top: 19vh;
+    box-sizing: border-box;
+  }
+  .log_img{
+    width: 46vw;
+    margin-bottom: 62px;
+    .img{
+      width: 100%;
+    }
+  }
 .login {
   display: flex;
   justify-content: center;
@@ -157,8 +177,8 @@ export default {
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  width: 520px;
+  padding: 46px 60px;
   .el-input {
     height: 38px;
     input {
@@ -192,7 +212,7 @@ export default {
   bottom: 0;
   width: 100%;
   text-align: center;
-  color: #fff;
+  color: #5E6F90;
   font-family: Arial;
   font-size: 12px;
   letter-spacing: 1px;