diff --git a/.env.development b/.env.development index 565b6dd..11bdbf4 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ NODE_ENV = 'development' -VUE_APP_API_URL = 'http://114.66.57.139:8090' +VUE_APP_API_URL = 'http://110.42.57.178:8090' VUE_APP_MESSAGE_SDK_DEBUG = true \ No newline at end of file diff --git a/public/config.js b/public/config.js index b45a662..55ca611 100644 --- a/public/config.js +++ b/public/config.js @@ -29,6 +29,6 @@ window.mapConfig = { vectorLayer: "vec", //白色底图 ciatorLayer: "cia", //默认注记 // 地图地址配置 - mapUrl: - "http://t{0-7}.tianditu.gov.cn/${layerType}_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=${layerType}&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tiandituKey}" + mapUrl: "http://114.66.59.70:8098/vec/{z}/{x}/{y}.png", // 底图 + mapUrl1: "http://114.66.59.70:8098/cia/{z}/{x}/{y}.png" // 注记 }; diff --git a/src/views/contentData/LeftSidebar/index.vue b/src/views/contentData/LeftSidebar/index.vue index c40ba9d..6258820 100644 --- a/src/views/contentData/LeftSidebar/index.vue +++ b/src/views/contentData/LeftSidebar/index.vue @@ -357,9 +357,10 @@ export default { const match = newVal.some((item) => positionID.includes(item.positionId) ); - console.log(match, "match"); + // console.log(match, "match"); if (match) { newVal.forEach((newItem) => { + console.log(newItem.BatchId, "newItem.BatchId"); if ( newItem.drone_lon !== 0 && newItem.drone_lat !== 0 && @@ -673,7 +674,7 @@ export default { return setInterval(() => { if (item.currTime > 0) { item.currTime--; - console.log(item.currTime, "item.currTime"); + // console.log(item.currTime, "item.currTime"); // 更新显示时间(可选) const index = this.drones.findIndex( (d) => d.BatchId === item.BatchId diff --git a/src/views/mapControl/index.vue b/src/views/mapControl/index.vue index e0a8c40..4d6eb0f 100644 --- a/src/views/mapControl/index.vue +++ b/src/views/mapControl/index.vue @@ -329,7 +329,13 @@ export default { visible: true, name: title, source: new XYZ({ - url: window.mapConfig.mapUrl, + // url: window.mapConfig.mapUrl, + url: + layerType === "vec" + ? window.mapConfig.mapUrl + : layerType === "cia" + ? window.mapConfig.mapUrl1 + : `http://t{0-7}.tianditu.gov.cn/${layerType}_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=${layerType}&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tiandituKey}`, tileLoadFunction: filter ? (imageTile, src) => { const img = new Image();