12.28

src/styles/base.scss

@@ -7,16 +7,14 @@ body {
 
   .el-menu--popup {
     // background-color: #fff !important;
-    background-color: #0d2043 !important;
+    background-color: $subMenuBg !important;
 
     .el-submenu__title,
     .el-menu-item {
-    //   color: #696969 !important;
       color: rgb(235, 240, 254) !important;
 
       &:hover {
-        // color: #2d74e7 !important;
-        background: linear-gradient(90deg, #6898ef, #416593) !important;
+        background: #1c72ac !important;
       }
     }
   }

src/styles/sidebar.scss

@@ -68,14 +68,12 @@
     .submenu-title-noDropdown,
     .el-submenu__title {
       &:hover {
-        // background-color: $menuHover !important;
-        background: linear-gradient(90deg, #6898ef,#416593) !important
+        background: #1c72ac !important;
       }
     }
 
     .is-active>.el-submenu__title {
       color: $subMenuActiveText !important;
-      // background: linear-gradient(90deg, #6898ef,#416593) !important
     }
 
     & .nest-menu .el-submenu>.el-submenu__title,
@@ -85,7 +83,17 @@
       // color: #fff !important;
 
       &:hover {
-        background: linear-gradient(90deg, #6898ef,#416593) !important
+        // background: linear-gradient(90deg, #6898ef,#416593) !important
+        background: #1c72ac !important;
+      }
+    }
+
+    .el-submenu {
+      &.is-opened {
+        background-color: #1c72ac !important;
+        .is-active{
+          background-color: #207bb8 !important;
+        }
       }
     }
   }
@@ -139,6 +147,10 @@
             display: inline-block;
           }
         }
+
+        &.is-opened {
+          background-color: #1c72ac !important;
+        }
       }
     }
   }
@@ -186,7 +198,6 @@
   .el-menu-item {
     &:hover {
       background-color: $menuHover !important;
-      // background: linear-gradient(90deg, #6898ef,#416593) !important
     }
   }
 

src/styles/variables.scss

@@ -1,13 +1,13 @@
 // sidebar
 $menuText: #ebf0fe;
-$menuActiveText: #478dff;
+$menuActiveText: #daf0ff;
 $subMenuActiveText: #f4f4f5;
 
 $menuBg: rgba(213, 28%, 26%, 0);
 $menuHover: rgba(220, 38, 38, 0);
 
-$subMenuBg: #07142e;
-$subMenuHover: rgba(220, 38, 38, 0);
+$subMenuBg: #2687c7;
+$subMenuHover: #2687c7;
 
 $sideBarWidth: 200px;
 

src/views/MapView/index.vue

@@ -306,7 +306,7 @@ export default {
       // })
       // 二维地图视图改变监听
       this.map.on('moveend', evt => {
-        console.log("地图级别", this.map.getView().getZoom())
+        // console.log("地图级别", this.map.getView().getZoom())
         this.map_extentChangeHandler()
       })
 
@@ -513,7 +513,7 @@ export default {
       if (zoom >= 20) dis = 5 / 10000
       if (zoom >= 23) dis = 3 / 10000
       let bufferPoint = turf.buffer(turf.point(position), dis, { units: 'kilometers' }) // 缓冲
-      console.log("级别：", zoom, "缓冲：", dis * 1000)
+      // console.log("级别：", zoom, "缓冲：", dis * 1000)
       let resultArray = []
       for (let i = 0; i < DataServer.dataSetInfo.length; i++) {
         // 空间查询参数

src/views/login/index.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="login_box">
       <div class="head">
-         <!--<img class="logo" src="../../assets/images/login/logo.png" alt="logo">
+        <!--<img class="logo" src="../../assets/images/login/logo.png" alt="logo">
         <p class="transform" />
         <p class="sys">科学城综合管理地理信息系统</p>
         <div class="form">
@@ -59,55 +59,24 @@
         </div> -->
 
         <img class="logo" src="../../assets/images/login/logo_title.png" alt="logo">
-        <div class="form" >
-          <el-form
-            ref="loginForm"
-            :model="loginForm"
-            :rules="loginRules"
-            class="login-form"
-            auto-complete="on"
-            label-position="left"
-          >
+        <div class="form">
+          <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
             <div class="input_item">
               <el-form-item prop="username">
                 <span class="svg-container user">账户</span>
-                <el-input
-                  ref="username"
-                  v-model="loginForm.username"
-                  placeholder="请输入账号"
-                  name="username"
-                  type="text"
-                  class="input_w"
-                  tabindex="1"
-                  auto-complete="on"
-                  suffix-icon="el-icon-user"
-                />
+                <el-input ref="username" v-model="loginForm.username" placeholder="请输入账号" name="username" type="text" class="input_w"
+                          tabindex="1" auto-complete="on" suffix-icon="el-icon-user" />
               </el-form-item>
             </div>
             <div class="input_item">
               <el-form-item prop="password">
-                <span class="svg-container pwd" >密码</span>
-                <el-input
-                  :key="passwordType"
-                  ref="password"
-                  v-model="loginForm.password"
-                  :type="passwordType"
-                  placeholder="请输入密码"
-                  name="password"
-                  tabindex="2"
-                  class="input_w"
-                  auto-complete="on"
-                  suffix-icon="el-icon-lock"
-                  @keyup.enter.native="handleLogin"
-                />
+                <span class="svg-container pwd">密码</span>
+                <el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType" placeholder="请输入密码"
+                          name="password" tabindex="2" class="input_w" auto-complete="on" suffix-icon="el-icon-lock"
+                          @keyup.enter.native="handleLogin" />
               </el-form-item>
             </div>
-            <el-button
-              class="btn"
-              :loading="loading"
-              type="primary"
-              @click.native.prevent="handleLogin"
-            >登陆</el-button>
+            <el-button class="btn" :loading="loading" type="primary" @click.native.prevent="handleLogin">登录</el-button>
           </el-form>
         </div>
       </div>
@@ -144,7 +113,7 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect
       },
       immediate: true
@@ -222,8 +191,8 @@ export default {
         bottom: 322px;
         left: calc(50% - 323px);
       }
-      
-      .form{
+
+      .form {
         position: absolute;
         bottom: 117px;
         left: calc(50% - 528px);
@@ -232,24 +201,23 @@ export default {
         background-image: url('../../assets/images/login/form_box.png');
         background-size: 100% 100%;
         background-repeat: no-repeat;
-        .login-form{
+        .login-form {
           height: 100%;
-          padding: 86px 129px 68px 129px;  
-          .input_item{
+          padding: 86px 129px 68px 129px;
+          .input_item {
             width: 344px;
             height: 44px;
             float: left;
-            .input_w{
+            .input_w {
               width: 302px;
             }
           }
-          .btn{
+          .btn {
             float: left;
             width: 90px;
           }
         }
       }
-      
     }
   }
 }

theme/index.css

@@ -8754,7 +8754,7 @@
     .el-submenu__title * {
       vertical-align: middle; }
     .el-submenu__title i {
-      color: #909399; }
+      color: #ffffff; }
     .el-submenu__title:hover, .el-submenu__title:focus {
       outline: none;
       background-color: #eaf1fd; }

theme/menu.css

@@ -660,7 +660,7 @@
     .el-submenu__title * {
       vertical-align: middle; }
     .el-submenu__title i {
-      color: #909399; }
+      color: #ffffff; }
     .el-submenu__title:hover, .el-submenu__title:focus {
       outline: none;
       background-color: #eaf1fd; }