diff --git a/src/assets/newImgs/building_wall.png b/src/assets/newImgs/building_wall.png new file mode 100644 index 0000000..bbf204b --- /dev/null +++ b/src/assets/newImgs/building_wall.png Binary files differ diff --git a/src/assets/newImgs/building_wall.png b/src/assets/newImgs/building_wall.png new file mode 100644 index 0000000..bbf204b --- /dev/null +++ b/src/assets/newImgs/building_wall.png Binary files differ diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js index 9f9762f..a321fc2 100644 --- a/src/utils/GISdocument/mapboxVectorLayer.js +++ b/src/utils/GISdocument/mapboxVectorLayer.js @@ -446,9 +446,7 @@ } static remove3Dtiles() { - let deckOverlay = null; - deckOverlay = newfiberMapbox.map._controls.filter(i => i.constructor.name == 'MapboxOverlay')[0]; - deckOverlay && deckOverlay.setProps({ layers: [] }); + newfiberMapbox.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] })); } static load3DTiles(name, id, url) { diff --git a/src/assets/newImgs/building_wall.png b/src/assets/newImgs/building_wall.png new file mode 100644 index 0000000..bbf204b --- /dev/null +++ b/src/assets/newImgs/building_wall.png Binary files differ diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js index 9f9762f..a321fc2 100644 --- a/src/utils/GISdocument/mapboxVectorLayer.js +++ b/src/utils/GISdocument/mapboxVectorLayer.js @@ -446,9 +446,7 @@ } static remove3Dtiles() { - let deckOverlay = null; - deckOverlay = newfiberMapbox.map._controls.filter(i => i.constructor.name == 'MapboxOverlay')[0]; - deckOverlay && deckOverlay.setProps({ layers: [] }); + newfiberMapbox.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] })); } static load3DTiles(name, id, url) { diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4538d20..9ccce42 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,10 +1,10 @@ @@ -20,6 +20,7 @@ panorama: null, poiCircle: null, poiImages: [], + poiData: [], }); // 初始化街景地图 const initePanoramaMap = () => { @@ -35,46 +36,64 @@ }); }; //根据中心点查找poi -// const searchPoiByLonlat = async () => { -// let poiData = await request({ -// url: `/bdApi/baiduservice/placeSearch`, -// method: 'GET', -// params: { -// location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, -// radius: 200, -// query: '公交站$商场$著名景点$学校', -// }, -// }); -// if (poiData & poiData.data.length) { -// console.log('poiData---', poiData); -// element.image = getStreetImg([element.location.lng, element.location.lat]); -// poiData.data.forEach(element => { -// AllData.poiImages.push({ -// name: element.name, -// lonlat: [element.location.lng, element.location.lat], -// imagesUrl: element.image, -// }); -// }); -// } -// }; -//获取全景静态图 -const getStreetImg = async lonlat => { - let data = await request({ - url: `/bdApi/baiduservice/panorama`, +const searchPoiByLonlat = async () => { + AllData.poiImages = []; + let poiData = await request({ + url: `/bdApi/baiduservice/placeSearch`, method: 'GET', params: { - location: `${lonlat[0]},${lonlat[1]}`, - fov: 180, - height: 256, - width: 512, + location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, + radius: 1000, + query: '公交站$商场$著名景点$学校', }, }); - if (data && data.data) { - data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; - return data.data.base64; + console.log(poiData, 'poiDatapoiDatapoiData'); + if (poiData && poiData.data.length) { + AllData.poiData = poiData.data; + // console.log('poiData---', poiData); + // poiData.data.forEach(element => { + // console.log(element, 'elementelementelement'); + // getStreetImg([element.location.lng, element.location.lat]); + // console.log(a.value, '111111111----'); + // AllData.poiImages.push({ + // name: element.name, + // lonlat: [element.location.lng, element.location.lat], + // imagesUrl: data.data.base64, + // }); + // }); + //console.log('AllData.poiData---', AllData.poiData); + getStreetImg(); } }; +const a = ref(''); +//获取全景静态图 +const getStreetImg = async () => { + AllData.poiImages = []; + console.log('AllData.poiData---', AllData.poiData); + AllData.poiData.forEach(async element => { + let data = await request({ + url: `/bdApi//baiduservice/panorama`, + method: 'GET', + params: { + location: `${element.location.lng},${element.location.lat}`, + fov: 180, + height: 256, + width: 512, + }, + }); + if (data && data.data) { + data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; + AllData.poiImages.push({ + name: element.name, + lonlat: [element.location.lng, element.location.lat], + imagesUrl: data.data.base64, + }); + } + }); + console.log('AllData.poiImages---', AllData.poiImages); +}; + // 全局事件监听 const showAllStreet = e => { console.log('streetPosition---', e); @@ -94,21 +113,22 @@ // console.log('pos---', pos); // // AllData.panorama.setPosition(new BMapGL.Point(pos.lng, pos.lat)); // }); - console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); + console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); showAllStreet(useDialogTabs.pointLocation); - bus.on('streetPosition', e => { - showAllStreet(e); - // console.log('streetPosition---', e); - // let position_Street = turf.point(e); - // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); - // AllData.poiCircle = position_Street.geometry.coordinates; - // AllData.panorama.setPosition( - // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - // ); - // //searchPoiByLonlat(); - // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); - }); + + // bus.on('streetPosition', e => { + // showAllStreet(e); + // // console.log('streetPosition---', e); + // // let position_Street = turf.point(e); + // // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); + // // AllData.poiCircle = position_Street.geometry.coordinates; + // // AllData.panorama.setPosition( + // // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + // // ); + // // //searchPoiByLonlat(); + // // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); + // }); }); console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) diff --git a/src/assets/newImgs/building_wall.png b/src/assets/newImgs/building_wall.png new file mode 100644 index 0000000..bbf204b --- /dev/null +++ b/src/assets/newImgs/building_wall.png Binary files differ diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js index 9f9762f..a321fc2 100644 --- a/src/utils/GISdocument/mapboxVectorLayer.js +++ b/src/utils/GISdocument/mapboxVectorLayer.js @@ -446,9 +446,7 @@ } static remove3Dtiles() { - let deckOverlay = null; - deckOverlay = newfiberMapbox.map._controls.filter(i => i.constructor.name == 'MapboxOverlay')[0]; - deckOverlay && deckOverlay.setProps({ layers: [] }); + newfiberMapbox.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] })); } static load3DTiles(name, id, url) { diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4538d20..9ccce42 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,10 +1,10 @@ @@ -20,6 +20,7 @@ panorama: null, poiCircle: null, poiImages: [], + poiData: [], }); // 初始化街景地图 const initePanoramaMap = () => { @@ -35,46 +36,64 @@ }); }; //根据中心点查找poi -// const searchPoiByLonlat = async () => { -// let poiData = await request({ -// url: `/bdApi/baiduservice/placeSearch`, -// method: 'GET', -// params: { -// location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, -// radius: 200, -// query: '公交站$商场$著名景点$学校', -// }, -// }); -// if (poiData & poiData.data.length) { -// console.log('poiData---', poiData); -// element.image = getStreetImg([element.location.lng, element.location.lat]); -// poiData.data.forEach(element => { -// AllData.poiImages.push({ -// name: element.name, -// lonlat: [element.location.lng, element.location.lat], -// imagesUrl: element.image, -// }); -// }); -// } -// }; -//获取全景静态图 -const getStreetImg = async lonlat => { - let data = await request({ - url: `/bdApi/baiduservice/panorama`, +const searchPoiByLonlat = async () => { + AllData.poiImages = []; + let poiData = await request({ + url: `/bdApi/baiduservice/placeSearch`, method: 'GET', params: { - location: `${lonlat[0]},${lonlat[1]}`, - fov: 180, - height: 256, - width: 512, + location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, + radius: 1000, + query: '公交站$商场$著名景点$学校', }, }); - if (data && data.data) { - data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; - return data.data.base64; + console.log(poiData, 'poiDatapoiDatapoiData'); + if (poiData && poiData.data.length) { + AllData.poiData = poiData.data; + // console.log('poiData---', poiData); + // poiData.data.forEach(element => { + // console.log(element, 'elementelementelement'); + // getStreetImg([element.location.lng, element.location.lat]); + // console.log(a.value, '111111111----'); + // AllData.poiImages.push({ + // name: element.name, + // lonlat: [element.location.lng, element.location.lat], + // imagesUrl: data.data.base64, + // }); + // }); + //console.log('AllData.poiData---', AllData.poiData); + getStreetImg(); } }; +const a = ref(''); +//获取全景静态图 +const getStreetImg = async () => { + AllData.poiImages = []; + console.log('AllData.poiData---', AllData.poiData); + AllData.poiData.forEach(async element => { + let data = await request({ + url: `/bdApi//baiduservice/panorama`, + method: 'GET', + params: { + location: `${element.location.lng},${element.location.lat}`, + fov: 180, + height: 256, + width: 512, + }, + }); + if (data && data.data) { + data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; + AllData.poiImages.push({ + name: element.name, + lonlat: [element.location.lng, element.location.lat], + imagesUrl: data.data.base64, + }); + } + }); + console.log('AllData.poiImages---', AllData.poiImages); +}; + // 全局事件监听 const showAllStreet = e => { console.log('streetPosition---', e); @@ -94,21 +113,22 @@ // console.log('pos---', pos); // // AllData.panorama.setPosition(new BMapGL.Point(pos.lng, pos.lat)); // }); - console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); + console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); showAllStreet(useDialogTabs.pointLocation); - bus.on('streetPosition', e => { - showAllStreet(e); - // console.log('streetPosition---', e); - // let position_Street = turf.point(e); - // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); - // AllData.poiCircle = position_Street.geometry.coordinates; - // AllData.panorama.setPosition( - // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - // ); - // //searchPoiByLonlat(); - // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); - }); + + // bus.on('streetPosition', e => { + // showAllStreet(e); + // // console.log('streetPosition---', e); + // // let position_Street = turf.point(e); + // // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); + // // AllData.poiCircle = position_Street.geometry.coordinates; + // // AllData.panorama.setPosition( + // // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + // // ); + // // //searchPoiByLonlat(); + // // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); + // }); }); console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) diff --git a/src/views/oneMap/FloodStuationReview/xqRightBox.vue b/src/views/oneMap/FloodStuationReview/xqRightBox.vue index b525a09..4590089 100644 --- a/src/views/oneMap/FloodStuationReview/xqRightBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqRightBox.vue @@ -267,7 +267,7 @@ function jqdtclick(val) { jqdtname.value = val.name; - if (jqdtname.value == '') { + if (jqdtname.value == '已处理') { problemList.value = [ { remark: '雨水箅子堵塞', diff --git a/src/assets/newImgs/building_wall.png b/src/assets/newImgs/building_wall.png new file mode 100644 index 0000000..bbf204b --- /dev/null +++ b/src/assets/newImgs/building_wall.png Binary files differ diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js index 9f9762f..a321fc2 100644 --- a/src/utils/GISdocument/mapboxVectorLayer.js +++ b/src/utils/GISdocument/mapboxVectorLayer.js @@ -446,9 +446,7 @@ } static remove3Dtiles() { - let deckOverlay = null; - deckOverlay = newfiberMapbox.map._controls.filter(i => i.constructor.name == 'MapboxOverlay')[0]; - deckOverlay && deckOverlay.setProps({ layers: [] }); + newfiberMapbox.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] })); } static load3DTiles(name, id, url) { diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4538d20..9ccce42 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,10 +1,10 @@ @@ -20,6 +20,7 @@ panorama: null, poiCircle: null, poiImages: [], + poiData: [], }); // 初始化街景地图 const initePanoramaMap = () => { @@ -35,46 +36,64 @@ }); }; //根据中心点查找poi -// const searchPoiByLonlat = async () => { -// let poiData = await request({ -// url: `/bdApi/baiduservice/placeSearch`, -// method: 'GET', -// params: { -// location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, -// radius: 200, -// query: '公交站$商场$著名景点$学校', -// }, -// }); -// if (poiData & poiData.data.length) { -// console.log('poiData---', poiData); -// element.image = getStreetImg([element.location.lng, element.location.lat]); -// poiData.data.forEach(element => { -// AllData.poiImages.push({ -// name: element.name, -// lonlat: [element.location.lng, element.location.lat], -// imagesUrl: element.image, -// }); -// }); -// } -// }; -//获取全景静态图 -const getStreetImg = async lonlat => { - let data = await request({ - url: `/bdApi/baiduservice/panorama`, +const searchPoiByLonlat = async () => { + AllData.poiImages = []; + let poiData = await request({ + url: `/bdApi/baiduservice/placeSearch`, method: 'GET', params: { - location: `${lonlat[0]},${lonlat[1]}`, - fov: 180, - height: 256, - width: 512, + location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, + radius: 1000, + query: '公交站$商场$著名景点$学校', }, }); - if (data && data.data) { - data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; - return data.data.base64; + console.log(poiData, 'poiDatapoiDatapoiData'); + if (poiData && poiData.data.length) { + AllData.poiData = poiData.data; + // console.log('poiData---', poiData); + // poiData.data.forEach(element => { + // console.log(element, 'elementelementelement'); + // getStreetImg([element.location.lng, element.location.lat]); + // console.log(a.value, '111111111----'); + // AllData.poiImages.push({ + // name: element.name, + // lonlat: [element.location.lng, element.location.lat], + // imagesUrl: data.data.base64, + // }); + // }); + //console.log('AllData.poiData---', AllData.poiData); + getStreetImg(); } }; +const a = ref(''); +//获取全景静态图 +const getStreetImg = async () => { + AllData.poiImages = []; + console.log('AllData.poiData---', AllData.poiData); + AllData.poiData.forEach(async element => { + let data = await request({ + url: `/bdApi//baiduservice/panorama`, + method: 'GET', + params: { + location: `${element.location.lng},${element.location.lat}`, + fov: 180, + height: 256, + width: 512, + }, + }); + if (data && data.data) { + data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; + AllData.poiImages.push({ + name: element.name, + lonlat: [element.location.lng, element.location.lat], + imagesUrl: data.data.base64, + }); + } + }); + console.log('AllData.poiImages---', AllData.poiImages); +}; + // 全局事件监听 const showAllStreet = e => { console.log('streetPosition---', e); @@ -94,21 +113,22 @@ // console.log('pos---', pos); // // AllData.panorama.setPosition(new BMapGL.Point(pos.lng, pos.lat)); // }); - console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); + console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); showAllStreet(useDialogTabs.pointLocation); - bus.on('streetPosition', e => { - showAllStreet(e); - // console.log('streetPosition---', e); - // let position_Street = turf.point(e); - // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); - // AllData.poiCircle = position_Street.geometry.coordinates; - // AllData.panorama.setPosition( - // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - // ); - // //searchPoiByLonlat(); - // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); - }); + + // bus.on('streetPosition', e => { + // showAllStreet(e); + // // console.log('streetPosition---', e); + // // let position_Street = turf.point(e); + // // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); + // // AllData.poiCircle = position_Street.geometry.coordinates; + // // AllData.panorama.setPosition( + // // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + // // ); + // // //searchPoiByLonlat(); + // // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); + // }); }); console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) diff --git a/src/views/oneMap/FloodStuationReview/xqRightBox.vue b/src/views/oneMap/FloodStuationReview/xqRightBox.vue index b525a09..4590089 100644 --- a/src/views/oneMap/FloodStuationReview/xqRightBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqRightBox.vue @@ -267,7 +267,7 @@ function jqdtclick(val) { jqdtname.value = val.name; - if (jqdtname.value == '') { + if (jqdtname.value == '已处理') { problemList.value = [ { remark: '雨水箅子堵塞', diff --git a/src/views/oneMap/map/newfiberMapBox.vue b/src/views/oneMap/map/newfiberMapBox.vue index a9e1b55..d06d661 100644 --- a/src/views/oneMap/map/newfiberMapBox.vue +++ b/src/views/oneMap/map/newfiberMapBox.vue @@ -11,6 +11,7 @@ import yanAnRoad from '@/assets/yanAnRoad.json'; import yanAnWater from '@/assets/yanAnWater.json'; import building_icon from '@/assets/newImgs/building_icon.png'; +import building_wall from '@/assets/newImgs/building_wall.png'; export default { components: {}, props: { @@ -491,7 +492,7 @@ source: "buildingSource", // //绘画功能 paint: { - 'fill-extrusion-color': 'rgba(0,63,95,1)', + 'fill-extrusion-color': 'rgba(100,100,100,1)', 'fill-extrusion-height': ['+',['get', 'height_3'],0.1], 'fill-extrusion-base': ['get', 'height_3'], 'fill-extrusion-opacity': 1, diff --git a/src/assets/newImgs/building_wall.png b/src/assets/newImgs/building_wall.png new file mode 100644 index 0000000..bbf204b --- /dev/null +++ b/src/assets/newImgs/building_wall.png Binary files differ diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js index 9f9762f..a321fc2 100644 --- a/src/utils/GISdocument/mapboxVectorLayer.js +++ b/src/utils/GISdocument/mapboxVectorLayer.js @@ -446,9 +446,7 @@ } static remove3Dtiles() { - let deckOverlay = null; - deckOverlay = newfiberMapbox.map._controls.filter(i => i.constructor.name == 'MapboxOverlay')[0]; - deckOverlay && deckOverlay.setProps({ layers: [] }); + newfiberMapbox.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] })); } static load3DTiles(name, id, url) { diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4538d20..9ccce42 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,10 +1,10 @@ @@ -20,6 +20,7 @@ panorama: null, poiCircle: null, poiImages: [], + poiData: [], }); // 初始化街景地图 const initePanoramaMap = () => { @@ -35,46 +36,64 @@ }); }; //根据中心点查找poi -// const searchPoiByLonlat = async () => { -// let poiData = await request({ -// url: `/bdApi/baiduservice/placeSearch`, -// method: 'GET', -// params: { -// location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, -// radius: 200, -// query: '公交站$商场$著名景点$学校', -// }, -// }); -// if (poiData & poiData.data.length) { -// console.log('poiData---', poiData); -// element.image = getStreetImg([element.location.lng, element.location.lat]); -// poiData.data.forEach(element => { -// AllData.poiImages.push({ -// name: element.name, -// lonlat: [element.location.lng, element.location.lat], -// imagesUrl: element.image, -// }); -// }); -// } -// }; -//获取全景静态图 -const getStreetImg = async lonlat => { - let data = await request({ - url: `/bdApi/baiduservice/panorama`, +const searchPoiByLonlat = async () => { + AllData.poiImages = []; + let poiData = await request({ + url: `/bdApi/baiduservice/placeSearch`, method: 'GET', params: { - location: `${lonlat[0]},${lonlat[1]}`, - fov: 180, - height: 256, - width: 512, + location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`, + radius: 1000, + query: '公交站$商场$著名景点$学校', }, }); - if (data && data.data) { - data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; - return data.data.base64; + console.log(poiData, 'poiDatapoiDatapoiData'); + if (poiData && poiData.data.length) { + AllData.poiData = poiData.data; + // console.log('poiData---', poiData); + // poiData.data.forEach(element => { + // console.log(element, 'elementelementelement'); + // getStreetImg([element.location.lng, element.location.lat]); + // console.log(a.value, '111111111----'); + // AllData.poiImages.push({ + // name: element.name, + // lonlat: [element.location.lng, element.location.lat], + // imagesUrl: data.data.base64, + // }); + // }); + //console.log('AllData.poiData---', AllData.poiData); + getStreetImg(); } }; +const a = ref(''); +//获取全景静态图 +const getStreetImg = async () => { + AllData.poiImages = []; + console.log('AllData.poiData---', AllData.poiData); + AllData.poiData.forEach(async element => { + let data = await request({ + url: `/bdApi//baiduservice/panorama`, + method: 'GET', + params: { + location: `${element.location.lng},${element.location.lat}`, + fov: 180, + height: 256, + width: 512, + }, + }); + if (data && data.data) { + data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; + AllData.poiImages.push({ + name: element.name, + lonlat: [element.location.lng, element.location.lat], + imagesUrl: data.data.base64, + }); + } + }); + console.log('AllData.poiImages---', AllData.poiImages); +}; + // 全局事件监听 const showAllStreet = e => { console.log('streetPosition---', e); @@ -94,21 +113,22 @@ // console.log('pos---', pos); // // AllData.panorama.setPosition(new BMapGL.Point(pos.lng, pos.lat)); // }); - console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); + console.log('useDialogTabs.pointLocation',useDialogTabs.pointLocation); showAllStreet(useDialogTabs.pointLocation); - bus.on('streetPosition', e => { - showAllStreet(e); - // console.log('streetPosition---', e); - // let position_Street = turf.point(e); - // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); - // AllData.poiCircle = position_Street.geometry.coordinates; - // AllData.panorama.setPosition( - // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - // ); - // //searchPoiByLonlat(); - // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); - }); + + // bus.on('streetPosition', e => { + // showAllStreet(e); + // // console.log('streetPosition---', e); + // // let position_Street = turf.point(e); + // // gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); + // // AllData.poiCircle = position_Street.geometry.coordinates; + // // AllData.panorama.setPosition( + // // new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + // // ); + // // //searchPoiByLonlat(); + // // gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); + // }); }); console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) console.log("🚀 ~ onMounted ~ useDialogTabs.pointLocation:", useDialogTabs.pointLocation) diff --git a/src/views/oneMap/FloodStuationReview/xqRightBox.vue b/src/views/oneMap/FloodStuationReview/xqRightBox.vue index b525a09..4590089 100644 --- a/src/views/oneMap/FloodStuationReview/xqRightBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqRightBox.vue @@ -267,7 +267,7 @@ function jqdtclick(val) { jqdtname.value = val.name; - if (jqdtname.value == '') { + if (jqdtname.value == '已处理') { problemList.value = [ { remark: '雨水箅子堵塞', diff --git a/src/views/oneMap/map/newfiberMapBox.vue b/src/views/oneMap/map/newfiberMapBox.vue index a9e1b55..d06d661 100644 --- a/src/views/oneMap/map/newfiberMapBox.vue +++ b/src/views/oneMap/map/newfiberMapBox.vue @@ -11,6 +11,7 @@ import yanAnRoad from '@/assets/yanAnRoad.json'; import yanAnWater from '@/assets/yanAnWater.json'; import building_icon from '@/assets/newImgs/building_icon.png'; +import building_wall from '@/assets/newImgs/building_wall.png'; export default { components: {}, props: { @@ -491,7 +492,7 @@ source: "buildingSource", // //绘画功能 paint: { - 'fill-extrusion-color': 'rgba(0,63,95,1)', + 'fill-extrusion-color': 'rgba(100,100,100,1)', 'fill-extrusion-height': ['+',['get', 'height_3'],0.1], 'fill-extrusion-base': ['get', 'height_3'], 'fill-extrusion-opacity': 1, diff --git a/vite.config.js b/vite.config.js index a500b18..cfc3f34 100644 --- a/vite.config.js +++ b/vite.config.js @@ -89,7 +89,7 @@ }, //百度全景 '/bdApi': { - // target: 'http://192.168.16.34:8105/', //测试服务 + //target: 'http://192.168.16.34:8105/', //测试服务 target: 'https://server2.wh-nf.cn:8088/prod-api/bdApi/', //测试服务 changeOrigin: true, logLevel: 'debug',