diff --git a/.env.production b/.env.production index 88f3ebe..7f7bb43 100644 --- a/.env.production +++ b/.env.production @@ -6,6 +6,6 @@ # 新烽产品系统/生产环境 VITE_APP_BASE_API = '/prod-api' - +VITE_PROJECT_ISERVER_URL = 'http://192.168.1.34:8090' # 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/.env.production b/.env.production index 88f3ebe..7f7bb43 100644 --- a/.env.production +++ b/.env.production @@ -6,6 +6,6 @@ # 新烽产品系统/生产环境 VITE_APP_BASE_API = '/prod-api' - +VITE_PROJECT_ISERVER_URL = 'http://192.168.1.34:8090' # 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue index 36223d8..6c4846a 100644 --- a/src/components/Map/index.vue +++ b/src/components/Map/index.vue @@ -125,8 +125,8 @@ //{ key: 4, name: "清除" }, ], baseMap:[ - {id:'1',name:'影像图',url:'http://192.168.1.34:8090/iserver/services/map-arcgis-5/rest/maps/图层'}, - {id:'2',name:'注记',url:'http://192.168.1.34:8090/iserver/services/map-arcgis-2/rest/maps/图层'}, + {id:'1',name:'影像图',url:import.meta.env.VITE_PROJECT_ISERVER_URL + '/iserver/services/map-arcgis-15/rest/maps/图层'}, + {id:'2',name:'注记',url: import.meta.env.VITE_PROJECT_ISERVER_URL + '/iserver/services/map-arcgis-3/rest/maps/图层'}, ] }); const { mapConfig, mapTools } = toRefs(state); @@ -197,16 +197,15 @@ // let coordinates = props.isEdit && newfiberMap.closeEntityEdit(); } }); - - state.baseMap.forEach(i => { - let imagery = newfiberMap.getMap().imageryLayers.addImageryProvider(new SuperMap3D.SuperMapImageryProvider({url : i.url})); - imagery.alpha = 1.0; - // 缩放到图层可见 - newfiberMap.getMap().zoomTo(imagery); - }) -/* newfiberMap.loadMtsLayer({ url:'http://192.168.1.38:8900/offlineMap/mapabc/overlay/{z}/{x}/{y}.png',tilingScheme:new Cesium.GCJToMercatorTilingScheme() }) - newfiberMap.loadMtsLayer({ url:'http://192.168.1.38:8900/offlineMap/mapabc/satellite/{z}/{x}/{y}.png',tilingScheme:new Cesium.GCJToMercatorTilingScheme() })*/ -/* if (props.isReloadTDT) { + if(import.meta.env.VITE_PROJECT_ISERVER_URL){ + state.baseMap.forEach(i => { + let imagery = newfiberMap.getMap().imageryLayers.addImageryProvider(new SuperMap3D.SuperMapImageryProvider({url : i.url})); + imagery.alpha = 1.0; + // 缩放到图层可见 + newfiberMap.getMap().zoomTo(imagery); + }) + }else{ + if (props.isReloadTDT) { newfiberMap.setBaseMapByEnum( [ NewFiberMap.Enum.BaseMap.AMAP_VECTOR_V2, @@ -219,9 +218,7 @@ } else { newfiberMap.setBaseMapByEnum( [NewFiberMap.Enum.BaseMap.MAPBOX_STYLE_VECTOR], - [], - { style: { background: { @@ -1956,7 +1953,12 @@ }, } ); - }*/ + } + } + +/* newfiberMap.loadMtsLayer({ url:'http://192.168.1.38:8900/offlineMap/mapabc/overlay/{z}/{x}/{y}.png',tilingScheme:new Cesium.GCJToMercatorTilingScheme() }) + newfiberMap.loadMtsLayer({ url:'http://192.168.1.38:8900/offlineMap/mapabc/satellite/{z}/{x}/{y}.png',tilingScheme:new Cesium.GCJToMercatorTilingScheme() })*/ + newfiberMap.setView(center); if (props.formData) { intData(props.formData);