From 1975ee2d32b8f5c86791f3a50ccd08eb59b6bf70 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Mar 2023 08:47:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/components/map/index.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index df0ce01..e232646 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -74,8 +74,6 @@
</template>
<script>
-
-
let tile3DUrl = ''
if (process.env.NODE_ENV == 'development') {
@@ -191,8 +189,6 @@
import videoListPopup from './components/videoListPopup.vue'
import yToolTip from './components/yToolTip.vue'
-
-
export default {
name: 'mapBox',
@@ -220,6 +216,7 @@
computed: {
},
+
mounted () {
if (global.viewer != null) {
global.viewer = null
@@ -306,21 +303,21 @@
that.switchImg()
// 外网
- // global.viewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
- // url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
- // subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
- // format: 'image/jpeg',
- // show: true,
- // maximumLevel: 18
- // })
- // )
+ global.viewer.imageryLayers.addImageryProvider(
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
+ show: true,
+ maximumLevel: 18
+ })
+ )
- // global.viewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
- // url: '/sryx/{z}/{x}/{y}.png',
- // })
- // )
+ global.viewer.imageryLayers.addImageryProvider(
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: '/sryx/{z}/{x}/{y}.png',
+ })
+ )
// 设置地图初始位置，角度等
global.viewer.camera.setView({
@@ -418,7 +415,7 @@
// global.viewer.scene.morphTo2D(1)
// 清除控制台
- console.clear()
+ // console.clear()
function isEleFullScreen () {
const fullScreenEle =
@@ -561,7 +558,7 @@
this.removeMxTileset(`sdTilesetLayer${item}`, this.housingIndent)
})
- // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
+ this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
if (this.tilesetLayerType == type) {
this.tilesetLayerType = ''
@@ -1006,7 +1003,10 @@
* @param {*}
*/
showHouse3D (positions, minHeight, maxHeight) {
- flootEntitysEntites.removeAll()
+ console.log('showHouse3D被调用！',positions,111);
+ if(flootEntitysEntites!=null){
+ flootEntitysEntites.removeAll()
+ }
let housePositions = JSON.parse(positions).coordinates[0]
let floorPositions = housePositions.reduce((prev, curr) => {
--
Gitblit v1.9.3