diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index caf4d1d..ed42f5e 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -7,6 +7,7 @@
{{ allData.dataList.roadName }}
{{ allData.dataList.stName }}
{{ allData.dataList.waterloggingName }}
+
{{ allData.dataList.materialName }}
@@ -128,6 +129,17 @@
+ +
+
+
负责人:
+
{{ allData.dataList.header }}
+
+
+
物资详情:
+
{{ allData.dataList.materialDetails }}
+
+
@@ -346,7 +358,7 @@ lat: popupCenter[1], }, anchor: 'center', - offsets: [-130, 130], + offsets: [-90, 130], autoClose: false, }); newfiberMapbox.addPopup(pipePopup); @@ -419,7 +431,26 @@ cursor: pointer; } } - + .materialContent { + display: flex; + align-items: center; + .materialName { + margin: 3px; + width: 80px; + font-size: 14px; + font-weight: 400; + line-height: 20px; + color: #b8ecff; + } + .materialValue { + margin: 3px; + width: 300px; + font-size: 14px; + font-weight: 400; + color: #b8ecff; + word-wrap: break-word; + } + } .basicContentCP { .contentInfo { display: flex; diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index caf4d1d..ed42f5e 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -7,6 +7,7 @@
{{ allData.dataList.roadName }}
{{ allData.dataList.stName }}
{{ allData.dataList.waterloggingName }}
+
{{ allData.dataList.materialName }}
@@ -128,6 +129,17 @@
+ +
+
+
负责人:
+
{{ allData.dataList.header }}
+
+
+
物资详情:
+
{{ allData.dataList.materialDetails }}
+
+
@@ -346,7 +358,7 @@ lat: popupCenter[1], }, anchor: 'center', - offsets: [-130, 130], + offsets: [-90, 130], autoClose: false, }); newfiberMapbox.addPopup(pipePopup); @@ -419,7 +431,26 @@ cursor: pointer; } } - + .materialContent { + display: flex; + align-items: center; + .materialName { + margin: 3px; + width: 80px; + font-size: 14px; + font-weight: 400; + line-height: 20px; + color: #b8ecff; + } + .materialValue { + margin: 3px; + width: 300px; + font-size: 14px; + font-weight: 400; + color: #b8ecff; + word-wrap: break-word; + } + } .basicContentCP { .contentInfo { display: flex; diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index 97eda08..b0cacdc 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -98,6 +98,8 @@ data.forEach(element => { let feature = turf.point([Number(element.lon), Number(element.lat)], element); feature.properties.name = element.address; + element.materialName = element.address; + element.lonLat = element.lon + ',' + element.lat; materialFeatures.push(feature); }); let materialGeojson = turf.featureCollection(materialFeatures); @@ -124,7 +126,13 @@ [e.point.x - 10 / 2, e.point.y - 10 / 2], [e.point.x + 10 / 2, e.point.y + 10 / 2], ])[0]; + console.log(e); console.log('clickfeature--', clickfeature.properties); + bus.emit('popupcontent', { + popupShow: true, + point: [e.lngLat.lng, e.lngLat.lat], + popupInfo: clickfeature.properties, + }); }); });