diff --git a/src/supermap/createMarkerPopup.js b/src/supermap/createMarkerPopup.js index 15a0f6b..b088cd8 100644 --- a/src/supermap/createMarkerPopup.js +++ b/src/supermap/createMarkerPopup.js @@ -37,6 +37,7 @@ import WaterPointPop from '@/views/pages/waterPoints/components/WaterPointPop' import SiteRoadPop from '@/views/pages/construction/components/SiteRoadPop' import ImportantAreaPop from '@/views/pages/area/components/ImportantAreaPop' import ImportantAreaPopNew from '@/views/pages/area/components/ImportantAreaPopNew' +import GatherAreaPop from '@/views/pages/area/components/GatherAreaPop' import bus from "@/views/layout/bus"; @@ -258,6 +259,25 @@ function createImportantAreaPopNew(feature) { }) return popupDom.initDom() } + +// 重点区域聚集區弹窗 +function createGatherAreaPop(feature) { + bus.$emit('areaCauseAnalysis', feature.data) + + const popupDom = new Dom({ + template: '', + data() { + return { + feature: feature, + } + }, + created() {}, + components: { + GatherAreaPop + } + }) + return popupDom.initDom() +} /** * 生成专题企业信息通用弹窗Dom * @param resourceTitle @@ -740,5 +760,6 @@ export { createWaterPointPop, createSiteRoadPop, createImportantAreaPop, - createImportantAreaPopNew + createImportantAreaPopNew, + createGatherAreaPop } \ No newline at end of file diff --git a/src/views/pages/area/components/GatherAreaPop.vue b/src/views/pages/area/components/GatherAreaPop.vue new file mode 100644 index 0000000..ff9cb24 --- /dev/null +++ b/src/views/pages/area/components/GatherAreaPop.vue @@ -0,0 +1,561 @@ + + + + + 聚集区详情 + + + + + 总人数: + {{ feature.data.allNums || "" }} + + + 本地人数: + {{ feature.data.localNums || "" }} + + + + + 外地人数: + {{ feature.data.nonlocalNums || "" }} + + + + + + + + diff --git a/src/views/pages/area/index.vue b/src/views/pages/area/index.vue index 66807f8..2821cb3 100644 --- a/src/views/pages/area/index.vue +++ b/src/views/pages/area/index.vue @@ -113,7 +113,7 @@ import VideoPlay from './components/VideoPlay' import VideoList from "./components/VideoList"; import SiteList from "./components/SiteList"; import { selectByJdWd } from "@/api/construction/index"; -import { createSiteListPop,createCameraDetailsPop,createEventListDetailsPop,createImportantAreaPop } from "@/supermap/createMarkerPopup"; +import { createSiteListPop,createCameraDetailsPop,createEventListDetailsPop,createImportantAreaPop, createGatherAreaPop } from "@/supermap/createMarkerPopup"; import { listPassengerFlow, listPassengerFlowByAllNums } from "@/api/civilizedCity.js"; import { selectByAreaEvent, selectKeyArea } from "@/api/area"; import { gcjLL2wgs84LL } from "@/utils/coordinateSystemTransform"; @@ -447,13 +447,14 @@ export default { hotEventListDetail.push({ latLng: { lat: item.latitude, lng: item.longitude }, data: item, - type: 'personHot' + type: 'site' }) }) this.hiMapFun.addPointsToMap( hotEventListDetail, 'poi-blue.png', - 'PersonHotDetail' + 'PersonHotDetail', + createGatherAreaPop ) break; case "公园广场": diff --git a/src/views/pages/roadGovernance/components/RoadMain.vue b/src/views/pages/roadGovernance/components/RoadMain.vue index 7cb289c..6ffc66b 100644 --- a/src/views/pages/roadGovernance/components/RoadMain.vue +++ b/src/views/pages/roadGovernance/components/RoadMain.vue @@ -59,12 +59,12 @@ - 市民热线 数字城管 + > --> @@ -791,7 +791,7 @@ export default { }) }, tabsHandleClick (item) { - debugger + // debugger this.hiMapFun.removeLayerByLayerName('roadPoint') this.tableData = item.data this.addToMap(item.data)
+ 总人数: + {{ feature.data.allNums || "" }} +
+ 本地人数: + {{ feature.data.localNums || "" }} +
+ 外地人数: + {{ feature.data.nonlocalNums || "" }} +