Compare commits

...

2 Commits

Author SHA1 Message Date
chenchenzai 3a4c37cc41 Merge branch 'master' of http://192.168.124.50:80/wuhongjian/qd-changjing 2022-11-25 17:15:27 +08:00
chenchenzai 010c292f09 新弹窗地图打开函数修改 2022-11-25 17:14:52 +08:00
8 changed files with 1199 additions and 1149 deletions

View File

@ -23,6 +23,7 @@ import {
createCameraDetailsPop, createCameraDetailsPop,
createRoadGovernancePop, createRoadGovernancePop,
createEventListDetailsPop, createEventListDetailsPop,
createEventListDetailsPopNew
} from './createMarkerPopup' } from './createMarkerPopup'
// 引入资源上图方法 // 引入资源上图方法
import { import {
@ -123,7 +124,6 @@ export function MapFun(mapObj) {
* @private * @private
*/ */
const _openPopupVideoSurveillance = function(feature) { const _openPopupVideoSurveillance = function(feature) {
// debugger
if (feature.type == 'cameraTree') { if (feature.type == 'cameraTree') {
const elementHtml = createCameraDetailsPop(feature) const elementHtml = createCameraDetailsPop(feature)
const arr = [0, 0.0, '', '0', '0.0'] const arr = [0, 0.0, '', '0', '0.0']
@ -134,6 +134,27 @@ export function MapFun(mapObj) {
} }
} else if (feature.type == 'eventList') { } else if (feature.type == 'eventList') {
const elementHtml = createEventListDetailsPop(feature) const elementHtml = createEventListDetailsPop(feature)
L.popup({ className: 'List-Details-pop', offset: [168, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
} else {
const elementHtml = createSearchAddressTitlePop(feature)
L.popup({ className: 'Address-Title-pop', closeButton: false }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
}
}
/**
* 添加事件弹窗
* @param {*} feature
*/
const _openPopupEventDetailNew = function(feature) {
if (feature.type == 'cameraTree') {
const elementHtml = createCameraDetailsPop(feature)
const arr = [0, 0.0, '', '0', '0.0']
if (arr.indexOf(feature.data.gpsX) == -1) {
L.popup({ className: 'List-Details-pop', offset: [168, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
} else {
L.popup({ className: 'List-Details-pop', offset: [168, 200], autoPan: false }).setLatLng(map.getCenter()).setContent(elementHtml).openOn(map)
}
} else if (feature.type == 'eventList') {
const elementHtml = createEventListDetailsPopNew(feature)
L.popup({ className: 'Event-List-Details-pop', offset: [168, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) L.popup({ className: 'Event-List-Details-pop', offset: [168, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
} else { } else {
const elementHtml = createSearchAddressTitlePop(feature) const elementHtml = createSearchAddressTitlePop(feature)
@ -1710,7 +1731,7 @@ export function MapFun(mapObj) {
features.map(feature => { features.map(feature => {
var bounds = map.getBounds() var bounds = map.getBounds()
// console.log("看看有没有坐标",feature.latLng); // console.log("看看有没有坐标",feature.latLng);
debugger //debugger
if (layerName == '全部' ? feature.hasOwnProperty('latLng') && bounds.contains(L.latLng(feature.latLng.lat, feature.latLng.lng)) : feature.hasOwnProperty('latLng')) { if (layerName == '全部' ? feature.hasOwnProperty('latLng') && bounds.contains(L.latLng(feature.latLng.lat, feature.latLng.lng)) : feature.hasOwnProperty('latLng')) {
const marker = L.marker(feature.latLng, { icon }) const marker = L.marker(feature.latLng, { icon })
if (createPopupFun !== null) { if (createPopupFun !== null) {
@ -2062,6 +2083,7 @@ export function MapFun(mapObj) {
pathAnalysis: _pathAnalysis, pathAnalysis: _pathAnalysis,
openPopup: _openPopup, openPopup: _openPopup,
openPopupVideoSurveillance: _openPopupVideoSurveillance, openPopupVideoSurveillance: _openPopupVideoSurveillance,
openPopupEventDetailNew: _openPopupEventDetailNew,
openPopupRoadGovernance: _openPopupRoadGovernance, openPopupRoadGovernance: _openPopupRoadGovernance,
closeAllPopup: _closeAllPopup, closeAllPopup: _closeAllPopup,
addMovingMarker: _addMovingMarker, addMovingMarker: _addMovingMarker,

View File

@ -31,10 +31,12 @@ import SearchAddressTitlePop from '@/views/pages/videoSurveillance/components/Se
import { selectByChannelCode } from '@/api/videoSurveillance/index.js' import { selectByChannelCode } from '@/api/videoSurveillance/index.js'
import RoadGovernancePop from '@/views/pages/roadGovernance/components/RoadGovernancePop' import RoadGovernancePop from '@/views/pages/roadGovernance/components/RoadGovernancePop'
import EventListDetailsPop from '@/views/pages/civilizedCity/components/EventListDetailsPop' import EventListDetailsPop from '@/views/pages/civilizedCity/components/EventListDetailsPop'
import EventListDetailsPopNew from '@/views/pages/civilizedCity/components/EventListDetailsPopNew'
import SiteListPop from '@/views/pages/construction/components/SiteListPop' import SiteListPop from '@/views/pages/construction/components/SiteListPop'
import WaterPointPop from '@/views/pages/waterPoints/components/WaterPointPop' import WaterPointPop from '@/views/pages/waterPoints/components/WaterPointPop'
import SiteRoadPop from '@/views/pages/construction/components/SiteRoadPop' import SiteRoadPop from '@/views/pages/construction/components/SiteRoadPop'
import ImportantAreaPop from '@/views/pages/area/components/ImportantAreaPop' import ImportantAreaPop from '@/views/pages/area/components/ImportantAreaPop'
import ImportantAreaPopNew from '@/views/pages/area/components/ImportantAreaPopNew'
import bus from "@/views/layout/bus"; import bus from "@/views/layout/bus";
@ -53,8 +55,7 @@ function createBigPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
DetailsBig DetailsBig
} }
@ -75,8 +76,7 @@ function createSmallPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
DetailsSmall DetailsSmall
} }
@ -126,8 +126,7 @@ function createDetailPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
DetailsPop DetailsPop
} }
@ -165,8 +164,7 @@ function createIsolationHotelPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
IsolationHotelPop IsolationHotelPop
} }
@ -182,8 +180,7 @@ function createSamplePointPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
SamplePointPop SamplePointPop
} }
@ -199,8 +196,7 @@ function creatNucleicAcidMonitoringSites(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
NucleicAcidMonitoringSites NucleicAcidMonitoringSites
} }
@ -219,8 +215,7 @@ function createSiteRoadPop(feature) {
feature: feature, feature: feature,
} }
}, },
created() { created() {},
},
components: { components: {
SiteRoadPop SiteRoadPop
} }
@ -238,14 +233,32 @@ function createImportantAreaPop(feature) {
feature: feature, feature: feature,
} }
}, },
created() { created() {},
},
components: { components: {
ImportantAreaPop ImportantAreaPop
} }
}) })
return popupDom.initDom() return popupDom.initDom()
} }
// 重点区域弹窗
function createImportantAreaPopNew(feature) {
bus.$emit('areaCauseAnalysis', feature.data)
const popupDom = new Dom({
template: '<Important-Area-pop-new :feature="feature"></Important-Area-pop-new>',
data() {
return {
feature: feature,
}
},
created() {},
components: {
ImportantAreaPopNew
}
})
return popupDom.initDom()
}
/** /**
* 生成专题企业信息通用弹窗Dom * 生成专题企业信息通用弹窗Dom
* @param resourceTitle * @param resourceTitle
@ -516,8 +529,7 @@ function createAddressPopup(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
AddressPop AddressPop
} }
@ -538,8 +550,7 @@ function createPersonPopup(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
PersonPop PersonPop
} }
@ -560,8 +571,7 @@ function createControlPopup(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
ControlPop ControlPop
} }
@ -582,8 +592,7 @@ function createManagerPopup(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
ManagerPop ManagerPop
} }
@ -611,14 +620,14 @@ function createCameraDetailsPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
CameraDetailsPop CameraDetailsPop
} }
}) })
return popupDom.initDom() return popupDom.initDom()
} }
function createSearchAddressTitlePop(feature) { function createSearchAddressTitlePop(feature) {
const popupDom = new Dom({ const popupDom = new Dom({
template: '<Search-Address-Title-Pop :feature="feature"></Search-Address-Title-Pop>', template: '<Search-Address-Title-Pop :feature="feature"></Search-Address-Title-Pop>',
@ -627,14 +636,14 @@ function createSearchAddressTitlePop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
SearchAddressTitlePop SearchAddressTitlePop
} }
}) })
return popupDom.initDom() return popupDom.initDom()
} }
function createEventListDetailsPop(feature) { function createEventListDetailsPop(feature) {
const popupDom = new Dom({ const popupDom = new Dom({
@ -644,14 +653,30 @@ function createEventListDetailsPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
EventListDetailsPop EventListDetailsPop
} }
}) })
return popupDom.initDom() return popupDom.initDom()
} }
//事件详情新弹窗new
function createEventListDetailsPopNew(feature) {
const popupDom = new Dom({
template: '<Event-List-Details-Pop-New :feature="feature"></Event-List-Details-Pop-New>',
data() {
return {
feature: feature
}
},
created() {},
components: {
EventListDetailsPopNew
}
})
return popupDom.initDom()
}
// 创建工地列表的弹窗 // 创建工地列表的弹窗
function createSiteListPop(feature) { function createSiteListPop(feature) {
@ -662,8 +687,7 @@ function createSiteListPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
SiteListPop SiteListPop
} }
@ -680,8 +704,7 @@ function createWaterPointPop(feature) {
feature: feature feature: feature
} }
}, },
created() { created() {},
},
components: { components: {
WaterPointPop WaterPointPop
} }
@ -713,8 +736,10 @@ export {
createSearchAddressTitlePop, createSearchAddressTitlePop,
createRoadGovernancePop, createRoadGovernancePop,
createEventListDetailsPop, createEventListDetailsPop,
createEventListDetailsPopNew,
createSiteListPop, createSiteListPop,
createWaterPointPop, createWaterPointPop,
createSiteRoadPop, createSiteRoadPop,
createImportantAreaPop createImportantAreaPop,
createImportantAreaPopNew
} }

View File

@ -21,6 +21,7 @@ const restoreIconObj = {
} }
const progress = document.getElementById('progress') const progress = document.getElementById('progress')
const progressBar = document.getElementById('progress-bar') const progressBar = document.getElementById('progress-bar')
function updateProgressBar(processed, total, elapsed, layersArray) { function updateProgressBar(processed, total, elapsed, layersArray) {
if (elapsed > 1000) { if (elapsed > 1000) {
// if it takes more than a second to load, display the progress bar: // if it takes more than a second to load, display the progress bar:
@ -155,9 +156,9 @@ function addPointOnMap({
}) })
} }
return isOpenPopup return isOpenPopup ?
? marker.addTo(mapObj.map).bindPopup(elementHtml, { className: popupClassName }).openPopup() marker.addTo(mapObj.map).bindPopup(elementHtml, { className: popupClassName }).openPopup() :
: marker.addTo(mapObj.map) marker.addTo(mapObj.map)
} }
/** /**
@ -519,8 +520,7 @@ function addResourceOnMapWithoutSuperMap(
const marker = L.marker(feature.latLng, { icon }) const marker = L.marker(feature.latLng, { icon })
// marker.zjmc = feature.zjmc // marker.zjmc = feature.zjmc
marker.bindTooltip('<p style="display:flex;align-items:center"><span style="color: red; font-size: 28px;font-weight: 700 margin-bottom: 2px">' + numArr[index] + '</span><span>' + marker.bindTooltip('<p style="display:flex;align-items:center"><span style="color: red; font-size: 28px;font-weight: 700 margin-bottom: 2px">' + numArr[index] + '</span><span>' +
feature.traveladdress + '(' + feature.count + '次)</span></p>' feature.traveladdress + '(' + feature.count + '次)</span></p>', {
, {
permanent: true permanent: true
}) })
L.tooltipLayout.resetMarker(marker) L.tooltipLayout.resetMarker(marker)

View File

@ -35,7 +35,7 @@
<span>13360907765</span> <span>13360907765</span>
</p></div> </p></div>
</div> </div>
<div class="site-content"> <div class="site-content-new">
<div class="site-content-title"> <div class="site-content-title">
<div v-for="(item, index) in menuList" :key="index"> <div v-for="(item, index) in menuList" :key="index">
<div class="item" :class="selectedIndex == index ? 'is-active' : ''" @click="handleCheck(item,index)"> <div class="item" :class="selectedIndex == index ? 'is-active' : ''" @click="handleCheck(item,index)">
@ -690,7 +690,7 @@ export default {
} }
} }
.site-content { .site-content-new {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.site-content-title{ .site-content-title{

View File

@ -212,7 +212,7 @@ export default {
}, },
]; ];
this.$parent.hiMap.mapObj.map.flyTo({ lat: data.latitude, lng: data.longitude }); this.$parent.hiMap.mapObj.map.flyTo({ lat: data.latitude, lng: data.longitude });
this.$parent.hiMapFun.openPopupVideoSurveillance(EventListDetail[0]); this.$parent.hiMapFun.openPopupEventDetailNew(EventListDetail[0]);
this.$parent.hiMapFun.addResourceOnMapWithoutSuperMapCluster( this.$parent.hiMapFun.addResourceOnMapWithoutSuperMapCluster(
EventListDetail, EventListDetail,
"poi-event.png", "poi-event.png",

View File

@ -73,6 +73,7 @@
} from "@/api/area"; } from "@/api/area";
import { gcjLL2wgs84LL } from "@/utils/coordinateSystemTransform"; import { gcjLL2wgs84LL } from "@/utils/coordinateSystemTransform";
import { createImportantAreaPop } from "@/supermap/createMarkerPopup"; import { createImportantAreaPop } from "@/supermap/createMarkerPopup";
import { createImportantAreaPopNew } from '../../../../supermap/createMarkerPopup';
export default { export default {
data() { data() {
@ -198,6 +199,7 @@
}, },
// //
analyse(row) { analyse(row) {
debugger
// bus.$emit("openCauseAnalysis", row); // bus.$emit("openCauseAnalysis", row);
this.$parent.hiMapFun.removerPolygon() this.$parent.hiMapFun.removerPolygon()
this.$parent.removeRoadCauseAnalysis() this.$parent.removeRoadCauseAnalysis()
@ -213,7 +215,7 @@
dataEvent, dataEvent,
"poi-red.png", "poi-red.png",
"roadPoint", "roadPoint",
createImportantAreaPop createImportantAreaPopNew
); );
} else if(row.point) { } else if(row.point) {
let arr = JSON.parse(row.point) let arr = JSON.parse(row.point)

View File

@ -156,6 +156,7 @@ import {
createCameraDetailsPop, createCameraDetailsPop,
createEventListDetailsPop, createEventListDetailsPop,
createImportantAreaPop, createImportantAreaPop,
createImportantAreaPopNew
} from "@/supermap/createMarkerPopup"; } from "@/supermap/createMarkerPopup";
import { import {
listPassengerFlow, listPassengerFlow,

View File

@ -30,7 +30,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="images" v-viewer="{ movable: false }"> <div class="images-new" v-viewer="{ movable: false }">
<img <img
@click="show" @click="show"
v-show="feature.data.imageUrl && feature.data.imageUrl !== null" v-show="feature.data.imageUrl && feature.data.imageUrl !== null"
@ -165,7 +165,7 @@ export default {
}); });
}, },
show() { show() {
const viewer = this.$el.querySelector(".images").$viewer; const viewer = this.$el.querySelector(".images-new").$viewer;
viewer.show(); viewer.show();
}, },
IntelliURLReplaceIP(url, type) { IntelliURLReplaceIP(url, type) {
@ -347,7 +347,7 @@ export default {
} }
} }
} }
.images { .images-new {
width: 320px; width: 320px;
height: 200px; height: 200px;
margin-left: 35px; margin-left: 35px;