diff --git a/src/assets/images/goverHome/我的网盘.png b/src/assets/images/goverHome/我的网盘.png new file mode 100644 index 0000000..4b0121b Binary files /dev/null and b/src/assets/images/goverHome/我的网盘.png differ diff --git a/src/assets/images/screenImg/mapImg/completedBorder.png b/src/assets/images/screenImg/mapImg/completedBorder.png new file mode 100644 index 0000000..5d4b0ed Binary files /dev/null and b/src/assets/images/screenImg/mapImg/completedBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/completedIcon.png b/src/assets/images/screenImg/mapImg/completedIcon.png new file mode 100644 index 0000000..1cae092 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/completedIcon.png differ diff --git a/src/assets/images/screenImg/mapImg/completeeingBorder.png b/src/assets/images/screenImg/mapImg/completeeingBorder.png new file mode 100644 index 0000000..2a8bc5c Binary files /dev/null and b/src/assets/images/screenImg/mapImg/completeeingBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/completeeingIcon.png b/src/assets/images/screenImg/mapImg/completeeingIcon.png new file mode 100644 index 0000000..e64b31c Binary files /dev/null and b/src/assets/images/screenImg/mapImg/completeeingIcon.png differ diff --git a/src/assets/images/screenImg/mapImg/constructionningBorder.png b/src/assets/images/screenImg/mapImg/constructionningBorder.png new file mode 100644 index 0000000..ed30969 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/constructionningBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/constructionningIcon.png b/src/assets/images/screenImg/mapImg/constructionningIcon.png new file mode 100644 index 0000000..9f0ddfe Binary files /dev/null and b/src/assets/images/screenImg/mapImg/constructionningIcon.png differ diff --git a/src/assets/images/screenImg/mapImg/dian.png b/src/assets/images/screenImg/mapImg/dian.png deleted file mode 100644 index 5b28d3d..0000000 Binary files a/src/assets/images/screenImg/mapImg/dian.png and /dev/null differ diff --git a/src/assets/images/screenImg/mapImg/finishedBorder.png b/src/assets/images/screenImg/mapImg/finishedBorder.png new file mode 100644 index 0000000..3fdb424 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/finishedBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/finishedIcon.png b/src/assets/images/screenImg/mapImg/finishedIcon.png new file mode 100644 index 0000000..ebd5351 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/finishedIcon.png differ diff --git a/src/assets/images/screenImg/mapImg/notStartedBorder.png b/src/assets/images/screenImg/mapImg/notStartedBorder.png new file mode 100644 index 0000000..70d468d Binary files /dev/null and b/src/assets/images/screenImg/mapImg/notStartedBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/notStartedIcon.png b/src/assets/images/screenImg/mapImg/notStartedIcon.png new file mode 100644 index 0000000..9a24e06 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/notStartedIcon.png differ diff --git a/src/assets/images/screenImg/mapImg/ordinaryBorder.png b/src/assets/images/screenImg/mapImg/ordinaryBorder.png new file mode 100644 index 0000000..fc54278 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/ordinaryBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/ordinaryIcon.png b/src/assets/images/screenImg/mapImg/ordinaryIcon.png new file mode 100644 index 0000000..4de4cdc Binary files /dev/null and b/src/assets/images/screenImg/mapImg/ordinaryIcon.png differ diff --git a/src/assets/images/screenImg/mapImg/punishBorder.png b/src/assets/images/screenImg/mapImg/punishBorder.png new file mode 100644 index 0000000..6fb0f88 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/punishBorder.png differ diff --git a/src/assets/images/screenImg/mapImg/punishIcon.png b/src/assets/images/screenImg/mapImg/punishIcon.png new file mode 100644 index 0000000..6525b39 Binary files /dev/null and b/src/assets/images/screenImg/mapImg/punishIcon.png differ diff --git a/src/views/goverment/largeScreen/components/map2D.vue b/src/views/goverment/largeScreen/components/map2D.vue index 9f29754..3bc3fab 100644 --- a/src/views/goverment/largeScreen/components/map2D.vue +++ b/src/views/goverment/largeScreen/components/map2D.vue @@ -28,6 +28,45 @@ const projectStatusEnum = ref({ 6: "已验收未备案", 7: "已竣工验收备案" }); +const projectStatusImg = ref({ + 1: { + icon: getImageUrl("notStartedIcon"), + bg: "notStartedBorder" + }, + 2: { + icon: getImageUrl("constructionningIcon"), + bg: "constructionningBorder" + }, + 3: { + icon: getImageUrl("ordinaryIcon"), + bg: "ordinaryBorder" + }, + 4: { + icon: getImageUrl("punishIcon"), + bg: "punishBorder" + }, + 5: { + icon: getImageUrl("finishedIcon"), + bg: "finishedBorder" + }, + 6: { + icon: getImageUrl("completeeingIcon"), + bg: "completeeingBorder" + }, + 7: { + icon: getImageUrl("completedIcon"), + bg: "completedBorder" + } +}); +const projectStatus = ref({ + 1: "末开工", + 2: "在建", + 3: "普通停工", + 4: "处罚停工", + 5: "完工", + 6: "待竣工", + 7: "竣工" +}); const mapProjectList = ref([]); const getProjectList = async () => { const { result } = await getMapProject(); @@ -97,7 +136,7 @@ const initMap = () => { // 第二种 直接写死 position 的经纬度值 mapProjectList.value.forEach((item, index, array) => { const marker = new AMap.Marker({ - icon: getImageUrl("dian"), + icon: `${projectStatusImg.value[item.state].icon}`, position: [`${item.longitude}`, `${item.latitude}`], // 通过设置 offset 来添加偏移量 offset: new AMap.Pixel(-26, -24) @@ -106,66 +145,39 @@ const initMap = () => { const infoWindow = new window.AMap.InfoWindow({ offset: new window.AMap.Pixel(0, -31) }); - - // // 图标-项目延期 - // const postponeImage = require("@/assets/images/screenImg/mapImg/iconPostpone.png"); - // // 图标-停工整改 - // const shutdownRectificationImage = require("@/assets/images/screenImg/mapImg/iconShutdownRectification.png"); - // // 图标-项目停滞 - // const stagnateImage = require("@/assets/images/screenImg/mapImg/iconStagnate.png"); - // // 图标-竣工验收 - // const completedImage = require("@/assets/images/screenImg/mapImg/iconCompleted.png"); - // // 图标-正常施工 - // const normalConstruction = require("@/assets/images/screenImg/mapImg/iconNormalConstruction.png"); - - // const statusIcons = { - // projectDelay: createIcon(postponeImage), // 项目延期 - // suspensionandrectification: createIcon(shutdownRectificationImage), // 停工整改 - // projectStagnation: createIcon(stagnateImage), // 项目停滞 - // completionAcceptance: createIcon(completedImage), // 竣工验收 - // normalConstruction: createIcon(normalConstruction) // 竣工验收 - // }; - // /** - // * 创建地图图标 - // * @param {string} image icon图片 - // */ - // function createIcon(image) { - // return new window.AMap.Icon({ - // size: new window.AMap.Size(28, 40), // 图标尺寸 - // image, // 图标的取图地址 - // imageSize: new window.AMap.Size(28, 40), // 图标所用图片大小 - // imageOffset: new window.AMap.Pixel(0, 0) // 图标取图偏移量 - // }); - // } - marker.content = `
+ marker.content = `
+
+
+
${projectStatus.value[item.state]}
+
- 项目名称： + 项目名称： ${item.engineering_name}
- 项目状态： + 项目状态： ${projectStatusEnum.value[item.state] ? projectStatusEnum.value[item.state] : "暂无"}
- 项目造价： + 项目造价： ${item.engineering_cost || 0}万元
- 工程面积： + 工程面积： ${item.engineering_area || 0}m²
- 建设单位： + 建设单位： ${item.enterprise_name || "暂无"}
- - 项目地址： +
+ 项目地址： ${item.province + item.city + item.district + item.address || "暂无"}
`; marker.on("mousemove", markerMousemove); // 鼠标移出事件 - marker.on("mouseout", markerMouseout); + // marker.on("mouseout", markerMouseout); // 鼠标移入事件df function markerMousemove(e) { infoWindow.setContent(e.target.content); @@ -173,10 +185,10 @@ const initMap = () => { } // 鼠标移出事件 - function markerMouseout(e) { - infoWindow.setContent(e.target.content); - infoWindow.close(map, e.target.getPosition()); - } + // function markerMouseout(e) { + // infoWindow.setContent(e.target.content); + // infoWindow.close(map, e.target.getPosition()); + // } marker.setMap(map); }); // 鼠标移入事件 @@ -208,7 +220,7 @@ const initMap = () => { }; - diff --git a/src/views/goverment/naturalResources/index.vue b/src/views/goverment/naturalResources/index.vue new file mode 100644 index 0000000..75d406f --- /dev/null +++ b/src/views/goverment/naturalResources/index.vue @@ -0,0 +1,34 @@ + + + + +