From 55bdc8f06c9b0c8622f84602c18b1804b4cec397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=90=AA?= <727393967@qq.com>
Date: Mon, 26 Aug 2024 17:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/container.vue         |  4 +--
 src/components/public/Footer.vue     | 17 ++++++-------
 src/components/public/Header.vue     |  2 +-
 src/style/style.scss                 |  8 +++---
 src/views/dataTransfer/voyageReg.vue |  4 +--
 src/views/home.vue                   | 37 ++++++++++++++++++++--------
 6 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/components/container.vue b/src/components/container.vue
index f591c01..08d3f96 100644
--- a/src/components/container.vue
+++ b/src/components/container.vue
@@ -5,19 +5,17 @@
       <router-view />
     </div>
 
-    <Footer />
+
 
   </div>
 
 </template>
 
 <script>
-import Footer from './public/Footer'
 import Header from './public/Header'
 export default {
   name: 'Container',
   components: {
-    Footer,
     Header
   },
   props: {},
diff --git a/src/components/public/Footer.vue b/src/components/public/Footer.vue
index 24be1f7..9c5ab88 100644
--- a/src/components/public/Footer.vue
+++ b/src/components/public/Footer.vue
@@ -7,7 +7,7 @@
         </div>
         <div class="left_list">
           <ul>
-            
+
             <li><router-link to="/">首页</router-link></li>
             <li><router-link to="/">样品发现</router-link></li>
             <li><router-link to="/">数据资源</router-link></li>
@@ -89,15 +89,13 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"> 
+<style scoped lang="scss">
     .footer{
         width: 100%;
-        height: 320px;
         background: url(../../../static/images/footBg.jpg) center no-repeat;
         background-size: 100% 100%;
+        padding: 20px 0;
         box-sizing: border-box;
-        padding: 50px;
-        padding-bottom: 20px;
         .footer_con{
             margin: auto;
             width: 1200px;
@@ -106,7 +104,7 @@ export default {
             align-items: center;
             justify-content: space-between;
             .footer_left{
-                width: 405px;
+                width: 450px;
                 height: 140px;
                 border-right: 1px solid #34455d;
                 display: flex;
@@ -130,9 +128,8 @@ export default {
                         height: auto;
                         display: flex;
                         flex-wrap: wrap;
-                        justify-content: space-between;
                         li{
-                            width: 31%;
+                            width: 25%;
                             height: auto;
                             margin-bottom: 20px;
                             a{
@@ -144,6 +141,7 @@ export default {
                 }
             }
             .footer_right{
+              padding-left: 50px;
                 width: 720px;
                 height: 140px;
                 display: flex;
@@ -204,7 +202,6 @@ export default {
         }
         .dibu{
             margin: auto;
-            margin-top: 60px;
             width: 1200px;
             height: auto;
             display: flex;
@@ -240,4 +237,4 @@ export default {
     .dibu_2  .el-input{
         height: 35px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/public/Header.vue b/src/components/public/Header.vue
index 6d0d2ee..be6e840 100644
--- a/src/components/public/Header.vue
+++ b/src/components/public/Header.vue
@@ -240,7 +240,7 @@ export default {
     // 退出登录
     onLogout() {
       loginOut().then(res => {
-        location.href = '/#/container/login'
+        location.href = './#/container/login'
         setTimeout(() => {
           location.reload()
         }, 100)
diff --git a/src/style/style.scss b/src/style/style.scss
index 40e443e..b2f8902 100644
--- a/src/style/style.scss
+++ b/src/style/style.scss
@@ -18,9 +18,9 @@ header{
   background: #012458;
   padding: 0 3%;
   box-sizing: border-box;
-  position: fixed;
-  top: 0;
-  left: 0;
+  //position: fixed;
+  //top: 0;
+  //left: 0;
   z-index: 2000;
   color:white;
   .otherPub{
@@ -1311,7 +1311,7 @@ header{
 
 }
 .container_a {
-  padding-top: 90px;
+  //padding-top: 90px;
 }
 .box_p{
   padding:20px 4%;
diff --git a/src/views/dataTransfer/voyageReg.vue b/src/views/dataTransfer/voyageReg.vue
index ffef75c..1457e00 100644
--- a/src/views/dataTransfer/voyageReg.vue
+++ b/src/views/dataTransfer/voyageReg.vue
@@ -89,7 +89,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="离岗日期" prop="start_date">
+            <el-form-item label="航次开始" prop="start_date">
               <el-date-picker
                 style="width: 100%"
                 v-model="form.start_date"
@@ -98,7 +98,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="返岗日期" prop="end_date">
+            <el-form-item label="航次结束" prop="end_date">
               <el-date-picker
                 style="width: 100%"
                 v-model="form.end_date"
diff --git a/src/views/home.vue b/src/views/home.vue
index 5bff15e..fa64688 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -209,10 +209,13 @@
         </ul>
       </div>
     </div>
+
+    <Footer />
   </div>
 </template>
 
 <script>
+import Footer from '../components/public/Footer'
 import { getVoyage, getVoyageLine, getParamsList } from '../api/home'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/swiper-bundle.css'
@@ -222,7 +225,8 @@ export default {
   name: 'Index',
   components: {
     swiper,
-    swiperSlide
+    swiperSlide,
+    Footer
   },
   data() {
     return {
@@ -389,13 +393,16 @@ export default {
       this.viewer.shadowMap.darkness = 0.8
       this.viewer.scene._sunBloom = false
       this.viewer.scene.globe.showGroundAtmosphere = false
+      // 不显示底图
+      // this.viewer.imageryLayers.get(0).show = false
+
       // 叠加叠加影像服务
       const earthMap = new Cesium.WebMapTileServiceImageryProvider(
         {
-          url: this.CesiumHostAddr + 'geoserver/gwc/service/wmts/rest/ougp:world/EPSG:4326/EPSG:4326:{z}/{y}/{x}?format=image/png',
-          layer: 'ne:gmrt_20231018',
+          url: this.CesiumHostAddr + 'geoserver/gwc/service/wmts/rest/ougp:world/{TileMatrixSet}/{TileMatrixSet}:{TileMatrix}/{TileRow}/{TileCol}?format=image/jpeg',
+          layer: 'ougp:world',
           style: 'default',
-          tileMatrixSetID: 'EPSG:4326',
+          tileMatrixSetID: 'EPSG:900913',
           format: 'image/jpeg',
           tilingScheme: new Cesium.GeographicTilingScheme()
         }
@@ -404,10 +411,10 @@ export default {
       // 增加海岸线
       const coastline = new Cesium.WebMapTileServiceImageryProvider(
         {
-          url: this.CesiumHostAddr + 'geoserver/gwc/service/wmts/rest/ougp:GSHHS_f_L1/EPSG:4326/EPSG:4326:{z}/{y}/{x}?format=image/png',
+          url: this.CesiumHostAddr + 'geoserver/gwc/service/wmts/rest/ougp:GSHHS_f_L1/{TileMatrixSet}/{TileMatrixSet}:{TileMatrix}/{TileRow}/{TileCol}?format=image/png',
           layer: 'ne:GSHHS_f_L1',
           style: 'default',
-          tileMatrixSetID: 'EPSG:4326',
+          tileMatrixSetID: 'EPSG:900913',
           format: 'image/png',
           tilingScheme: new Cesium.GeographicTilingScheme()
         }
@@ -416,10 +423,10 @@ export default {
       // 沉船摄影拼接图
       const shipline = new Cesium.WebMapTileServiceImageryProvider(
         {
-          url: this.CesiumHostAddr + 'geoserver/gwc/service/wmts/rest/ougp:正射影像图_GM输出_20240516/EPSG:4326/EPSG:4326:{z}/{y}/{x}?format=image/png',
-          layer: 'ne:No1ShipWreck_UP',
+          url: this.CesiumHostAddr + 'geoserver/gwc/service/wmts/rest/ougp:正射影像图_GM输出_20240516/{TileMatrixSet}/{TileMatrixSet}:{TileMatrix}/{TileRow}/{TileCol}?format=image/png',
+          layer: 'ougp:正射影像图_GM输出_20240516',
           style: 'default',
-          tileMatrixSetID: 'EPSG:4326',
+          tileMatrixSetID: 'EPSG:900913',
           format: 'image/png',
           tilingScheme: new Cesium.GeographicTilingScheme()
         }
@@ -491,7 +498,7 @@ export default {
       } else {
         window.open(val, '_blank')
       }
-    }
+    },
   }
 }
 </script>
@@ -657,6 +664,7 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
+    position: relative;
 
     .guiji_1 {
       margin-bottom: 20px;
@@ -747,6 +755,15 @@ export default {
         height: 100%;
       }
     }
+    .cover {
+      width: 100%;
+      height: 800px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 3000;
+      background-color: pink;
+    }
   }
 
   .shuju {