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>
</div>
<div class="info-top">
<div>项目负责人{{ infoWindowData?.projectManage }}</div>
<div class="ellipsisName">项目地址{{ infoWindowData.projectAddress }}</div>
<div>项目造价{{ infoWindowData?.engineering_cost ? infoWindowData?.engineering_cost : 0 }}万元</div>
<div>项目面积{{ infoWindowData?.engineering_area ? infoWindowData?.engineering_area : 0 }}</div>
<div class="ellipsisName">项目地址{{ infoWindowData.address }}</div>
</div>
</div>
</template>
@ -109,12 +110,14 @@ const addMarker = () => {
return;
}
console.log(props.projectData, "------------------");
const createMarkerImage = (state: string) => new URL(`../../../../../../assets/images/hzImg/xm/${state}`, import.meta.url).href; //
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) //
});
let point = new BMapGL.Point(114.272994, 23.032578); //
let point = new BMapGL.Point(item.longitude, item.latitude); //
let marker = new BMapGL.Marker(point, { icon: myIcon }); //
map.value.addOverlay(marker); //
//marker
@ -127,10 +130,10 @@ const addMarker = () => {
// console.log(curr);
// curr.showInfo = !curr.showInfo;
infoName.value = props.projectData[0].projectName;
infoName.value = props.projectData[index].engineering_name;
// const res = await getproDetail({ projectId: item.projectId });
// @ts-expect-error
infoWindowData.value = props.projectData[0];
infoWindowData.value = props.projectData[index];
infoShow.value = true;
// const infowindow = new AMapRef.value.InfoWindow({
// isCustom: true, //使
@ -163,6 +166,7 @@ const addMarker = () => {
// onClose();
// }
});
});
};
//
const translateCallback = (data: any) => {

View File

@ -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;
}