Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/cockpitNew1/bjxm.vue

@@ -267,10 +267,12 @@ export default {
 .bjxm {
   border-width: 0px;
   position: absolute;
-  width: 407px;
+  // width: 407px;
+  width: 385px;
   height: 310px;
   top: 68%;
-  left: 1080px;
+  // left: 1080px;
+  left: 1096px;
   background: inherit;
   border: none;
   border-radius: 0px;

src/views/map3d.vue

@@ -85,7 +85,7 @@
     <!-- <div class="masking_top">
       <div class="top_left"></div>
       <div class="top_right"></div>
-
+asdasd
     </div>
     <div class="masking_left"></div>
     <div class="masking_bottom"></div>