Merge remote-tracking branch 'origin/fireprotection_tongyu' into fireprotection_tongyu

src/components/TVWall.vue

@@ -531,7 +531,7 @@ export default {
         if (oData.responseMsg.data) {
           that.pubKey = oData.responseMsg.data
           callback()
-        }125
+        }
       })
     },
 //RSA加密

src/components/vBottomMenu.vue

@@ -448,11 +448,11 @@ export default {
           icon: 'iconfont sj-icon-sjdw',
           click: 'eventLocation'
         },
-        {
-          name: '图层切换',
-          icon: 'iconfont sj-icon-tcqh',
-          click: 'layerSwitching'
-        },
+        // {
+        //   name: '图层切换',
+        //   icon: 'iconfont sj-icon-tcqh',
+        //   click: 'layerSwitching'
+        // },
         {
           name: '测量工具',
           icon: 'iconfont sj-icon-clgj',
@@ -873,7 +873,7 @@ export default {
   height: auto;
   background: linear-gradient($btmMemu);
   position: absolute;
-  z-index: 999;
+  z-index: 1001;
   bottom: 0;
   height: 2.5rem;
   display: flex;

src/views/datacenter.vue

@@ -8,7 +8,7 @@
       <!-- 左侧 -->
       <div class="leftbar w-10" ref="left">
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-78">
               <div class="d-l-con-icon">
@@ -34,7 +34,7 @@
       <!-- 右侧 -->
       <div class="rightbar" ref="right">
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>数据分布</span>

src/views/monitor.vue

@@ -8,7 +8,7 @@
       <!-- 左侧 -->
       <div class="leftbar" ref="left">
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>事态感知</span>
@@ -66,7 +66,7 @@
       <!-- 右侧 -->
       <div class="rightbar" ref="right">
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>列表</span>
@@ -85,7 +85,7 @@
           </dv-border-box-13>
         </div>
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>重点区域</span>