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

src/components/Viewer/smViewer.scss

@@ -25,7 +25,7 @@
     height: 100% !important;
     position: absolute !important;
     left: 0% !important;
-    top: 6% !important;
+    top: 0% !important;//6%
 }
 
 .cesiumbtn {

src/views/cockpitNew1/hysy.vue

@@ -405,7 +405,7 @@ export default {
     border-width: 0px;
     position: absolute;
     left: 1rem;
-    top: 35.7rem;
+    top: 44rem;
     width: 416px;
     height: 310px;
     display: flex;

src/views/map3d.vue

@@ -1,5 +1,6 @@
 <template>
   <div id="app">
+    <div class="bg_top"></div>
     <div class="header">
       <div class="timeline">
         <div class="timeline-item" v-html="formattedText"></div>
@@ -281,13 +282,23 @@ export default {
   height: calc(100% - 60px);
   top: 60px;
 }
-
+.bg_top {
+  width: 100%;
+  height: 70px;
+  position: absolute;
+  z-index: 100;
+  background: linear-gradient(
+    to bottom ,
+    rgba(6, 37, 66, 1),
+    rgba(26, 28, 53, 0)
+  );
+}
 .header {
   height: 60px;
   position: fixed;
   top: 0px;
   width: 100%;
-  z-index: 100;
+  z-index: 101;
   // background: RGBA(31, 35, 41, 1);
   text-align: center;
   display: flex;

src/views/viewer.vue

@@ -408,8 +408,9 @@ export default {
 
     .bg_left {
         width: 21.6%;
-        height: 100%;
+        height: calc(100% + 60px);
         position: absolute;
+        top: -60px;
         left: 0;
         z-index: 100;
         background: linear-gradient(to right, rgba(6, 37, 66, 1), rgba(26, 28, 53, 0));
@@ -417,8 +418,9 @@ export default {
 
     .bg_right {
         width: 21.6%;
-        height: 100%;
+        height: calc(100% + 60px);
         position: absolute;
+        top: -60px;
         right: 0;
         z-index: 100;
         background: linear-gradient(to left, rgba(6, 37, 66, 1), rgba(26, 28, 53, 0));