fix: BUG修改

This commit is contained in:
kun 2023-08-10 18:28:19 +08:00
parent 0b4ba8717f
commit e3d4cfd1a1
2 changed files with 59 additions and 55 deletions

View File

@ -6,8 +6,9 @@
<p @click="onClose">x</p> <p @click="onClose">x</p>
</div> </div>
<div class="info-top"> <div class="info-top">
<div>项目负责人{{ infoWindowData?.projectManage }}</div> <div>项目造价{{ infoWindowData?.engineering_cost ? infoWindowData?.engineering_cost : 0 }}万元</div>
<div class="ellipsisName">项目地址{{ infoWindowData.projectAddress }}</div> <div>项目面积{{ infoWindowData?.engineering_area ? infoWindowData?.engineering_area : 0 }}</div>
<div class="ellipsisName">项目地址{{ infoWindowData.address }}</div>
</div> </div>
</div> </div>
</template> </template>
@ -109,59 +110,62 @@ const addMarker = () => {
return; return;
} }
console.log(props.projectData, "------------------"); console.log(props.projectData, "------------------");
const createMarkerImage = (state: string) => new URL(`../../../../../../assets/images/hzImg/xm/${state}`, import.meta.url).href; // props.projectData.map((item, index) => {
let myIcon = new BMapGL.Icon(createMarkerImage("marker.png"), new BMapGL.Size(80, 80), { const createMarkerImage = (state: string) =>
imageSize: new BMapGL.Size(40, 40), new URL(`../../../../../../assets/images/hzImg/xm/${state}`, import.meta.url).href; //
imageOffset: new BMapGL.Size(0, 0 - 25) // let myIcon = new BMapGL.Icon(createMarkerImage("marker.png"), new BMapGL.Size(80, 80), {
}); imageSize: new BMapGL.Size(40, 40),
let point = new BMapGL.Point(114.272994, 23.032578); // imageOffset: new BMapGL.Size(0, 0 - 25) //
let marker = new BMapGL.Marker(point, { icon: myIcon }); //
map.value.addOverlay(marker); //
//marker
marker.addEventListener("click", async function () {
// markerList.value = markerList.value.map(val =>
// val === item ? { ...item, showGif: true } : { ...val, showGif: false, showInfo: false }
// );
// const curr = markerList.value.find(item => item.showGif);
// console.log(curr);
// curr.showInfo = !curr.showInfo;
infoName.value = props.projectData[0].projectName;
// const res = await getproDetail({ projectId: item.projectId });
// @ts-expect-error
infoWindowData.value = props.projectData[0];
infoShow.value = true;
// const infowindow = new AMapRef.value.InfoWindow({
// isCustom: true, //使
// content: infoWindowPage.value,
// offset: new AMap.Pixel(16, -45)
// });
// infowindow.open(map.value, marker.getPosition());
function createDOM() {
const img = infoWindowPage.value;
return img;
}
const customOverlay = new BMapGL.CustomOverlay(createDOM, {
point: new BMapGL.Point(Number(114.272994) || 113, Number(23.032578) || 21),
opacity: 0.5,
map: map.value,
offsetY: -45,
offsetX: 16,
properties: {
title: "this is a title",
size: "100"
}
}); });
map.value.addOverlay(customOverlay); let point = new BMapGL.Point(item.longitude, item.latitude); //
// if (curr.showInfo) { let marker = new BMapGL.Marker(point, { icon: myIcon }); //
map.value.addOverlay(marker); //
//marker
marker.addEventListener("click", async function () {
// markerList.value = markerList.value.map(val =>
// val === item ? { ...item, showGif: true } : { ...val, showGif: false, showInfo: false }
// );
// // customOverlay.open(BDMaps.value, marker.getPosition()); // const curr = markerList.value.find(item => item.showGif);
// } else { // console.log(curr);
// // infoShow.value = false; // curr.showInfo = !curr.showInfo;
// onClose();
// } infoName.value = props.projectData[index].engineering_name;
// const res = await getproDetail({ projectId: item.projectId });
// @ts-expect-error
infoWindowData.value = props.projectData[index];
infoShow.value = true;
// const infowindow = new AMapRef.value.InfoWindow({
// isCustom: true, //使
// content: infoWindowPage.value,
// offset: new AMap.Pixel(16, -45)
// });
// infowindow.open(map.value, marker.getPosition());
function createDOM() {
const img = infoWindowPage.value;
return img;
}
const customOverlay = new BMapGL.CustomOverlay(createDOM, {
point: new BMapGL.Point(Number(114.272994) || 113, Number(23.032578) || 21),
opacity: 0.5,
map: map.value,
offsetY: -45,
offsetX: 16,
properties: {
title: "this is a title",
size: "100"
}
});
map.value.addOverlay(customOverlay);
// if (curr.showInfo) {
// // customOverlay.open(BDMaps.value, marker.getPosition());
// } else {
// // infoShow.value = false;
// onClose();
// }
});
}); });
}; };
// //

View File

@ -49,7 +49,7 @@ import BDmaps3D from "./components/BDmaps3D.vue";
import largeScreenTwo from "../largeScreenTwo/index.vue"; import largeScreenTwo from "../largeScreenTwo/index.vue";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
import { sendIframeMessage } from "@/utils/util"; import { sendIframeMessage } from "@/utils/util";
import { getproNamelist } from "@/api/modules/goverment"; import { getMapProject } from "@/api/modules/largeSreen";
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const globalStore = GlobalStore(); const globalStore = GlobalStore();
@ -66,7 +66,7 @@ const changeScreen = () => {
// screenValue.value = screenValue.value == 0 ? 1 : 0; // screenValue.value = screenValue.value == 0 ? 1 : 0;
}; };
const getProjectList = async () => { const getProjectList = async () => {
const res = await getproNamelist({}); const res = await getMapProject({});
if (res && res.result && res.result.length > 0) { if (res && res.result && res.result.length > 0) {
projectData.value = res.result; projectData.value = res.result;
} }