+
审核状态：
-
-
+
+
+
@@ -371,8 +372,9 @@ export default {
{ name: '组件服务', key: 1 },
{ name: '应用资源', key: 2 },
{ name: '基础设施', key: 3 },
- { name: '数据资源', key: 3 },
- { name: '知识库', key: 3 }
+ { name: '数据资源', key: 4 },
+ { name: '知识库', key: 5 },
+ { name: '会议室', value: 6}
],
tableData: [],
tableData2: [
@@ -396,7 +398,8 @@ export default {
{ name: '图层服务', value: 2 },
{ name: '通用开发组件', value: 3 },
{ name: '页面开发组件', value: 4 },
- { name: '应用资源', value: 5 }
+ { name: '应用资源', value: 5 },
+ { name: '会议室', value: 6}
], // 类型备选列表
detailFlag: false, // 明细返回按钮显示标志位
startDate: '', // 开始时间
@@ -478,7 +481,9 @@ export default {
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
- this.status = '审核完成'
+ this.status = '通过'
+ }else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
@@ -534,7 +539,9 @@ export default {
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
- this.status = '审核完成'
+ this.status = '通过'
+ } else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
@@ -627,13 +634,15 @@ export default {
},
// 能力上架明细
getOneDetail (page) {
- var passAndReview = '' // 转变"审核完成"字段为通过
+ var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '通过'
+ } else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
@@ -657,13 +666,15 @@ export default {
},
// 能力使用明细
getTwoDetail (page) {
- var passAndReview = '' // 转变"审核完成"字段为通过
+ var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '通过'
+ } else if (this.examineStatus == '2') {
+ this.status = '不通过'
} else {
this.status = this.examineStatus
}
diff --git a/front/src/supermap/map-showResource.js b/front/src/supermap/map-showResource.js
index bc661c3b..1d7b8ea9 100644
--- a/front/src/supermap/map-showResource.js
+++ b/front/src/supermap/map-showResource.js
@@ -15,23 +15,24 @@ const L = window.L || {}
const shinningMarker = null
const SuperMap = window.SuperMap || {}
const restoreIconObj = {
- layerId: 0,
- restoreIcon: null,
- currentLayer: null,
+ layerId: 0,
+ restoreIcon: null,
+ currentLayer: null,
}
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:
- progress.style.display = 'block'
- progressBar.style.width = Math.round((processed / total) * 100) + '%'
- }
- if (processed === total) {
- // all markers processed - hide the progress bar:
- progress.style.display = 'none'
- }
+function updateProgressBar(processed, total, elapsed, layersArray) {
+ if (elapsed > 1000) {
+ // if it takes more than a second to load, display the progress bar:
+ progress.style.display = 'block'
+ progressBar.style.width = Math.round((processed / total) * 100) + '%'
+ }
+
+ if (processed === total) {
+ // all markers processed - hide the progress bar:
+ progress.style.display = 'none'
+ }
}
/**
* 构造图标聚合图层
@@ -39,41 +40,49 @@ function updateProgressBar(processed, total, elapsed, layersArray) {
* @returns {*}
*/
function createMarkerClusterLayer(layerClassName) {
- let markerClusterLayer = null
- if (layerClassName) {
- // 如果存在类名，表示需要自定义图标
- markerClusterLayer = L.markerClusterGroup({
- iconCreateFunction(cluster) {
- const markers = cluster.getAllChildMarkers()
- let n = 0
- for (let i = 0; i < markers.length; i++) {
- n += markers[i].number
- }
- return L.divIcon({ html: markers.length, className: layerClassName })
- },
- // 是否允许指定 PolylineOptions 样式 spider
- // spiderfyOnMaxZoom: true,
- // 是否显示标记的边界
- showCoverageOnHover: true,
- // 是否点击展开
- zoomToBoundsOnClick: true,
- chunkProgress: updateProgressBar,
- chunkedLoading: true,
- maxClusterRadius: 80,
- })
- } else {
- // 使用默认图标
- markerClusterLayer = L.markerClusterGroup({
- // 是否允许指定 PolylineOptions 样式 spider
- spiderfyOnMaxZoom: true,
- // 是否显示标记的边界
- showCoverageOnHover: false,
- // 是否点击展开
- zoomToBoundsOnClick: true,
- maxClusterRadius: 80,
- })
- }
- return markerClusterLayer
+ let markerClusterLayer = null
+ if (layerClassName) {
+ // 如果存在类名，表示需要自定义图标
+ markerClusterLayer = L.markerClusterGroup({
+ iconCreateFunction(cluster) {
+ const markers = cluster.getAllChildMarkers()
+ let n = 0
+ for (let i = 0; i < markers.length; i++) {
+ n += markers[i].number
+ }
+ return L.divIcon({ html: markers.length, className: layerClassName })
+ },
+ // 是否允许指定 PolylineOptions 样式 spider
+ // spiderfyOnMaxZoom: true,
+ // 是否显示标记的边界
+ showCoverageOnHover: true,
+ // 是否点击展开
+ zoomToBoundsOnClick: true,
+ chunkProgress: updateProgressBar,
+ chunkedLoading: true,
+ maxClusterRadius: 80,
+ })
+ } else {
+ // 使用默认图标
+ markerClusterLayer = L.markerClusterGroup({
+ iconCreateFunction(cluster) {
+ const markers = cluster.getAllChildMarkers()
+ let n = 0
+ for (let i = 0; i < markers.length; i++) {
+ n += markers[i].number
+ }
+ return L.divIcon({ html: markers.length, className: "topic-marker-cluster-video" })
+ },
+ // 是否允许指定 PolylineOptions 样式 spider
+ spiderfyOnMaxZoom: true,
+ // 是否显示标记的边界
+ showCoverageOnHover: false,
+ // 是否点击展开
+ zoomToBoundsOnClick: true,
+ maxClusterRadius: 80,
+ })
+ }
+ return markerClusterLayer
}
/**
@@ -83,15 +92,15 @@ function createMarkerClusterLayer(layerClassName) {
* @param chunkCompleted 数据处理完以后执行的函数
*/
function chunkData(data, doChunk, chunkCompleted) {
- const chunk = data.splice(0, 1000)
- doChunk(chunk)
- if (data.length > 0) {
- setTimeout(() => {
- chunkData(data, doChunk, chunkCompleted)
- }, 0)
- } else {
- chunkCompleted()
- }
+ const chunk = data.splice(0, 1000)
+ doChunk(chunk)
+ if (data.length > 0) {
+ setTimeout(() => {
+ chunkData(data, doChunk, chunkCompleted)
+ }, 0)
+ } else {
+ chunkCompleted()
+ }
}
/**
@@ -111,72 +120,70 @@ function chunkData(data, doChunk, chunkCompleted) {
* @param layerGroup
* @return {*|void} layer对象，可以直接用map的removeLayer删除
*/
-function addPointOnMap(
- {
- feature,
- iconSize = [48, 48],
- iconUrl = 'poi.png',
- isCustomIcon = '',
- iconHtml = '',
- iconClassName = '',
- featurePopupInfo = null,
- createPopupFun = null,
- popupClassName = 'multi-general-popup-style',
- isOpenPopup = '',
- coordinateSystemFlag = false,
- } = {},
- mapObj,
- featureGroup,
- layerGroup
+function addPointOnMap({
+ feature,
+ iconSize = [48, 48],
+ iconUrl = 'poi.png',
+ isCustomIcon = '',
+ iconHtml = '',
+ iconClassName = '',
+ featurePopupInfo = null,
+ createPopupFun = null,
+ popupClassName = 'multi-general-popup-style',
+ isOpenPopup = '',
+ coordinateSystemFlag = false,
+ } = {},
+ mapObj,
+ featureGroup,
+ layerGroup
) {
- // 创造点位marker
- let icon = null
- // 区分是否是自定义div图标
- if (isCustomIcon) {
- iconHtml = iconHtml || createDefaultDivIcon()
- icon = createDefaultFeatureStyle(
- { img: iconUrl, iconSize: iconSize },
- iconHtml,
- iconClassName
- )
- } else {
- icon = createDefaultFeatureStyle({ img: iconUrl, iconSize: iconSize })
- }
- // 当前为百度09墨卡托，上图前进行坐标转换
- console.log('当前坐标', feature)
- // if (!coordinateSystemFlag) {
- // const bdLonLat = wgs84LL2bdLL(feature.lon, feature.lat);
- // feature.lon = bdLonLat[0];
- // feature.lat = bdLonLat[1];
- // console.log('转换之后的坐标', feature);
- // }
- const marker = L.marker([feature.lat, feature.lon], {
- icon: icon,
- attribution: feature.attributes,
- })
- let elementHtml = null
- // 如果featurePopInfo不为null，则说明需要弹窗，如果为null，则说明不需要弹窗，则不添加点击事件
- if (featurePopupInfo !== null) {
- featurePopupInfo.allMapObject = {
- mapObj: mapObj,
+ // 创造点位marker
+ let icon = null
+ // 区分是否是自定义div图标
+ if (isCustomIcon) {
+ iconHtml = iconHtml || createDefaultDivIcon()
+ icon = createDefaultFeatureStyle({ img: iconUrl, iconSize: iconSize },
+ iconHtml,
+ iconClassName
+ )
+ } else {
+ icon = createDefaultFeatureStyle({ img: iconUrl, iconSize: iconSize })
}
- elementHtml = createPopupFun(featurePopupInfo)
- marker.on('click', (e) => {
- const location = [e.latlng.lat, e.latlng.lng]
- const latLng = L.latLng(location)
- L.popup({ className: popupClassName })
- .setLatLng(latLng)
- .setContent(elementHtml)
- .openOn(mapObj.map)
+ // 当前为百度09墨卡托，上图前进行坐标转换
+ console.log('当前坐标', feature)
+ // if (!coordinateSystemFlag) {
+ // const bdLonLat = wgs84LL2bdLL(feature.lon, feature.lat);
+ // feature.lon = bdLonLat[0];
+ // feature.lat = bdLonLat[1];
+ // console.log('转换之后的坐标', feature);
+ // }
+ const marker = L.marker([feature.lat, feature.lon], {
+ icon: icon,
+ attribution: feature.attributes,
})
- }
+ let elementHtml = null
+ // 如果featurePopInfo不为null，则说明需要弹窗，如果为null，则说明不需要弹窗，则不添加点击事件
+ if (featurePopupInfo !== null) {
+ featurePopupInfo.allMapObject = {
+ mapObj: mapObj,
+ }
+ elementHtml = createPopupFun(featurePopupInfo)
+ marker.on('click', (e) => {
+ const location = [e.latlng.lat, e.latlng.lng]
+ const latLng = L.latLng(location)
+ L.popup({ className: popupClassName })
+ .setLatLng(latLng)
+ .setContent(elementHtml)
+ .openOn(mapObj.map)
+ })
+ }
- return isOpenPopup
- ? marker
+ return isOpenPopup ?
+ marker
.addTo(mapObj.map)
.bindPopup(elementHtml, { className: popupClassName })
- .openPopup()
- : marker.addTo(mapObj.map)
+ .openPopup() :
+ marker.addTo(mapObj.map)
}
/**
@@ -188,66 +195,66 @@ function addPointOnMap(
* @private
*/
function createPromiseByQueryService(idArray = [], layerConfigInfo, type = '') {
- const queryUrl = _mapConfig.config.QUERY_URL
- // 构造查询条件authorityFilter
- let authorityFilter = ''
- if (idArray.length === 0) {
- // id数组为空，则默认去超图查询全部点位数据
- authorityFilter = 'SMID > 0'
- } else if (idArray.length <= 1000) {
- const authorityFilter1 = "'" + idArray.join("','") + "'"
- authorityFilter = type
- ? `CAMERA_INDEX_CODE in (${authorityFilter1})`
- : `UUID in (${authorityFilter1})`
- } else {
- // 当UUID的个数大于1000
- const count = Math.floor(idArray.length / 1000) // 向下取整
- // 这里分开处理，如果数据量很大时，可以节省时间
- if (type) {
- for (let i = 0; i <= count; i++) {
- const indexCodeSplice = idArray.slice(i * 1000, (i + 1) * 1000)
- const authorityFilterString = "'" + indexCodeSplice.join("','") + "'"
- const authorityFilterSplice = `CAMERA_INDEX_CODE in (${authorityFilterString})`
- authorityFilter =
- i === 0
- ? authorityFilterSplice
- : `${authorityFilter} or ${authorityFilterSplice}`
- }
+ const queryUrl = _mapConfig.config.QUERY_URL
+ // 构造查询条件authorityFilter
+ let authorityFilter = ''
+ if (idArray.length === 0) {
+ // id数组为空，则默认去超图查询全部点位数据
+ authorityFilter = 'SMID > 0'
+ } else if (idArray.length <= 1000) {
+ const authorityFilter1 = "'" + idArray.join("','") + "'"
+ authorityFilter = type ?
+ `CAMERA_INDEX_CODE in (${authorityFilter1})` :
+ `UUID in (${authorityFilter1})`
} else {
- for (let i = 0; i <= count; i++) {
- const indexCodeSplice = idArray.slice(i * 1000, (i + 1) * 1000)
- const authorityFilterString = "'" + indexCodeSplice.join("','") + "'"
- const authorityFilterSplice = `UUID in (${authorityFilterString})`
- authorityFilter =
- i === 0
- ? authorityFilterSplice
- : `${authorityFilter} or ${authorityFilterSplice}`
- }
- }
- }
-
- // 构造查询参数，用于去iServer查询
- console.log('查询条件', authorityFilter)
- const getFeatureBySQLParams = new SuperMap.QueryBySQLParameters({
- queryParams: {
- name: layerConfigInfo.layerName,
- attributeFilter: authorityFilter,
- },
- })
- // 将查询结果储存在promise中，返回这个promise
- return new Promise((resolve, reject) => {
- L.supermap
- .queryService(queryUrl)
- .queryBySQL(getFeatureBySQLParams, (serviceResult) => {
- // debugger;
- try {
- const features = serviceResult.result.recordsets[0].features.features
- resolve(features)
- } catch (e) {
- reject(e)
+ // 当UUID的个数大于1000
+ const count = Math.floor(idArray.length / 1000) // 向下取整
+ // 这里分开处理，如果数据量很大时，可以节省时间
+ if (type) {
+ for (let i = 0; i <= count; i++) {
+ const indexCodeSplice = idArray.slice(i * 1000, (i + 1) * 1000)
+ const authorityFilterString = "'" + indexCodeSplice.join("','") + "'"
+ const authorityFilterSplice = `CAMERA_INDEX_CODE in (${authorityFilterString})`
+ authorityFilter =
+ i === 0 ?
+ authorityFilterSplice :
+ `${authorityFilter} or ${authorityFilterSplice}`
+ }
+ } else {
+ for (let i = 0; i <= count; i++) {
+ const indexCodeSplice = idArray.slice(i * 1000, (i + 1) * 1000)
+ const authorityFilterString = "'" + indexCodeSplice.join("','") + "'"
+ const authorityFilterSplice = `UUID in (${authorityFilterString})`
+ authorityFilter =
+ i === 0 ?
+ authorityFilterSplice :
+ `${authorityFilter} or ${authorityFilterSplice}`
+ }
}
- })
- })
+ }
+
+ // 构造查询参数，用于去iServer查询
+ console.log('查询条件', authorityFilter)
+ const getFeatureBySQLParams = new SuperMap.QueryBySQLParameters({
+ queryParams: {
+ name: layerConfigInfo.layerName,
+ attributeFilter: authorityFilter,
+ },
+ })
+ // 将查询结果储存在promise中，返回这个promise
+ return new Promise((resolve, reject) => {
+ L.supermap
+ .queryService(queryUrl)
+ .queryBySQL(getFeatureBySQLParams, (serviceResult) => {
+ // debugger;
+ try {
+ const features = serviceResult.result.recordsets[0].features.features
+ resolve(features)
+ } catch (e) {
+ reject(e)
+ }
+ })
+ })
}
/**
* @description: 新的资源上图
@@ -255,77 +262,76 @@ function createPromiseByQueryService(idArray = [], layerConfigInfo, type = '') {
* @return {*}
*/
function addResourceOnMapNew(
- features,
- layerConfig,
- getLayerPopupInfo,
- createPopupFun,
- mapObj,
- featureGroup,
- layerGroup
+ features,
+ layerConfig,
+ getLayerPopupInfo,
+ createPopupFun,
+ mapObj,
+ featureGroup,
+ layerGroup
) {
- // 如果资源要素数量为0，则说明该种资源没有记录
- if (features.length < 1) {
- return Promise.resolve(0)
- }
+ // 如果资源要素数量为0，则说明该种资源没有记录
+ if (features.length < 1) {
+ return Promise.resolve(0)
+ }
- // 创建图层
- let layers = null
- // 判断是否是聚合图层
- layers = layerConfig.cluster.flag
- ? createMarkerClusterLayer(layerConfig.cluster.clusterName)
- : []
+ // 创建图层
+ let layers = null
+ // 判断是否是聚合图层
+ layers = layerConfig.cluster.flag ?
+ createMarkerClusterLayer(layerConfig.cluster.clusterName) : []
- // 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
- return new Promise((resolve) => {
- const doChunk = (chunk) => {
- // 循环构造要素点位，并给每个要素点位绑定点击事件，添加弹窗
- chunk.forEach((feature, index) => {
- let icon = null
- icon = createDefaultFeatureStyle(layerConfig)
- restoreIconObj.restoreIcon = icon
- if (feature.latLng.lng) {
- const marker = L.marker(feature.latLng, { icon })
- // 如果getLayerPopupInfo和createPopupFun不为null，则说明需要弹窗，否则不需要弹窗
- // if (true) {
- marker.uuid = feature.uuid
- marker.layerConfigInfo = layerConfig
- // 小型水库没有点击事件
- // if (feature.size !== 0) {
- marker.on('click', async (e) => {
- console.log('图标点击e', e)
- const uuid = e.sourceTarget.uuid
- const type = layerConfig.resType
- const layerConfigInfo = e.sourceTarget.layerConfigInfo
- const latLng = L.latLng([e.latlng.lat, e.latlng.lng])
- myGetLayerPopupInfo(
- uuid,
- layerConfigInfo,
- type,
- mapObj,
- latLng,
- createPopupFun,
- getLayerPopupInfo,
- layerConfigInfo.popupClassName
- )
- })
- // }
- // }
- // 将该点位添加到聚合图层中
- layers.addLayer(marker)
+ // 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
+ return new Promise((resolve) => {
+ const doChunk = (chunk) => {
+ // 循环构造要素点位，并给每个要素点位绑定点击事件，添加弹窗
+ chunk.forEach((feature, index) => {
+ let icon = null
+ icon = createDefaultFeatureStyle(layerConfig)
+ restoreIconObj.restoreIcon = icon
+ if (feature.latLng.lng) {
+ const marker = L.marker(feature.latLng, { icon })
+ // 如果getLayerPopupInfo和createPopupFun不为null，则说明需要弹窗，否则不需要弹窗
+ // if (true) {
+ marker.uuid = feature.uuid
+ marker.layerConfigInfo = layerConfig
+ // 小型水库没有点击事件
+ // if (feature.size !== 0) {
+ marker.on('click', async(e) => {
+ console.log('图标点击e', e)
+ const uuid = e.sourceTarget.uuid
+ const type = layerConfig.resType
+ const layerConfigInfo = e.sourceTarget.layerConfigInfo
+ const latLng = L.latLng([e.latlng.lat, e.latlng.lng])
+ myGetLayerPopupInfo(
+ uuid,
+ layerConfigInfo,
+ type,
+ mapObj,
+ latLng,
+ createPopupFun,
+ getLayerPopupInfo,
+ layerConfigInfo.popupClassName
+ )
+ })
+ // }
+ // }
+ // 将该点位添加到聚合图层中
+ layers.addLayer(marker)
+ }
+ })
}
- })
- }
- // 当要素点位数据处理完成后，将聚合图层添加到layerGroup中，并将promise的状态置为已决议
- const chunkCompleted = () => {
- featureGroup.addLayer(layers)
- layerGroup.set(layerConfig.superMapLayerName, layers)
- resolve(1)
- }
+ // 当要素点位数据处理完成后，将聚合图层添加到layerGroup中，并将promise的状态置为已决议
+ const chunkCompleted = () => {
+ featureGroup.addLayer(layers)
+ layerGroup.set(layerConfig.superMapLayerName, layers)
+ resolve(1)
+ }
- // 分块处理要素点位，当要素数量非常大时，不至于页面卡死
- chunkData(features, doChunk, chunkCompleted)
- })
+ // 分块处理要素点位，当要素数量非常大时，不至于页面卡死
+ chunkData(features, doChunk, chunkCompleted)
+ })
}
/**
* 资源上图通用方法
@@ -347,433 +353,431 @@ function addResourceOnMapNew(
* @return {*}
* @private
*/
-function addResourceOnMap(
- {
- features,
- layerName,
- layerConfigInfo,
- isClusterLayer = '',
- getLayerPopupInfo = null,
- layerClassName = '',
- popupClassName = '',
- createPopupFun = null,
- createDivIconFun = null,
- clickReplaceIcon = '',
- replaceIconUrl = '/src/supermap/image/poi.png',
- replaceIconSize = [44, 44],
- } = {},
- mapObj,
- featureGroup,
- layerGroup
+function addResourceOnMap({
+ features,
+ layerName,
+ layerConfigInfo,
+ isClusterLayer = '',
+ getLayerPopupInfo = null,
+ layerClassName = '',
+ popupClassName = '',
+ createPopupFun = null,
+ createDivIconFun = null,
+ clickReplaceIcon = '',
+ replaceIconUrl = '/src/supermap/image/poi.png',
+ replaceIconSize = [44, 44],
+ } = {},
+ mapObj,
+ featureGroup,
+ layerGroup
) {
- // debugger;
- console.log('上图数据', layerClassName)
- // 如果资源要素数量为0，则说明该种资源没有记录
- if (features.length < 1) {
- return Promise.resolve(0)
- }
-
- // 创建图层
- let layers = null
- // 判断是否是聚合图层
- layers = isClusterLayer ? createMarkerClusterLayer(layerClassName) : []
-
- // 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
- return new Promise((resolve) => {
- const doChunk = (chunk) => {
- // 循环构造要素点位，并给每个要素点位绑定点击事件，添加弹窗
- chunk.forEach((feature, index) => {
- let icon = null
- if (createDivIconFun !== null) {
- const { iconSize, contentHTML, className } = createDivIconFun(
- feature,
- index
- )
- icon = L.divIcon({
- iconSize: iconSize,
- html: contentHTML,
- className: className,
- })
- } else {
- icon = createDefaultFeatureStyle(layerConfigInfo)
- }
- if (feature.size) {
- switch (feature.size) {
- case 0:
- icon = createDefaultFeatureStyle({
- img: 'reservoir_small.png',
- })
- break
- case 1:
- icon = createDefaultFeatureStyle({
- img: 'reservoir_middle.png',
- })
- break
- case 2:
- icon = createDefaultFeatureStyle({
- img: 'reservoir_big.png',
- })
- break
- }
- }
- restoreIconObj.restoreIcon = icon
- // 当前地图为百度09墨卡托坐标系，在此处进行坐标转换
- // const bdLonLat = wgs84LL2bdLL(feature.latLng[1], feature.latLng[0]);
- // feature.latLng[1] = bdLonLat[0];
- // feature.latLng[0] = bdLonLat[1];
- const marker = L.marker(feature.latLng, { icon })
- // 如果getLayerPopupInfo和createPopupFun不为null，则说明需要弹窗，否则不需要弹窗
- if (getLayerPopupInfo !== null && createPopupFun !== null) {
- marker.resId = feature.resId
- marker.layerConfigInfo = layerConfigInfo
- marker.on('click', async (e) => {
- console.log('图标点击e', e)
- // 判断是否需要选中之后更换marker的图标
- if (clickReplaceIcon) {
- // 先把之前选中的图标切换回来
- // const previousLayer = layerGroup.get(layerName).getLayer(restoreIconObj.layerId);
- // if (previousLayer) {
- // previousLayer.setIcon(icon);
- // }
- const layers = layerGroup.get(layerName).getLayers()
- layers.forEach((layer) => {
- layer.setIcon(icon)
- })
- restoreIconObj.layerId = e.sourceTarget._leaflet_id
- const currentLayer = layerGroup
- .get(layerName)
- .getLayer(restoreIconObj.layerId)
- restoreIconObj.currentLayer = currentLayer
- if (currentLayer) {
- currentLayer.setIcon(
- L.icon({ iconUrl: replaceIconUrl, iconSize: replaceIconSize })
- )
- }
- }
- // 使用uuid获取弹窗详情并构造弹窗
- const resId = e.sourceTarget.resId
- let type = null
- // 根据layerName1 传递不同的 resourceType
- switch (e.sourceTarget.layerConfigInfo.layerName1) {
- // 直升机起降点
- case 'f_helicopter':
- type = 'resourceHelicopter'
- break
- // 物资储备库
- case 'f_repository':
- type = 'resourceStorage'
- break
- // 应急队伍
- case 'YJPT_SM_ARMY':
- type = 'resourceTeam'
- break
- case 'f_team':
- type = 'resourceTeam'
- break
- // 危险源
- case 'YJPT_SM_HAZARD':
- type = 'resourceDanger'
- break
- // 水源地
- case 'f_water_source':
- type = 'resourceProtection'
- break
- // 检查站
- case 'f_check_station':
- type = 'resourceProtection'
- break
- // 墓地
- case 'f_cemetery':
- type = 'resourceProtection'
- break
- // 瞭望塔
- case 'f_watch_tower':
- type = 'resourceProtection'
- break
- case 'YJPT_SM_SHELTER':
- type = 'resourceShelter'
- break
- case 'YJPT_SM_STORAGE':
- type = 'resourceStorage'
- break
- default:
- break
- }
- const layerConfigInfo = e.sourceTarget.layerConfigInfo
- const latLng = L.latLng([e.latlng.lat, e.latlng.lng])
- // debugger;
- myGetLayerPopupInfo(
- resId,
- layerConfigInfo,
- type,
- mapObj,
- latLng,
- createPopupFun,
- getLayerPopupInfo,
- popupClassName
- )
- })
- }
- // 将该点位添加到聚合图层中
- layers.addLayer(marker)
- })
+ // debugger;
+ console.log('上图数据', layerClassName)
+ // 如果资源要素数量为0，则说明该种资源没有记录
+ if (features.length < 1) {
+ return Promise.resolve(0)
}
- // 当要素点位数据处理完成后，将聚合图层添加到layerGroup中，并将promise的状态置为已决议
- const chunkCompleted = () => {
- console.log(featureGroup)
- featureGroup.addLayer(layers)
- layerGroup.set(layerName, layers)
- resolve(1)
- }
+ // 创建图层
+ let layers = null
+ // 判断是否是聚合图层
+ layers = isClusterLayer ? createMarkerClusterLayer(layerClassName) : []
- // 分块处理要素点位，当要素数量非常大时，不至于页面卡死
- chunkData(features, doChunk, chunkCompleted)
- })
+ // 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
+ return new Promise((resolve) => {
+ const doChunk = (chunk) => {
+ // 循环构造要素点位，并给每个要素点位绑定点击事件，添加弹窗
+ chunk.forEach((feature, index) => {
+ let icon = null
+ if (createDivIconFun !== null) {
+ const { iconSize, contentHTML, className } = createDivIconFun(
+ feature,
+ index
+ )
+ icon = L.divIcon({
+ iconSize: iconSize,
+ html: contentHTML,
+ className: className,
+ })
+ } else {
+ icon = createDefaultFeatureStyle(layerConfigInfo)
+ }
+ if (feature.size) {
+ switch (feature.size) {
+ case 0:
+ icon = createDefaultFeatureStyle({
+ img: 'reservoir_small.png',
+ })
+ break
+ case 1:
+ icon = createDefaultFeatureStyle({
+ img: 'reservoir_middle.png',
+ })
+ break
+ case 2:
+ icon = createDefaultFeatureStyle({
+ img: 'reservoir_big.png',
+ })
+ break
+ }
+ }
+ restoreIconObj.restoreIcon = icon
+ // 当前地图为百度09墨卡托坐标系，在此处进行坐标转换
+ // const bdLonLat = wgs84LL2bdLL(feature.latLng[1], feature.latLng[0]);
+ // feature.latLng[1] = bdLonLat[0];
+ // feature.latLng[0] = bdLonLat[1];
+ const marker = L.marker(feature.latLng, { icon })
+ // 如果getLayerPopupInfo和createPopupFun不为null，则说明需要弹窗，否则不需要弹窗
+ if (getLayerPopupInfo !== null && createPopupFun !== null) {
+ marker.resId = feature.resId
+ marker.layerConfigInfo = layerConfigInfo
+ marker.on('click', async(e) => {
+ console.log('图标点击e', e)
+ // 判断是否需要选中之后更换marker的图标
+ if (clickReplaceIcon) {
+ // 先把之前选中的图标切换回来
+ // const previousLayer = layerGroup.get(layerName).getLayer(restoreIconObj.layerId);
+ // if (previousLayer) {
+ // previousLayer.setIcon(icon);
+ // }
+ const layers = layerGroup.get(layerName).getLayers()
+ layers.forEach((layer) => {
+ layer.setIcon(icon)
+ })
+ restoreIconObj.layerId = e.sourceTarget._leaflet_id
+ const currentLayer = layerGroup
+ .get(layerName)
+ .getLayer(restoreIconObj.layerId)
+ restoreIconObj.currentLayer = currentLayer
+ if (currentLayer) {
+ currentLayer.setIcon(
+ L.icon({ iconUrl: replaceIconUrl, iconSize: replaceIconSize })
+ )
+ }
+ }
+ // 使用uuid获取弹窗详情并构造弹窗
+ const resId = e.sourceTarget.resId
+ let type = null
+ // 根据layerName1 传递不同的 resourceType
+ switch (e.sourceTarget.layerConfigInfo.layerName1) {
+ // 直升机起降点
+ case 'f_helicopter':
+ type = 'resourceHelicopter'
+ break
+ // 物资储备库
+ case 'f_repository':
+ type = 'resourceStorage'
+ break
+ // 应急队伍
+ case 'YJPT_SM_ARMY':
+ type = 'resourceTeam'
+ break
+ case 'f_team':
+ type = 'resourceTeam'
+ break
+ // 危险源
+ case 'YJPT_SM_HAZARD':
+ type = 'resourceDanger'
+ break
+ // 水源地
+ case 'f_water_source':
+ type = 'resourceProtection'
+ break
+ // 检查站
+ case 'f_check_station':
+ type = 'resourceProtection'
+ break
+ // 墓地
+ case 'f_cemetery':
+ type = 'resourceProtection'
+ break
+ // 瞭望塔
+ case 'f_watch_tower':
+ type = 'resourceProtection'
+ break
+ case 'YJPT_SM_SHELTER':
+ type = 'resourceShelter'
+ break
+ case 'YJPT_SM_STORAGE':
+ type = 'resourceStorage'
+ break
+ default:
+ break
+ }
+ const layerConfigInfo = e.sourceTarget.layerConfigInfo
+ const latLng = L.latLng([e.latlng.lat, e.latlng.lng])
+ // debugger;
+ myGetLayerPopupInfo(
+ resId,
+ layerConfigInfo,
+ type,
+ mapObj,
+ latLng,
+ createPopupFun,
+ getLayerPopupInfo,
+ popupClassName
+ )
+ })
+ }
+ // 将该点位添加到聚合图层中
+ layers.addLayer(marker)
+ })
+ }
+
+ // 当要素点位数据处理完成后，将聚合图层添加到layerGroup中，并将promise的状态置为已决议
+ const chunkCompleted = () => {
+ console.log(featureGroup)
+ featureGroup.addLayer(layers)
+ layerGroup.set(layerName, layers)
+ resolve(1)
+ }
+
+ // 分块处理要素点位，当要素数量非常大时，不至于页面卡死
+ chunkData(features, doChunk, chunkCompleted)
+ })
}
// 根据类型返回具体用聚合图层的样式。
function typeToStyle(layerName) {
- let returnStyle = null
- const typeToImg = {
- fireForest: 'multi-marker-cluster-resource-protection',
- fireRoad: 'multi-marker-cluster-resource-protection',
- fireBreak2: 'multi-marker-cluster-resource-protection',
- fireBreak1: 'multi-marker-cluster-resource-protection',
+ let returnStyle = null
+ const typeToImg = {
+ fireForest: 'multi-marker-cluster-resource-protection',
+ fireRoad: 'multi-marker-cluster-resource-protection',
+ fireBreak2: 'multi-marker-cluster-resource-protection',
+ fireBreak1: 'multi-marker-cluster-resource-protection',
- fireWater4: 'multi-marker-cluster-resource-protection',
- fireWater3: 'multi-marker-cluster-resource-protection',
- fireWater5: 'multi-marker-cluster-resource-protection',
- fireWater6: 'multi-marker-cluster-resource-protection',
+ fireWater4: 'multi-marker-cluster-resource-protection',
+ fireWater3: 'multi-marker-cluster-resource-protection',
+ fireWater5: 'multi-marker-cluster-resource-protection',
+ fireWater6: 'multi-marker-cluster-resource-protection',
- airLine1: 'topic-marker-cluster-video',
- airLine2: 'topic-marker-cluster-video',
- airLine3: 'topic-marker-cluster-video',
+ airLine1: 'topic-marker-cluster-video',
+ airLine2: 'topic-marker-cluster-video',
+ airLine3: 'topic-marker-cluster-video',
- fireMonitor7: 'topic-marker-cluster-video',
- fireMonitor8: 'topic-marker-cluster-video',
- fireMonitor9: 'topic-marker-cluster-video',
- fireMonitor10: 'topic-marker-cluster-video',
+ fireMonitor7: 'topic-marker-cluster-video',
+ fireMonitor8: 'topic-marker-cluster-video',
+ fireMonitor9: 'topic-marker-cluster-video',
+ fireMonitor10: 'topic-marker-cluster-video',
- fireRisk2: 'topic-marker-cluster-risk-area',
- fireRisk3: 'topic-marker-cluster-risk-area',
- fireRisk4: 'topic-marker-cluster-risk-area',
- fireRisk1: 'topic-marker-cluster-risk-area',
+ fireRisk2: 'topic-marker-cluster-risk-area',
+ fireRisk3: 'topic-marker-cluster-risk-area',
+ fireRisk4: 'topic-marker-cluster-risk-area',
+ fireRisk1: 'topic-marker-cluster-risk-area',
- fireTeam: 'topic-marker-cluster-team',
- fireStorage: 'topic-marker-cluster-mine',
- }
- returnStyle = typeToImg[layerName]
- if (typeof returnStyle === 'undefined') {
- returnStyle = 'multi-marker-cluster-resource-protection'
- }
- return returnStyle
+ fireTeam: 'topic-marker-cluster-team',
+ fireStorage: 'topic-marker-cluster-mine',
+ }
+ returnStyle = typeToImg[layerName]
+ if (typeof returnStyle === 'undefined') {
+ returnStyle = 'multi-marker-cluster-resource-protection'
+ }
+ return returnStyle
}
// 无聚合上图 =》阳性人员路径
function addResourceOnMapWithoutSuperMap(
- features,
- url,
- lastOne,
- createPopupFun,
- DS,
- featureGroup,
- layerGroup,
- map
+ features,
+ url,
+ lastOne,
+ createPopupFun,
+ DS,
+ featureGroup,
+ layerGroup,
+ map
) {
- // 如果资源要素数量为0，则说明该种资源没有记录
- // if (features.length < 1) {
- // return Promise.resolve(0);
- // }
- // 根据类型返回具体用聚合图层的样式。
- // const defaultStyle = typeToStyle(layerName)
- // 创建图层
- const layers = []
- const numArr = [
- '①',
- '②',
- '③',
- '④',
- '⑤',
- '⑥',
- '⑦',
- '⑧',
- '⑨',
- '⑩',
- '⑪',
- '⑫',
- '⑬',
- '⑭',
- '⑮',
- '⑯',
- '⑰',
- '⑱',
- '⑲',
- '⑳',
- '㉑',
- '㉒',
- '㉓',
- '㉔',
- '㉕',
- '㉖',
- '㉗',
- '㉘',
- '㉙',
- '㉚',
- '㉛',
- '㉜',
- '㉝',
- '㉞',
- '㉟',
- '㊱',
- '㊲',
- '㊳',
- '㊴',
- '㊵',
- '㊶',
- '㊷',
- '㊸',
- '㊹',
- '㊺',
- '㊻',
- '㊼',
- '㊽',
- '㊾',
- '㊿',
- ]
- // 判断是否是聚合图层
- // layers = createMarkerClusterLayer(defaultStyle)
- const icon = createDefaultFeatureStyle({
- img: url || 'the-head.png',
- iconSize: [36, 36],
- })
- const arr = []
- features.map((feature, index) => {
- // console.log("看看有没有坐标",feature.latLng);
- if (feature.hasOwnProperty('latLng')) {
- const marker = L.marker(feature.latLng, { icon })
- // marker.zjmc = feature.zjmc
- marker.bindTooltip(
- '' +
- numArr[index] +
- '' +
- feature.traveladdress +
- '(' +
- feature.count +
- '次)
',
- {
- permanent: true,
- }
- )
- L.tooltipLayout.resetMarker(marker)
- if (createPopupFun !== null) {
- marker.on('click', async (e) => {
- const elementHtml = createPopupFun(feature)
- if (elementHtml) {
- L.popup({
- className: 'epidemic-address',
- keepInView: true,
- maxHeight: 300,
- })
- .setLatLng(feature.latLng)
- .setContent(elementHtml)
- .openOn(map)
- }
+ // 如果资源要素数量为0，则说明该种资源没有记录
+ // if (features.length < 1) {
+ // return Promise.resolve(0);
+ // }
+ // 根据类型返回具体用聚合图层的样式。
+ // const defaultStyle = typeToStyle(layerName)
+ // 创建图层
+ const layers = []
+ const numArr = [
+ '①',
+ '②',
+ '③',
+ '④',
+ '⑤',
+ '⑥',
+ '⑦',
+ '⑧',
+ '⑨',
+ '⑩',
+ '⑪',
+ '⑫',
+ '⑬',
+ '⑭',
+ '⑮',
+ '⑯',
+ '⑰',
+ '⑱',
+ '⑲',
+ '⑳',
+ '㉑',
+ '㉒',
+ '㉓',
+ '㉔',
+ '㉕',
+ '㉖',
+ '㉗',
+ '㉘',
+ '㉙',
+ '㉚',
+ '㉛',
+ '㉜',
+ '㉝',
+ '㉞',
+ '㉟',
+ '㊱',
+ '㊲',
+ '㊳',
+ '㊴',
+ '㊵',
+ '㊶',
+ '㊷',
+ '㊸',
+ '㊹',
+ '㊺',
+ '㊻',
+ '㊼',
+ '㊽',
+ '㊾',
+ '㊿',
+ ]
+ // 判断是否是聚合图层
+ // layers = createMarkerClusterLayer(defaultStyle)
+ const icon = createDefaultFeatureStyle({
+ img: url || 'the-head.png',
+ iconSize: [36, 36],
+ })
+ const arr = []
+ features.map((feature, index) => {
+ // console.log("看看有没有坐标",feature.latLng);
+ if (feature.hasOwnProperty('latLng')) {
+ const marker = L.marker(feature.latLng, { icon })
+ // marker.zjmc = feature.zjmc
+ marker.bindTooltip(
+ '' +
+ numArr[index] +
+ '' +
+ feature.traveladdress +
+ '(' +
+ feature.count +
+ '次)
', {
+ permanent: true,
+ }
+ )
+ L.tooltipLayout.resetMarker(marker)
+ if (createPopupFun !== null) {
+ marker.on('click', async(e) => {
+ const elementHtml = createPopupFun(feature)
+ if (elementHtml) {
+ L.popup({
+ className: 'epidemic-address',
+ keepInView: true,
+ maxHeight: 300,
+ })
+ .setLatLng(feature.latLng)
+ .setContent(elementHtml)
+ .openOn(map)
+ }
+ })
+ }
+ layers.push(marker)
+ // 处理bounds数据
+ arr.push([feature.latLng.lat, feature.latLng.lng])
+ }
})
- }
- layers.push(marker)
- // 处理bounds数据
- arr.push([feature.latLng.lat, feature.latLng.lng])
+ // 适配地图
+ var polyline = L.polyline(arr)
+ if (lastOne) {
+ // map.fitBounds(polyline.getBounds())
+ } else {
+ map.flyTo(features[features.length - 1].latLng, 8)
}
- })
- // 适配地图
- var polyline = L.polyline(arr)
- if (lastOne) {
- // map.fitBounds(polyline.getBounds())
- } else {
- map.flyTo(features[features.length - 1].latLng, 8)
- }
- var myGroup = L.layerGroup(layers)
- featureGroup.addLayer(myGroup)
- // featureGroup.addLayer(layers)
- // console.log('上图的layerName', layerName,layerGroup);
- // L.layerGroup.addLayer(layers)
+ var myGroup = L.layerGroup(layers)
+ featureGroup.addLayer(myGroup)
+ // featureGroup.addLayer(layers)
+ // console.log('上图的layerName', layerName,layerGroup);
+ // L.layerGroup.addLayer(layers)
}
// 道路污染治理专题-点位上图
function addPointsToMap(
- features,
- url,
- lastOne,
- createPopupFun,
- DS,
- featureGroup,
- layerGroup,
- map
+ features,
+ url,
+ lastOne,
+ createPopupFun,
+ DS,
+ featureGroup,
+ layerGroup,
+ map
) {
- // 如果资源要素数量为0，则说明该种资源没有记录
- // if (features.length < 1) {
- // return Promise.resolve(0);
- // }
- // 根据类型返回具体用聚合图层的样式。
- // const defaultStyle = typeToStyle(layerName)
- // 创建图层
- const layers = []
- // 判断是否是聚合图层
- // layers = createMarkerClusterLayer(defaultStyle)
- const icon = createDefaultFeatureStyle({
- img: url || 'the-head.png',
- iconSize: [36, 36],
- })
- const arr = []
- features.map((feature, index) => {
- // console.log("看看有没有坐标",feature.latLng);
- if (feature.hasOwnProperty('latLng')) {
- const marker = L.marker(feature.latLng, { icon })
- // marker.zjmc = feature.zjmc
- // marker.bindTooltip('' + index + '' +
- // feature.traveladdress + '(' + feature.count + '次)
'
- // , {
- // permanent: true
- // })
- // L.tooltipLayout.resetMarker(marker)
- if (createPopupFun !== null) {
- marker.on('click', async (e) => {
- const elementHtml = createPopupFun(feature)
- if (elementHtml) {
- if (feature.type == 'road') {
- L.popup({ className: 'roadGovernance-popup', keepInView: true })
- .setLatLng(feature.latLng)
- .setContent(elementHtml)
- .openOn(map)
- } else {
- L.popup({
- className: 'epidemic-address',
- keepInView: true,
- maxHeight: 300,
- })
- .setLatLng(feature.latLng)
- .setContent(elementHtml)
- .openOn(map)
+ // 如果资源要素数量为0，则说明该种资源没有记录
+ // if (features.length < 1) {
+ // return Promise.resolve(0);
+ // }
+ // 根据类型返回具体用聚合图层的样式。
+ // const defaultStyle = typeToStyle(layerName)
+ // 创建图层
+ const layers = []
+ // 判断是否是聚合图层
+ // layers = createMarkerClusterLayer(defaultStyle)
+ const icon = createDefaultFeatureStyle({
+ img: url || 'the-head.png',
+ iconSize: [36, 36],
+ })
+ const arr = []
+ features.map((feature, index) => {
+ // console.log("看看有没有坐标",feature.latLng);
+ if (feature.hasOwnProperty('latLng')) {
+ const marker = L.marker(feature.latLng, { icon })
+ // marker.zjmc = feature.zjmc
+ // marker.bindTooltip('' + index + '' +
+ // feature.traveladdress + '(' + feature.count + '次)
'
+ // , {
+ // permanent: true
+ // })
+ // L.tooltipLayout.resetMarker(marker)
+ if (createPopupFun !== null) {
+ marker.on('click', async(e) => {
+ const elementHtml = createPopupFun(feature)
+ if (elementHtml) {
+ if (feature.type == 'road') {
+ L.popup({ className: 'roadGovernance-popup', keepInView: true })
+ .setLatLng(feature.latLng)
+ .setContent(elementHtml)
+ .openOn(map)
+ } else {
+ L.popup({
+ className: 'epidemic-address',
+ keepInView: true,
+ maxHeight: 300,
+ })
+ .setLatLng(feature.latLng)
+ .setContent(elementHtml)
+ .openOn(map)
+ }
+ }
+ })
+ }
+ layers.push(marker)
+ // 处理bounds数据
+ arr.push([feature.latLng.lat, feature.latLng.lng])
}
- }
})
- }
- layers.push(marker)
- // 处理bounds数据
- arr.push([feature.latLng.lat, feature.latLng.lng])
+ // 适配地图
+ var polyline = L.polyline(arr)
+ if (lastOne) {
+ // map.fitBounds(polyline.getBounds())
+ } else {
+ map.flyTo(features[features.length - 1].latLng, 8)
}
- })
- // 适配地图
- var polyline = L.polyline(arr)
- if (lastOne) {
- // map.fitBounds(polyline.getBounds())
- } else {
- map.flyTo(features[features.length - 1].latLng, 8)
- }
- var myGroup = L.layerGroup(layers)
- featureGroup.addLayer(myGroup)
- layerGroup.set(lastOne, myGroup)
- // featureGroup.addLayer(layers)
- // console.log('上图的layerName', layerName,layerGroup);
- // L.layerGroup.addLayer(layers)
+ var myGroup = L.layerGroup(layers)
+ featureGroup.addLayer(myGroup)
+ layerGroup.set(lastOne, myGroup)
+ // featureGroup.addLayer(layers)
+ // console.log('上图的layerName', layerName,layerGroup);
+ // L.layerGroup.addLayer(layers)
}
/**
* 资源上图通用方法 -> 不走超图服务
@@ -795,213 +799,212 @@ function addPointsToMap(
* @return {*}
* @private
*/
-function addResourceOnMapWithoutSuper(
- {
- features,
- layerName,
- layerConfigInfo,
- isClusterLayer = '',
- getLayerPopupInfo = null,
- layerClassName = '',
- popupClassName = '',
- createPopupFun = null,
- createDivIconFun = null,
- clickReplaceIcon = '',
- replaceIconUrl = '/src/supermap/image/poi.png',
- replaceIconSize = [44, 44],
- } = {},
- mapObj,
- featureGroup,
- layerGroup
+function addResourceOnMapWithoutSuper({
+ features,
+ layerName,
+ layerConfigInfo,
+ isClusterLayer = '',
+ getLayerPopupInfo = null,
+ layerClassName = '',
+ popupClassName = '',
+ createPopupFun = null,
+ createDivIconFun = null,
+ clickReplaceIcon = '',
+ replaceIconUrl = '/src/supermap/image/poi.png',
+ replaceIconSize = [44, 44],
+ } = {},
+ mapObj,
+ featureGroup,
+ layerGroup
) {
- console.log('features', features)
- // 如果资源要素数量为0，则说明该种资源没有记录
- if (features.length < 1) {
- return Promise.resolve(0)
- }
+ console.log('features', features)
+ // 如果资源要素数量为0，则说明该种资源没有记录
+ if (features.length < 1) {
+ return Promise.resolve(0)
+ }
- // 创建图层
- let layers = null
- // 判断是否是聚合图层
- layers = isClusterLayer ? createMarkerClusterLayer(layerClassName) : []
+ // 创建图层
+ let layers = null
+ // 判断是否是聚合图层
+ layers = isClusterLayer ? createMarkerClusterLayer(layerClassName) : []
- // 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
- return new Promise((resolve) => {
- const doChunk = (chunk) => {
- // 循环构造要素点位，并给每个要素点位绑定点击事件，添加弹窗
- chunk.forEach((feature, index) => {
- let icon = null
- // 水库大中小图标
- if (feature.size) {
- switch (feature.size) {
- case 0:
- layerConfigInfo.img = 'reservoir_small.png'
- break
- case 1:
- layerConfigInfo.img = 'reservoir_middle.png'
- break
- case 2:
- layerConfigInfo.img = 'reservoir_big.png'
- break
- }
- }
- if (createDivIconFun !== null) {
- const { iconSize, contentHTML, className } = createDivIconFun(
- feature,
- index
- )
- icon = L.divIcon({
- iconSize: iconSize,
- html: contentHTML,
- className: className,
- })
- } else {
- icon = createDefaultFeatureStyle(layerConfigInfo)
- }
- restoreIconObj.restoreIcon = icon
- // 当前地图为百度09墨卡托坐标系，在此处进行坐标转换
- const bdLonLat = wgs84LL2bdLL(
- feature.latLng[1] || feature.latLng.lng,
- feature.latLng[0] || feature.latLng.lat
- )
- feature.latLng = []
- feature.latLng[1] = bdLonLat[0]
- feature.latLng[0] = bdLonLat[1]
- // debugger;
- const marker = L.marker(feature.latLng, { icon })
- // 如果getLayerPopupInfo和createPopupFun不为null，则说明需要弹窗，否则不需要弹窗
- if (getLayerPopupInfo !== null && createPopupFun !== null) {
- marker.uuid = feature.uuid || ''
- marker.resId = feature.resId || ''
- marker.layerConfigInfo = layerConfigInfo
- marker.on('click', async (e) => {
- // 判断是否需要选中之后更换marker的图标
- if (clickReplaceIcon) {
- const layers = layerGroup.get(layerName).getLayers()
- layers.forEach((layer) => {
- layer.setIcon(icon)
- })
- restoreIconObj.layerId = e.sourceTarget._leaflet_id
- const currentLayer = layerGroup
- .get(layerName)
- .getLayer(restoreIconObj.layerId)
- restoreIconObj.currentLayer = currentLayer
- if (currentLayer) {
- currentLayer.setIcon(
- L.icon({ iconUrl: replaceIconUrl, iconSize: replaceIconSize })
+ // 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
+ return new Promise((resolve) => {
+ const doChunk = (chunk) => {
+ // 循环构造要素点位，并给每个要素点位绑定点击事件，添加弹窗
+ chunk.forEach((feature, index) => {
+ let icon = null
+ // 水库大中小图标
+ if (feature.size) {
+ switch (feature.size) {
+ case 0:
+ layerConfigInfo.img = 'reservoir_small.png'
+ break
+ case 1:
+ layerConfigInfo.img = 'reservoir_middle.png'
+ break
+ case 2:
+ layerConfigInfo.img = 'reservoir_big.png'
+ break
+ }
+ }
+ if (createDivIconFun !== null) {
+ const { iconSize, contentHTML, className } = createDivIconFun(
+ feature,
+ index
+ )
+ icon = L.divIcon({
+ iconSize: iconSize,
+ html: contentHTML,
+ className: className,
+ })
+ } else {
+ icon = createDefaultFeatureStyle(layerConfigInfo)
+ }
+ restoreIconObj.restoreIcon = icon
+ // 当前地图为百度09墨卡托坐标系，在此处进行坐标转换
+ const bdLonLat = wgs84LL2bdLL(
+ feature.latLng[1] || feature.latLng.lng,
+ feature.latLng[0] || feature.latLng.lat
)
- }
- }
- // 使用uuid获取弹窗详情并构造弹窗
- const uuid = e.sourceTarget.uuid
- const resId = e.sourceTarget.resId
- let resourceType = null
- // 根据layerName1 传递不同的 resourceType
- switch (e.sourceTarget.layerConfigInfo.layerName1) {
- // 避难场所
- case 'wf_shelter':
- resourceType = 'resourceShelter'
- break
- // 应急物资
- case 'wf_storage':
- resourceType = 'resourceStorage'
- break
- // 应急队伍
- case 'wf_team':
- resourceType = 'resourceTeam'
- break
- // 危险源
- case 'wf_danger':
- resourceType = 'resourceDanger'
- break
- case 'wf_protection':
- resourceType = 'resourceProtection'
- break
- default:
- resourceType =
- e.sourceTarget.layerConfigInfo.resourceType ||
- 'resourceProtection'
- break
- }
+ feature.latLng = []
+ feature.latLng[1] = bdLonLat[0]
+ feature.latLng[0] = bdLonLat[1]
+ // debugger;
+ const marker = L.marker(feature.latLng, { icon })
+ // 如果getLayerPopupInfo和createPopupFun不为null，则说明需要弹窗，否则不需要弹窗
+ if (getLayerPopupInfo !== null && createPopupFun !== null) {
+ marker.uuid = feature.uuid || ''
+ marker.resId = feature.resId || ''
+ marker.layerConfigInfo = layerConfigInfo
+ marker.on('click', async(e) => {
+ // 判断是否需要选中之后更换marker的图标
+ if (clickReplaceIcon) {
+ const layers = layerGroup.get(layerName).getLayers()
+ layers.forEach((layer) => {
+ layer.setIcon(icon)
+ })
+ restoreIconObj.layerId = e.sourceTarget._leaflet_id
+ const currentLayer = layerGroup
+ .get(layerName)
+ .getLayer(restoreIconObj.layerId)
+ restoreIconObj.currentLayer = currentLayer
+ if (currentLayer) {
+ currentLayer.setIcon(
+ L.icon({ iconUrl: replaceIconUrl, iconSize: replaceIconSize })
+ )
+ }
+ }
+ // 使用uuid获取弹窗详情并构造弹窗
+ const uuid = e.sourceTarget.uuid
+ const resId = e.sourceTarget.resId
+ let resourceType = null
+ // 根据layerName1 传递不同的 resourceType
+ switch (e.sourceTarget.layerConfigInfo.layerName1) {
+ // 避难场所
+ case 'wf_shelter':
+ resourceType = 'resourceShelter'
+ break
+ // 应急物资
+ case 'wf_storage':
+ resourceType = 'resourceStorage'
+ break
+ // 应急队伍
+ case 'wf_team':
+ resourceType = 'resourceTeam'
+ break
+ // 危险源
+ case 'wf_danger':
+ resourceType = 'resourceDanger'
+ break
+ case 'wf_protection':
+ resourceType = 'resourceProtection'
+ break
+ default:
+ resourceType =
+ e.sourceTarget.layerConfigInfo.resourceType ||
+ 'resourceProtection'
+ break
+ }
- const latLng = L.latLng([e.latlng.lat, e.latlng.lng])
- const response = await getLayerPopupInfo(
- uuid,
- layerConfigInfo,
- resourceType,
- resId
- )
- response.allMapObject = {
- mapObj: mapObj,
- }
- response.layerConfigInfo = layerConfigInfo
- console.log(response)
- const elementHtml = createPopupFun(response)
- if (elementHtml) {
- L.popup({ className: popupClassName })
- .setLatLng(latLng)
- .setContent(elementHtml)
- .openOn(mapObj.map)
- }
- })
+ const latLng = L.latLng([e.latlng.lat, e.latlng.lng])
+ const response = await getLayerPopupInfo(
+ uuid,
+ layerConfigInfo,
+ resourceType,
+ resId
+ )
+ response.allMapObject = {
+ mapObj: mapObj,
+ }
+ response.layerConfigInfo = layerConfigInfo
+ console.log(response)
+ const elementHtml = createPopupFun(response)
+ if (elementHtml) {
+ L.popup({ className: popupClassName })
+ .setLatLng(latLng)
+ .setContent(elementHtml)
+ .openOn(mapObj.map)
+ }
+ })
+ }
+ // 将该点位添加到聚合图层中
+ layers.addLayer(marker)
+ // marker.addTo(mapObj.map);
+ })
}
- // 将该点位添加到聚合图层中
- layers.addLayer(marker)
- // marker.addTo(mapObj.map);
- })
- }
- // 当要素点位数据处理完成后，将聚合图层添加到layerGroup中，并将promise的状态置为已决议
- const chunkCompleted = () => {
- // debugger;
- featureGroup.addLayer(layers)
- layerGroup.set(layerName, layers)
- resolve(1)
- }
+ // 当要素点位数据处理完成后，将聚合图层添加到layerGroup中，并将promise的状态置为已决议
+ const chunkCompleted = () => {
+ // debugger;
+ featureGroup.addLayer(layers)
+ layerGroup.set(layerName, layers)
+ resolve(1)
+ }
- // 分块处理要素点位，当要素数量非常大时，不至于页面卡死
- chunkData(features, doChunk, chunkCompleted)
- })
+ // 分块处理要素点位，当要素数量非常大时，不至于页面卡死
+ chunkData(features, doChunk, chunkCompleted)
+ })
}
async function myGetLayerPopupInfo(
- resId,
- layerConfigInfo,
- type,
- mapObj,
- latLng,
- createPopupFun,
- getLayerPopupInfo,
- popupClassName
+ resId,
+ layerConfigInfo,
+ type,
+ mapObj,
+ latLng,
+ createPopupFun,
+ getLayerPopupInfo,
+ popupClassName
) {
- const response = await getLayerPopupInfo(resId, layerConfigInfo, type)
- // debugger;
- console.log(response)
- if (!response) return
- response.allMapObject = {
- mapObj: mapObj,
- }
- const elementHtml = createPopupFun(response)
- L.popup({ className: popupClassName })
- .setLatLng(latLng)
- .setContent(elementHtml)
- .openOn(mapObj.map)
+ const response = await getLayerPopupInfo(resId, layerConfigInfo, type)
+ // debugger;
+ console.log(response)
+ if (!response) return
+ response.allMapObject = {
+ mapObj: mapObj,
+ }
+ const elementHtml = createPopupFun(response)
+ L.popup({ className: popupClassName })
+ .setLatLng(latLng)
+ .setContent(elementHtml)
+ .openOn(mapObj.map)
}
export {
- // 复原的图标
- restoreIconObj,
- // 添加单个点位到地图上
- addPointOnMap,
- // 使用uuid集合去超图服务查询资源要素，得到结果就把promise状态置为已决议，并返回features
- createPromiseByQueryService,
- // 资源上图通用方法
- addResourceOnMap,
- // 创建聚合图层
- createMarkerClusterLayer,
- // 创建资源弹窗
- myGetLayerPopupInfo,
- // 头顶库临时
- addResourceOnMapWithoutSuperMap,
- addResourceOnMapWithoutSuper,
- addResourceOnMapNew,
- addPointsToMap,
-}
+ // 复原的图标
+ restoreIconObj,
+ // 添加单个点位到地图上
+ addPointOnMap,
+ // 使用uuid集合去超图服务查询资源要素，得到结果就把promise状态置为已决议，并返回features
+ createPromiseByQueryService,
+ // 资源上图通用方法
+ addResourceOnMap,
+ // 创建聚合图层
+ createMarkerClusterLayer,
+ // 创建资源弹窗
+ myGetLayerPopupInfo,
+ // 头顶库临时
+ addResourceOnMapWithoutSuperMap,
+ addResourceOnMapWithoutSuper,
+ addResourceOnMapNew,
+ addPointsToMap,
+}
\ No newline at end of file