wuhongjian
/
qd-changjing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: wuhongjian:3a4c37cc41e7069aa5418c4adeff6db49a411a75
Branches Tags
wuhongjian:master
..
compare: wuhongjian:ad45afca10c5ae60a3ffb22650bb45297eb5ff75
Branches Tags
wuhongjian:master

No commits in common. "3a4c37cc41e7069aa5418c4adeff6db49a411a75" and "ad45afca10c5ae60a3ffb22650bb45297eb5ff75" have entirely different histories.
3a4c37cc41 ... ad45afca10

8 changed files with 1150 additions and 1200 deletions
Show Stats Expand all files Collapse all files

26
src/supermap/advance-init.js
View File

@ -23,7 +23,6 @@ import {
createCameraDetailsPop,
createRoadGovernancePop,
createEventListDetailsPop,
createEventListDetailsPopNew
} from './createMarkerPopup'
// 引入资源上图方法
import {
@ -124,6 +123,7 @@ export function MapFun(mapObj) {
* @private
*/
const _openPopupVideoSurveillance = function(feature) {
// debugger
if (feature.type == 'cameraTree') {
const elementHtml = createCameraDetailsPop(feature)
const arr = [0, 0.0, '', '0', '0.0']
@ -134,27 +134,6 @@ export function MapFun(mapObj) {
}
} else if (feature.type == 'eventList') {
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)
} else {
const elementHtml = createSearchAddressTitlePop(feature)
@ -1731,7 +1710,7 @@ export function MapFun(mapObj) {
features.map(feature => {
var bounds = map.getBounds()
// console.log("看看有没有坐标",feature.latLng);
//debugger
debugger
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 })
if (createPopupFun !== null) {
@ -2083,7 +2062,6 @@ export function MapFun(mapObj) {
pathAnalysis: _pathAnalysis,
openPopup: _openPopup,
openPopupVideoSurveillance: _openPopupVideoSurveillance,
openPopupEventDetailNew: _openPopupEventDetailNew,
openPopupRoadGovernance: _openPopupRoadGovernance,
closeAllPopup: _closeAllPopup,
addMovingMarker: _addMovingMarker,

95
src/supermap/createMarkerPopup.js
View File

@ -31,12 +31,10 @@ import SearchAddressTitlePop from '@/views/pages/videoSurveillance/components/Se
import { selectByChannelCode } from '@/api/videoSurveillance/index.js'
import RoadGovernancePop from '@/views/pages/roadGovernance/components/RoadGovernancePop'
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 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 bus from "@/views/layout/bus";
@ -55,7 +53,8 @@ function createBigPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
DetailsBig
}
@ -76,7 +75,8 @@ function createSmallPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
DetailsSmall
}
@ -126,7 +126,8 @@ function createDetailPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
DetailsPop
}
@ -164,7 +165,8 @@ function createIsolationHotelPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
IsolationHotelPop
}
@ -180,7 +182,8 @@ function createSamplePointPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
SamplePointPop
}
@ -196,7 +199,8 @@ function creatNucleicAcidMonitoringSites(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
NucleicAcidMonitoringSites
}
@ -215,7 +219,8 @@ function createSiteRoadPop(feature) {
feature: feature,
}
},
created() {},
created() {
},
components: {
SiteRoadPop
}
@ -233,32 +238,14 @@ function createImportantAreaPop(feature) {
feature: feature,
}
},
created() {},
created() {
},
components: {
ImportantAreaPop
}
})
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
* @param resourceTitle
@ -529,7 +516,8 @@ function createAddressPopup(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
AddressPop
}
@ -550,7 +538,8 @@ function createPersonPopup(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
PersonPop
}
@ -571,7 +560,8 @@ function createControlPopup(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
ControlPop
}
@ -592,7 +582,8 @@ function createManagerPopup(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
ManagerPop
}
@ -620,14 +611,14 @@ function createCameraDetailsPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
CameraDetailsPop
}
})
return popupDom.initDom()
}
function createSearchAddressTitlePop(feature) {
const popupDom = new Dom({
template: '<Search-Address-Title-Pop :feature="feature"></Search-Address-Title-Pop>',
@ -636,14 +627,14 @@ function createSearchAddressTitlePop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
SearchAddressTitlePop
}
})
return popupDom.initDom()
}
function createEventListDetailsPop(feature) {
const popupDom = new Dom({
@ -653,30 +644,14 @@ function createEventListDetailsPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
EventListDetailsPop
}
})
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) {
@ -687,7 +662,8 @@ function createSiteListPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
SiteListPop
}
@ -704,7 +680,8 @@ function createWaterPointPop(feature) {
feature: feature
}
},
created() {},
created() {
},
components: {
WaterPointPop
}
@ -736,10 +713,8 @@ export {
createSearchAddressTitlePop,
createRoadGovernancePop,
createEventListDetailsPop,
createEventListDetailsPopNew,
createSiteListPop,
createWaterPointPop,
createSiteRoadPop,
createImportantAreaPop,
createImportantAreaPopNew
createImportantAreaPop
}

10
src/supermap/map-showResource.js
View File

@ -21,7 +21,6 @@ const restoreIconObj = {
}
const progress = document.getElementById('progress')
const progressBar = document.getElementById('progress-bar')
function updateProgressBar(processed, total, elapsed, layersArray) {
if (elapsed > 1000) {
// if it takes more than a second to load, display the progress bar:
@ -156,9 +155,9 @@ function addPointOnMap({
})
}
return isOpenPopup ?
marker.addTo(mapObj.map).bindPopup(elementHtml, { className: popupClassName }).openPopup() :
marker.addTo(mapObj.map)
return isOpenPopup
? marker.addTo(mapObj.map).bindPopup(elementHtml, { className: popupClassName }).openPopup()
: marker.addTo(mapObj.map)
}
/**
@ -520,7 +519,8 @@ function addResourceOnMapWithoutSuperMap(
const marker = L.marker(feature.latLng, { icon })
// 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>' +
feature.traveladdress + '(' + feature.count + '次)</span></p>', {
feature.traveladdress + '(' + feature.count + '次)</span></p>'
, {
permanent: true
})
L.tooltipLayout.resetMarker(marker)

4
src/views/pages/area/components/ImportantAreaPopNew.vue
View File

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

2
src/views/pages/areaMonitor/components/EarlyWarning.vue
View File

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

4
src/views/pages/areaMonitor/components/SiteListMore.vue
View File

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

1
src/views/pages/areaMonitor/index.vue
View File

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

6
src/views/pages/civilizedCity/components/EventListDetailsPopNew.vue
View File

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