From 01ea7ee08e9cc2a3da2b96cffab30c981e33e920 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期一, 08 一月 2024 13:59:53 +0800
Subject: [PATCH] 代码提交
---
src/assets/js/Layer/mapGeo.js | 9 +++++----
static/data/layerData.js | 20 ++++++++++----------
src/components/menu/tools/special copy.vue | 1 +
static/layers.json | 14 ++++++++++++--
src/components/menu/tools/special.vue | 2 ++
src/components/menu/menulist.vue | 5 +----
6 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/assets/js/Layer/mapGeo.js b/src/assets/js/Layer/mapGeo.js
index d96c835..83da005 100644
--- a/src/assets/js/Layer/mapGeo.js
+++ b/src/assets/js/Layer/mapGeo.js
@@ -1,6 +1,6 @@
var source = []
const mapGeo = {
-
+ source1: null,
init(res) {
switch (res.type) {
case "WangGe":
@@ -27,6 +27,7 @@
Viewer.dataSources.remove(Viewer.dataSources.getByName("zhaiHai1")[0])
Viewer.dataSources.remove(Viewer.dataSources.getByName("zhaiHai3")[0])
} else {
+ if (!res.type) return;
Viewer.dataSources.remove(Viewer.dataSources.getByName(res.type)[0])
}
@@ -128,11 +129,11 @@
})
},
addZhuangHaoGeoJson(res) {
-
+
var url = layerData.config.Model_URL + res.urls;
var img = layerData.config.Model_URL + '/Data/img/img1.png';
- var source1 = Cesium.GeoJsonDataSource.load(url)
- source1.then((dataSource) => {
+ Cesium.GeoJsonDataSource.load(url).then((dataSource) => {
+
dataSource.name = res.type
Viewer.dataSources.add(
dataSource
diff --git a/src/components/menu/menulist.vue b/src/components/menu/menulist.vue
index cb0a19f..9b58d12 100644
--- a/src/components/menu/menulist.vue
+++ b/src/components/menu/menulist.vue
@@ -40,10 +40,7 @@
/>
<span>妯″瀷</span>
</div>
- <div class="menubtn" @click="setGridQuery()">
- <img class="bhImg" title="鏍肩綉" src="@/assets/img/right/cx-s.png" />
- <span>鏍肩綉</span>
- </div>
+
<div class="menubtn" @click="setMenuQuery()">
<img class="bhImg" title="鏌ヨ" src="@/assets/img/right/cx-s.png" />
<span>鏌ヨ</span>
diff --git a/src/components/menu/tools/special copy.vue b/src/components/menu/tools/special copy.vue
index 53e8e52..0ca893d 100644
--- a/src/components/menu/tools/special copy.vue
+++ b/src/components/menu/tools/special copy.vue
@@ -632,6 +632,7 @@
lon = Cesium.Math.toDegrees(cartographic.longitude);
lat = Cesium.Math.toDegrees(cartographic.latitude);
} else {
+ debugger
obj = nPickFeature.id.attributes;
lon = nPickFeature.id.positions[0];
lat = nPickFeature.id.positions[1];
diff --git a/src/components/menu/tools/special.vue b/src/components/menu/tools/special.vue
index 59b92cf..0e6951c 100644
--- a/src/components/menu/tools/special.vue
+++ b/src/components/menu/tools/special.vue
@@ -591,6 +591,8 @@
lon = Cesium.Math.toDegrees(cartographic.longitude);
lat = Cesium.Math.toDegrees(cartographic.latitude);
} else {
+
+ console.log(nPickFeature.id)
obj = nPickFeature.id.attributes;
lon = nPickFeature.id.positions[0];
lat = nPickFeature.id.positions[1];
diff --git a/static/data/layerData.js b/static/data/layerData.js
index 4cb67db..a645bc8 100644
--- a/static/data/layerData.js
+++ b/static/data/layerData.js
@@ -1,18 +1,18 @@
var webhost = location.hostname;
var host = location.host;
var web_URL = "http://" + webhost;
-
+
const layerData = {
config: {
- BASE_URL: "http://" + host + "/JiangSu",
+ BASE_URL: "http://192.168.20.83/JiangSu",
img_url: "http://" + host + "/static/image/",
- Model_URL: web_URL + "/JiangSu",
- tdtSl:"http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
- tdtZj:"http://t0.tianditu.com/cva_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=cva&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default.jpg&tk=",
- tdtToken:"94a34772eb88317fcbf8428e10448561",
- olTdtSl:'http://t0.tianditu.com/DataServer?T=cta_w&x={x}&y={y}&l={z}&tk=',
- olTdtBZ:'http://t0.tianditu.com/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk='
+ Model_URL: "http://192.168.20.83/JiangSu",
+ tdtSl: "http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
+ tdtZj: "http://t0.tianditu.com/cva_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=cva&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default.jpg&tk=",
+ tdtToken: "94a34772eb88317fcbf8428e10448561",
+ olTdtSl: 'http://t0.tianditu.com/DataServer?T=cta_w&x={x}&y={y}&l={z}&tk=',
+ olTdtBZ: 'http://t0.tianditu.com/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk='
},
modelData: [
{
@@ -31,7 +31,7 @@
name: '璺殰',
url: '/Data/glb/璺殰.glb',
imgUrl: '璺殰.png'
- }, {
+ }, {
id: 'md4',
name: '鏂藉伐杞﹁締',
url: '/Data/glb/sgcl.glb',
@@ -46,6 +46,6 @@
name: '閿ユ《',
url: '/Data/glb/閿ユ《.glb',
imgUrl: '閿ユ《.png'
- }
+ }
]
}
\ No newline at end of file
diff --git a/static/layers.json b/static/layers.json
index 6f39692..ec928bb 100644
--- a/static/layers.json
+++ b/static/layers.json
@@ -89,7 +89,7 @@
"id": "482040AD1",
"sourceType": "b3dm",
"name": "鏈嶅姟鍖烘ā鍨�",
- "urls": "http://localhost/JiangSu/Data/3dtiles/fwq/tileset.json",
+ "urls": "http://192.168.20.83/JiangSu/Data/3dtiles/fwq/tileset.json",
"checked": true,
"rename": false,
"effectsMaxHeight": 0,
@@ -99,7 +99,17 @@
"id": "482040AD2",
"sourceType": "b3dm",
"name": "鏀惰垂绔欐ā鍨�",
- "urls": "http://localhost/JiangSu/Data/3dtiles/sfz/tileset.json",
+ "urls": "http://192.168.20.83/JiangSu/Data/3dtiles/sfz/tileset.json",
+ "checked": true,
+ "rename": false,
+ "zIndex": 2,
+ "effectsMaxHeight": 0
+ },
+ {
+ "id": "482040AD3",
+ "sourceType": "b3dm",
+ "name": "鎺㈠湴闆疯揪鐐逛簯",
+ "urls": "http://192.168.20.83/JiangSu/Data/3dtiles/lasDianYun/tileset.json",
"checked": true,
"rename": false,
"zIndex": 2,
--
Gitblit v1.9.3