From 6d0428291e1bb86bff1d40f8fe07a305b43ecd4a Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期二, 21 二月 2023 17:15:20 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/components/mapsdk.vue | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index cf8375c..f556173 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -62,10 +62,7 @@
v-if="showCoordLocalBoxDialog"
>
<el-card class="box-card">
- <div
- slot="header"
-
- >
+ <div slot="header">
<span>鍧愭爣瀹氫綅</span>
<div style="float: right; cursor: pointer">
<i
@@ -166,10 +163,7 @@
>
</el-table-column>
</el-table>
- <div
- style="margin-top: 10px"
- class="pagination_box"
- >
+ <div class="pagination_box">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -358,7 +352,9 @@
pathStart: null,
pathEnd: null,
pathData: null,
-
+ layer1: null,
+ layer2: null,
+ layer3: null,
isActive: false,
isMenuLayer: true,
selFrom: {},
@@ -383,6 +379,7 @@
//鍦板浘鍒濆鍖�
window.sgworld = new SmartEarth.SGWorld("mapdiv", {
+ url:SmartEarthRootUrl+"Workers/image/earth.jpg",
licenseServer: window.sceneConfig.licenseServer,
})
@@ -401,18 +398,18 @@
destination: Cesium.Cartesian3.fromDegrees(110, 33, 8000000),
});
- Viewer.imageryLayers.addImageryProvider(
+ this.layer1 = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: gaoDeBaseUrl[0].url,
})
)
- Viewer.imageryLayers.addImageryProvider(
+ this.layer2 = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: gaoDeBaseUrl[1].url,
})
)
- Viewer.imageryLayers.addImageryProvider(
+ this.layer3 = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: gaoDeBaseUrl[2].url,
})
@@ -437,7 +434,8 @@
//姣斾緥灏�
window.sgworld.navControl("scale", false)
//寮�鍚繁搴︽娴�
- sgworld.Analysis.depthTestAgainstTerrain(true)
+ // sgworld.Analysis.depthTestAgainstTerrain(true)
+ Viewer.scene.globe.depthTestAgainstTerrain = true;
//褰卞儚瀵规瘮璁剧疆
// var base = {
// url: 'https://a.tile.openstreetmap.org/',
@@ -453,15 +451,15 @@
// );
// openStreetMap.item.show = false;
- Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
- url: demLayer,
- })
- // var option = {
- // url: window.sceneConfig.SGUrl,
- // layerName: window.sceneConfig.mptName,
- // requestVertexNormals: true
- // }
- // sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+ // Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
+ // url: demLayer,
+ // })
+ var option = {
+ url: window.sceneConfig.SGUrl,
+ layerName: window.sceneConfig.mptName,
+ requestVertexNormals: true
+ }
+ sgworld.Creator.sfsterrainprovider("", option, "", true, "");
window.elevationTool = new SmartEarth.ElevationTool(window.sgworld)
elevationTool.setContourColor("#F1D487")
@@ -484,13 +482,21 @@
},
setLayerVisible() {
if (this.isActive == true) {
- Viewer.imageryLayers._layers[1].show = true
- Viewer.imageryLayers._layers[2].show = false
- Viewer.imageryLayers._layers[3].show = false
+ // Viewer.imageryLayers._layers[1].show = true
+ // Viewer.imageryLayers._layers[2].show = false
+ // Viewer.imageryLayers._layers[3].show = false
+
+ Viewer.imageryLayers.lower(this.layer2);
+ Viewer.imageryLayers.lower(this.layer3);
+
} else {
- Viewer.imageryLayers._layers[1].show = false
- Viewer.imageryLayers._layers[2].show = true
- Viewer.imageryLayers._layers[3].show = true
+
+ Viewer.imageryLayers.raise(this.layer3);
+ Viewer.imageryLayers.raise(this.layer2);
+
+ // Viewer.imageryLayers._layers[1].show = false
+ // Viewer.imageryLayers._layers[2].show = true
+ // Viewer.imageryLayers._layers[3].show = true
}
},
//鏄剧ず寮圭獥
@@ -665,7 +671,7 @@
return false
}
})
- this.clearPathAll(3)
+ this.clearPathAll(3)
var start = this.pathFrom.lon.split(",")
var end = this.pathFrom.lat.split(",")
var startData = {
@@ -674,7 +680,7 @@
x2: parseFloat(end[0]),
y2: parseFloat(end[1]),
}
-
+
const data = await comprehensive_selectRoute(startData)
if (data.code != 200) {
return this.$message.error("鏁版嵁璇锋眰澶辫触")
@@ -896,15 +902,12 @@
right: 1%;
bottom: 1%;
}
-
+
.box-card {
-
opacity: 0.85;
border: 1px solid rgba(32, 160, 255, 0.6);
-
}
.menu_Top {
-
opacity: 0.85;
width: 100%;
padding: 1%;
--
Gitblit v1.9.3