Kaynağa Gözat

Merge branch 'develop' into develop-test

YaolongHan 4 yıl önce
ebeveyn
işleme
30e5373e50
3 değiştirilmiş dosya ile 104 ekleme ve 86 silme
  1. 60 25
      src/assets/css/dark.less
  2. 13 23
      src/assets/css/light.less
  3. 31 38
      src/views/statistics/index.vue

+ 60 - 25
src/assets/css/dark.less

@@ -2,10 +2,53 @@
   height: calc(100vh - 26px);
   overflow: hidden;
   background: #0c102c;
+  /deep/.p-pagination{
+    background: transparent;
+    .p-total{
+      background: transparent;
+    }
+    .p-prev-btn{
+      background: #102668;
+      color: #95bfff;
+      border: 1px solid #2f5873;
+    }
+    .p-next-btn{
+      background: #102668;
+      color: #95bfff;
+      border: 1px solid #2f5873;
+    }
+      ul{
+        li{
+          background: #102668;
+          color: #95bfff;
+          border: 1px solid #2f5873;
+        }
+        li.active{
+          background: #275489;
+          color: white;
+          border: 1px solid #62c4dd;
+        }
+      }
+   
+  }
+  /deep/.p-tabs{
+    .p-tabs-nav-item{
+      background: #102567;
+      color: #8eb7f5;
+      border: 1px solid #2e5772;
+    }
+    .p-tabs-card-item-active{
+      color: white;
+      background: #275489;
+    }
+  }
+  /deep/.el-dialog__body{
+    background: #0c102c;
+  }
   /deep/.p-select-search{
     .p-select-search-box{
       background-color: rgba(22,73,206,0.36)!important;
-      border:1px solid #69CFEA!important;
+      border:1px solid #2e5772!important;
       .p-select-choice-name{
         color: white!important;
       }
@@ -35,6 +78,7 @@
       width: 90px;
       height: 30px;
       cursor: pointer;
+      color: white;
       text-align: center;
       span {
         display: inline-block;
@@ -55,8 +99,7 @@
         line-height: 56px;
         border-bottom: 1px solid rgba(0, 0, 0, 0.06);
         font-size: 16px;
-        font-weight: bold;
-        color: #000;
+        color: white;
       }
       .table-tabs {
         margin: 16px 0;
@@ -69,10 +112,10 @@
         thead {
           height: 40px;
           line-height: 40px;
-          background: #f8f9fa;
+          background: #0d1b4c;
           th {
             font-size: 12px;
-            color: #646a73;
+            color: #95bfff;
             font-weight: normal;
             padding: 0 24px;
           }
@@ -86,10 +129,11 @@
           tr {
             height: 48px;
             line-height: 48px;
-            border-bottom: 1px solid #e4e6e7;
+            border-bottom: 1px solid #0f215f;
             td {
               padding: 0 24px;
               line-height: 22px;
+              color: white;
             }
           }
         }
@@ -101,8 +145,10 @@
       text-align: center;
     }
   }
-
   .menu {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     height: 48px;
     min-width: 1366px;
     color: #1f2429;
@@ -117,14 +163,12 @@
       color: #ffffff;
       float: left;
       margin-right: 83px;
-      // background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
       background: linear-gradient(
         180deg,
         rgba(16, 57, 121, 1) 0%,
         rgba(22, 38, 63, 1) 100%
       );
       background: linear-gradient(-65deg,transparent 20px,rgba(16, 57, 121, 1) 0);
-      // border:2px solid #68CEE8;
       position: relative;
       .downright {
         position: absolute;
@@ -164,8 +208,6 @@
       & > div {
         line-height: 48px;
         text-align: center;
-        //background: url('../assets/images/topbar1.png') no-repeat;
-        float: left;
         width: 80px;
         height: 48px;
         cursor: pointer;
@@ -183,9 +225,9 @@
       }
     }
     .home-right {
-      position: relative;
-      float: right;
-      margin-right: 20px;
+      display: flex;
+      align-items: center;
+      width: 260px;
       line-height: 48px;
       color: #646c73;
       font-size: 1.4rem;
@@ -193,23 +235,16 @@
       display: flex;
       align-content: center;
       .tip{
-        position: absolute;
-        z-index: 8000;
-        top: 40px;
-        right: 0;
-        padding: 4px 8px;
-        background: rgba(31, 36, 41, 0.8);
+        width: 90px;
         color:white;
         font-size: 14px;
-        line-height: 14px;
         cursor: pointer;
       }
       img {
         height: 24px;
         width: 24px;
         filter: saturate(50);
-        margin-top: -2px;
-        margin-left: 12px;
+        margin-left: 20px;
       }
       .span-out {
         position: relative;
@@ -515,7 +550,7 @@
           left: 1.4rem;
           bottom: 10rem;
           padding: 0.6rem;
-          z-index: 8000;
+          z-index: 1000;
           background: #0D368D;
           .legend-bar {
             display: flex;
@@ -537,7 +572,7 @@
       width: 18%;
       .block {
         position: relative;
-        padding: 1.2rem 1.6rem;
+        padding: 0.2rem 1.6rem;
         height: calc((100% - 2rem) / 3);
         border-radius: 4px;
         margin-bottom: 1rem;

+ 13 - 23
src/assets/css/light.less

@@ -77,29 +77,28 @@
       text-align: center;
     }
   }
-
   .menu {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     height: 48px;
     min-width: 1366px;
     color: #1f2429;
     font-size: 1.6rem;
-    background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
     .home {
       width: 280px;
       height: 48px;
-      // line-height: 48px;
       text-align: center;
       cursor: pointer;
       color: #ffffff;
-      float: left;
       margin-right: 83px;
-      // background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
       background: linear-gradient(
         180deg,
-        rgba(54, 156, 247, 1) 0%,
-        rgba(2, 91, 170, 1) 100%
+        rgba(16, 57, 121, 1) 0%,
+        rgba(22, 38, 63, 1) 100%
       );
+      background: linear-gradient(-65deg,transparent 20px,rgba(16, 57, 121, 1) 0);
       position: relative;
       .downright {
         position: absolute;
@@ -139,8 +138,6 @@
       & > div {
         line-height: 48px;
         text-align: center;
-        //background: url('../assets/images/topbar1.png') no-repeat;
-        float: left;
         width: 80px;
         height: 48px;
         cursor: pointer;
@@ -158,33 +155,26 @@
       }
     }
     .home-right {
-      position: relative;
-      float: right;
-      margin-right: 20px;
+      display: flex;
+      align-items: center;
+      width: 260px;
       line-height: 48px;
       color: #646c73;
       font-size: 1.4rem;
       cursor: pointer;
       display: flex;
       align-content: center;
-       .tip{
-        position: absolute;
-        z-index: 8000;
-        top: 40px;
-        right: 0;
-        padding: 4px 8px;
-        background: rgba(31, 36, 41, 0.8);
+      .tip{
+        width: 90px;
         color:white;
         font-size: 14px;
-        line-height: 14px;
         cursor: pointer;
       }
       img {
         height: 24px;
         width: 24px;
         filter: saturate(0);
-        margin-top: -2px;
-        margin-left: 12px;
+        margin-left: 20px;
       }
       .span-out {
         position: relative;
@@ -480,7 +470,7 @@
           position: absolute;
           left: 1.4rem;
           bottom: 10rem;
-          z-index: 8000;
+          z-index: 1000;
           padding: 0.6rem;
           background: white;
           .legend-bar {

+ 31 - 38
src/views/statistics/index.vue

@@ -11,14 +11,12 @@
         </div>
       </div>
       <div class="home-right">
-        <span style="color: #8d9399">
-          <span class="span3">{{ times }}</span>
-          <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"  >
+          <span class="span3" :style="{color:  skinMode === 'light' ? '#8e9298' : 'white'}">{{ times }}</span>
+          <img @click="changeSkin" src="../../assets/images/icons/switch.png">
+          <div class="tip" :style="{color:  skinMode === 'light' ? '#8e9298' : '#69c4df'}" @click="changeSkin" >
             {{skinMode === 'light' ? '切换驾驶舱':'切换集团首页'}}
           </div>
-        </span>
-      </div>
+        </div>
     </div>
     <!-- 面包屑 -->
     <nav class="navigation">
@@ -353,13 +351,13 @@
               </tr>
             </tbody>
           </table>
+             <!-- v-show="pageCount > 9" -->
           <Pagination
-            v-show="pageCount > 9"
             :pageCount="pageCount"
             style="float: right; margin-top: 20px"
             :page="currentPage"
             :pageSize="pageSize"
-            :pageCountShow="true"
+            :pageCountShow="false"
             @change="currentChangeHandle"
           />
         </section>
@@ -407,7 +405,7 @@ export default {
       testTree: true,
       exceptionData: [],
       storeExceptionData: [],
-      activeName: "",
+      activeName: "2",
       systemExceptionData: {},
       showMask: false, // 控制遮罩层的显示隐藏
       placeholder: "全部",
@@ -531,29 +529,27 @@ export default {
     */
     changeSkin() {
       const vm = this
-      const mapDom = document.querySelector("#map")
-      const icons = mapDom.querySelectorAll(".my-leaflet-div-icon")
-      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
-            })
-          }
-      })
+      const mapDom = document.querySelector("#map .leaflet-marker-pane")
+      const icons = mapDom.querySelectorAll(".leaflet-marker-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
+        })
+      }
     },
     downloadExcel() {
       let tableContent = document.querySelector("#tableReport").outerHTML;
@@ -929,9 +925,9 @@ export default {
       if (item.expand === 0) {
         return { height: `calc((100% - 2rem) / 3)` };
       } else if (item.expand === 1) {
-        return { height: "calc(100% - 11.2rem)" };
+        return { height: "calc(100% - 14.2rem)" };
       } else {
-        return { height: "4.6rem" };
+        return { height: "6.6rem" };
       }
     },
     /**
@@ -1199,9 +1195,6 @@ export default {
      *@description 打开弹窗
      */
     openMaskPanel(system) {
-      if(this.skinMode === 'dark') {
-        return false;
-      }
       let target = this.getDataByCityCcode(this.selectedZone)
       if (target) {
         this.currentDialogLevel = target.level
@@ -1226,6 +1219,7 @@ export default {
           });
         }
       });
+ 
       if (this.tabData.length) {
         this.activeName = this.tabData[0].id;
         this.currentDialogTab = this.activeName;
@@ -1557,7 +1551,6 @@ export default {
         popup.on('add' , (ev) => {
            let popupDom = document.querySelectorAll('.leaflet-mypopup-content')[0]
            let tipDom = document.querySelectorAll('.leaflet-popup-tip')[0]
-           console.log(tipDom)
            if (this.skinMode === 'light') {
              popupDom.setAttribute('class', 'leaflet-mypopup-content')
              tipDom.style.background="white"