2 コミット 1bbaee097b ... a03e2b7f91

作者 SHA1 メッセージ 日付
  fujunwen a03e2b7f91 Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop 4 年 前
  fujunwen f6ed1b088a 集团首页修改样式0 4 年 前
3 ファイル変更56 行追加28 行削除
  1. 28 5
      src/assets/css/dark.less
  2. 3 1
      src/assets/css/light.less
  3. 25 22
      src/views/statistics/index.vue

+ 28 - 5
src/assets/css/dark.less

@@ -1,5 +1,6 @@
 .dark-overview {
   height: calc(100vh - 26px);
+  overflow: hidden;
   background: #0c102c;
   /deep/.p-select-search{
     .p-select-search-box{
@@ -8,6 +9,9 @@
       .p-select-choice-name{
         color: white!important;
       }
+      .p-select-search-input{
+        color: white!important;
+      }
     }
 
   }
@@ -281,15 +285,31 @@
         cursor: pointer;
       }
     .system-general {
-        width: 25.4%;
+        width: 28.4%;
+        height: 100%;
         box-sizing: border-box;
       .system-main-title {
         padding: 2rem 0 2.4rem 1.6rem;
       }
       
       .system-list {
-        height: 80vh;
+        height: 90%;
         overflow-y: auto;
+        &::-webkit-scrollbar-track{
+          background: rgba(22, 73, 206, 0.3);
+          border-radius:2px;
+        }
+        &::-webkit-scrollbar-thumb{
+          background: rgba(22, 73, 206, 0.8);
+          border-radius:10px;
+          border: none;
+        }
+        // &::-webkit-scrollbar-thumb:hover{
+        //   background: #333;
+        // }
+        // &::-webkit-scrollbar-corner{
+        //   background: #179a16;
+        // }
         ul {
           li.system-item {
             position: relative;
@@ -439,7 +459,7 @@
       }
     }
     .map-box {
-      width: calc(56.6% - 2.4rem);
+      width: calc(53.6% - 2.4rem);
       margin: 0 12px;
       .cards-list {
         display: flex;
@@ -462,7 +482,10 @@
           .describe {
             display: flex;
             color: white;
-            padding: 2rem 4rem;
+            padding: 0.2rem 4rem;
+            strong{
+              font-size: 30px;
+            }
           }
         }
         div:first-child.card {
@@ -521,7 +544,7 @@
         transition: height 0.3s ease-in-out;
         .section-title {
           font-size: 1.6rem;
-          width: 55%;
+          width: 70%;
           img{
             height: 18px;
             width: 18px;

+ 3 - 1
src/assets/css/light.less

@@ -1,5 +1,6 @@
 .light-overview{
   height: calc(100vh - 26px);
+  overflow: hidden;
   background: rgba(247, 249, 250, 1);
   .my-dialog {
     position: relative;
@@ -263,6 +264,7 @@
     }
 
     .system-general {
+      height: 100%;
       width: 25.4%;
       box-sizing: border-box;
       background: white;
@@ -270,7 +272,7 @@
         padding: 2rem 0 2.4rem 1.6rem;
       }
       .system-list {
-        height: 80vh;
+        height: 90%;
         overflow-y: auto;
         ul {
           li.system-item {

+ 25 - 22
src/views/statistics/index.vue

@@ -13,9 +13,9 @@
       <div class="home-right">
         <span style="color: #8d9399">
           <span class="span3">{{ times }}</span>
-          <img @mouseenter="showSwitchTip = true"  @mouseleave="delayToHideTip" src="../../assets/images/icons/switch.png">
-          <div class="tip" v-show="showSwitchTip"  @mouseenter="cancelHideTip" @mouseleave="showSwitchTip = false"  @click="changeSkin" >
-            {{skinMode === 'light' ? '切换深色版':'切换浅色版'}}
+          <img @click="changeSkin"  @mouseenter="showSwitchTip = true"  @mouseleave="delayToHideTip" src="../../assets/images/icons/switch.png">
+          <div class="tip" v-show="showSwitchTip"  @mouseenter="cancelHideTip" @mouseleave="showSwitchTip = false"  >
+            {{skinMode === 'light' ? '切换驾驶舱':'切换集团首页'}}
           </div>
         </span>
       </div>
@@ -448,6 +448,7 @@ export default {
         东莞: { center: [23.644524198573688, 114.83844948916203], zoom: 8 },
         南宁: { center: [22.48, 108.19], zoom: 7 },
         广州: { center: [22.755920681486405, 112.01244459124548], zoom: 7 },
+        深圳: { center: [22.755920681486405, 112.01244459124548], zoom: 7 },
         太原: { center: [37.54, 112.33], zoom: 7 },
         武汉: { center: [31.147006308556566, 112.97898510653813], zoom: 7 },
         郑州: { center: [34.46, 113.4], zoom: 7 },
@@ -533,25 +534,27 @@ export default {
       const vm = this
       const mapDom = document.querySelector("#map")
       const icons = mapDom.querySelectorAll(".my-leaflet-div-icon")
-      if (this.skinMode === 'light') {
-        this.skinMode = 'dark'
-        icons.forEach(dom => {
-          dom.style.color = "#FFF"
-        })
-      } else {
-        this.skinMode = 'light'
-        icons.forEach(dom => {
-          dom.style.color = "#333"
-        })
-      }
-      if (this.mapLayer) {
-        this.mapLayer.setStyle({
-          weight: 1,
-          color: vm.skinMode === "light" ? "#B3D2FF" :"#56a3c2",
-          fillColor: vm.skinMode === "light" ? "#DEECFF" : "#21285c",
-          fillOpacity: vm.skinMode === "light" ? 0.2 : 1
-        })
-      }
+      this.$nextTick(()=>{
+          if (this.skinMode === 'light') {
+              this.skinMode = 'dark'
+              icons.forEach(dom => {
+                dom.style.color = "#FFF"
+              })
+          } else {
+              this.skinMode = 'light'
+              icons.forEach(dom => {
+                dom.style.color = "#333"
+              })
+          }
+          if (this.mapLayer) {
+            this.mapLayer.setStyle({
+              weight: 1,
+              color: vm.skinMode === "light" ? "#B3D2FF" :"#56a3c2",
+              fillColor: vm.skinMode === "light" ? "#DEECFF" : "#21285c",
+              fillOpacity: vm.skinMode === "light" ? 0.2 : 1
+            })
+          }
+      })
     },
     downloadExcel() {
       let tableContent = document.querySelector("#tableReport").outerHTML;