diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue b/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
index c85aba4..b1ed977 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
@@ -6,8 +6,9 @@
x
-
项目负责人:{{ infoWindowData?.projectManage }}
-
项目地址:{{ infoWindowData.projectAddress }}
+
项目造价:{{ infoWindowData?.engineering_cost ? infoWindowData?.engineering_cost : 0 }}万元
+
项目面积:{{ infoWindowData?.engineering_area ? infoWindowData?.engineering_area : 0 }}㎡
+
项目地址:{{ infoWindowData.address }}
@@ -109,59 +110,62 @@ const addMarker = () => {
return;
}
console.log(props.projectData, "------------------");
- const createMarkerImage = (state: string) => new URL(`../../../../../../assets/images/hzImg/xm/${state}`, import.meta.url).href; // 图片引入
- let myIcon = new BMapGL.Icon(createMarkerImage("marker.png"), new BMapGL.Size(80, 80), {
- imageSize: new BMapGL.Size(40, 40),
- imageOffset: new BMapGL.Size(0, 0 - 25) // 设置图片偏移
- });
- let point = new BMapGL.Point(114.272994, 23.032578); // 点位设置
- 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"
- }
+ props.projectData.map((item, index) => {
+ const createMarkerImage = (state: string) =>
+ new URL(`../../../../../../assets/images/hzImg/xm/${state}`, import.meta.url).href; // 图片引入
+ let myIcon = new BMapGL.Icon(createMarkerImage("marker.png"), new BMapGL.Size(80, 80), {
+ imageSize: new BMapGL.Size(40, 40),
+ imageOffset: new BMapGL.Size(0, 0 - 25) // 设置图片偏移
});
- map.value.addOverlay(customOverlay);
- // if (curr.showInfo) {
+ let point = new BMapGL.Point(item.longitude, item.latitude); // 点位设置
+ 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());
- // } else {
- // // infoShow.value = false;
- // onClose();
- // }
+ // const curr = markerList.value.find(item => item.showGif);
+ // console.log(curr);
+ // curr.showInfo = !curr.showInfo;
+
+ 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();
+ // }
+ });
});
};
// 坐标转换回调
diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue b/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue
index d984b92..be93ca5 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue
@@ -49,7 +49,7 @@ import BDmaps3D from "./components/BDmaps3D.vue";
import largeScreenTwo from "../largeScreenTwo/index.vue";
import { GlobalStore } from "@/stores";
import { sendIframeMessage } from "@/utils/util";
-import { getproNamelist } from "@/api/modules/goverment";
+import { getMapProject } from "@/api/modules/largeSreen";
const route = useRoute();
const router = useRouter();
const globalStore = GlobalStore();
@@ -66,7 +66,7 @@ const changeScreen = () => {
// screenValue.value = screenValue.value == 0 ? 1 : 0;
};
const getProjectList = async () => {
- const res = await getproNamelist({});
+ const res = await getMapProject({});
if (res && res.result && res.result.length > 0) {
projectData.value = res.result;
}