Merge branch 'jzl'

zh-baseversion-web/src/components/bigWindow/leftBar.vue

@@ -594,7 +594,7 @@ export default {
   height: 2px;
   float: right;
   background-image: linear-gradient(to left, #47a0ff, #ffffff00);
-  margin-top: 10px;
+  margin-top: 2px;
   margin-right: 50px;
 }
 .rightline2 {

zh-baseversion-web/src/components/bigWindow/rightBar.vue

@@ -300,7 +300,7 @@
         <div class="fong-div" style="margin-left: 3px;"></div>
         <div class="fong-div" style="margin-left: 3px;"></div> -->
         <span style="letter-spacing: 1px; color: #fff; float: left">
-          资源统计
+          预警信息
         </span>
         <!-- <img src="../../assets/second1/ti-bg.png" alt=""> -->
         <div class="rightline3"></div>
@@ -1191,7 +1191,7 @@ export default {
   float: left;
   background-image: linear-gradient(to right, #47a0ff, #ffffff00);
 
-  margin-top: 10px;
+  margin-top: 2px;
   margin-left: 50px;
 }
 .rightline2 {