From da9ce1566f98d98e70c884f2717d43c0d5244613 Mon Sep 17 00:00:00 2001 From: hym Date: Tue, 15 Oct 2024 15:11:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=EF=BC=9A=E5=AE=9A=E6=A0=87=E6=94=B9=E4=B8=BA=E6=A0=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataTransfer/sampleViews/formViews/Equipment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dataTransfer/sampleViews/formViews/Equipment.vue b/src/views/dataTransfer/sampleViews/formViews/Equipment.vue index 1cfc8df..804a856 100644 --- a/src/views/dataTransfer/sampleViews/formViews/Equipment.vue +++ b/src/views/dataTransfer/sampleViews/formViews/Equipment.vue @@ -12,7 +12,7 @@ - + From a5240d66c99cdea2bab24c9f735625a606bb5c3f Mon Sep 17 00:00:00 2001 From: hym Date: Tue, 15 Oct 2024 15:42:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=B7=BB=E5=8A=A0=20home?= =?UTF-8?q?Button=EF=BC=8C=E5=8D=95=E5=87=BB=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataSearch.vue | 33 ++++++++++++++++++++++++--------- src/views/home.vue | 16 +++++++++++++--- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index da20e70..8ad17bc 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -11,7 +11,8 @@
- +
@@ -27,25 +28,29 @@
请选择航次名称
-
{{ item.name }}
+
{{ + item.name }}
请选择平台类型
-
{{ item.name + '(' + item.value + ')' }}
+
{{ + item.name + '(' + item.value + ')' }}
请选择设备类型
-
{{ item.name + '(' + item.value + ')' }}
+
{{ + item.name + '(' + item.value + ')' }}
请选择数据样品类型
-
{{ item.name + '(' + item.value + ')' }}
+
{{ + item.name + '(' + item.value + ')' }}
@@ -449,7 +454,7 @@ export default { baseLayerPicker: false, fullscreenButton: false, selectionIndicator: false, - homeButton: false, + homeButton: true, animation: false, infoBox: false, geocoder: false, @@ -468,10 +473,20 @@ export default { this.viewer.scene.globe.showGroundAtmosphere = false this.viewer.scene.postProcessStages.fxaa.enabled = true - this.viewer.camera.setView({ + // 单击 homeButton 返回初始位置 + this.viewer.homeButton.viewModel.command.beforeExecute.addEventListener((e) => { + e.cancel = true; + this.viewer.camera.flyTo({ // 指定相机初始位置 - destination: Cesium.Cartesian3.fromDegrees(110, 18, 10000000) + destination: Cesium.Cartesian3.fromDegrees(112, 18, 4000000), + duration: 0.5 }); + }); + + this.viewer.camera.setView({ + // 指定相机初始位置 + destination: Cesium.Cartesian3.fromDegrees(112, 18, 4000000) + }); // 不显示底图 this.viewer.imageryLayers.get(0).show = false @@ -857,7 +872,7 @@ export default { .tag { color: #333333; padding: 5px; - background-color: rgb(249,249,249); + background-color: rgb(249, 249, 249); margin: 0 15px 15px 0; } } diff --git a/src/views/home.vue b/src/views/home.vue index e605127..981a075 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -353,7 +353,7 @@ export default { baseLayerPicker: false, fullscreenButton: false, selectionIndicator: false, - homeButton: false, + homeButton: true, animation: false, infoBox: false, geocoder: false, @@ -372,10 +372,20 @@ export default { this.viewer.scene.globe.showGroundAtmosphere = false this.viewer.scene.postProcessStages.fxaa.enabled = true - this.viewer.camera.setView({ + // 单击 homeButton 返回初始位置 + this.viewer.homeButton.viewModel.command.beforeExecute.addEventListener((e) => { + e.cancel = true; + this.viewer.camera.flyTo({ // 指定相机初始位置 - destination: Cesium.Cartesian3.fromDegrees(110, 18, 10000000) + destination: Cesium.Cartesian3.fromDegrees(112, 18, 4000000), + duration: 0.5 }); + }); + + this.viewer.camera.setView({ + // 指定相机初始位置 + destination: Cesium.Cartesian3.fromDegrees(112, 18, 4000000) + }); // 改写 Cesium 原生鼠标滚轮事件，地图缩放改为按下 Ctrl + 鼠标滚轮 modifyCesiumMouseWheel(this.viewer); From 59aba0d333c379d8245377f0b9047de1505efafe Mon Sep 17 00:00:00 2001 From: hym Date: Tue, 15 Oct 2024 16:19:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ougp.ico=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=9C=A8=E6=B5=8F=E8=A7=88=E5=99=A8=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=A0=8F=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 5 +++++ static/images/ougp.ico | Bin 0 -> 2704 bytes 2 files changed, 5 insertions(+) create mode 100644 static/images/ougp.ico diff --git a/index.html b/index.html index 2e99138..76fc0f0 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,11 @@ Deep-Sea Data System + + + + + diff --git a/static/images/ougp.ico b/static/images/ougp.ico new file mode 100644 index 0000000000000000000000000000000000000000..3c3908a4fb20abd9032effb171faf6b897af6070 GIT binary patch literal 2704 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 KMNUMnLSTaYHw?)D literal 0 HcmV?d00001 From 68b6ffcf364dbac37e6b0bef4efee99899508fd6 Mon Sep 17 00:00:00 2001 From: hym Date: Tue, 15 Oct 2024 16:36:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=94=B9=E4=B8=BA=20logo=5Fmap.png?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 76fc0f0..14017b9 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,9 @@ Deep-Sea Data System - - - + + +