yaowang
/
vordm-admin
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

还原

This commit is contained in:
刘旋 2023-04-24 17:29:34 +08:00
parent 454a10534c
commit ba83f4e478
2 changed files with 280 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
src/components/Map.vue
View File

@ -6,7 +6,7 @@
<script setup>
import { ref, onMounted } from 'vue'
import WKT from 'terraformer-wkt-parser'
import * as turf from '@turf/turf'
import L from 'leaflet'
import 'leaflet/dist/leaflet.css'
import 'leaflet-draw/dist/leaflet.draw'
@ -19,10 +19,8 @@ import * as omnivore from '@mapbox/leaflet-omnivore'
const variableStore = useVariableStore()
const map = ref()
let homeMap = null
let text = null
let featureLayerG_area = null
let featureLayerG_point = null
let layerRectangle = null
onMounted(() => {
homeMap = L.map(map.value, {
@ -44,92 +42,8 @@ onMounted(() => {
tileSize: 256,
zoomOffset: 1,
}).addTo(homeMap)
text = new L.Draw.Polygon(homeMap)
L.drawLocal = {
draw: {
handlers: {
circle: {
tooltip: {
start: '单击并拖动可绘制圆',
},
radius: '半径',
},
circlemarker: {
tooltip: {
start: '点击地图放置圆形标记',
},
},
marker: {
tooltip: {
start: '点击地图放置标记，Esc取消',
},
},
polygon: {
tooltip: {
start: '点击开始绘制，Esc取消',
cont: '单击以继续绘制，Esc取消',
end: '单击第一个点完成绘制，Esc取消',
},
},
polyline: {
error: '<strong>异常:</strong> 形状边缘不能交叉!',
tooltip: {
start: '点击开始绘制，Esc取消',
cont: '单击以继续绘制，Esc取消',
end: '双击完成绘制，Esc取消',
},
},
rectangle: {
tooltip: {
start: '单击并拖动以绘制矩形',
end: '完成',
},
},
simpleshape: {
tooltip: {
end: '释放鼠标完成绘图',
},
},
},
},
edit: {
toolbar: {
actions: {
save: {
title: '保存改动',
text: '保存',
},
cancel: {
title: '取消编辑，丢弃所有更改',
text: '取消',
},
clearAll: {
title: '清除所有标记',
text: '清除所有',
},
},
buttons: {
edit: '编辑图层',
editDisabled: '不需要编辑图层',
remove: '删除图层',
removeDisabled: '没有要删除的图层',
},
},
handlers: {
edit: {
tooltip: {
text: '拖动节点或标记来编辑图形',
subtext: '单击“取消”撤消更改',
},
},
remove: {
tooltip: {
text: '单击某个标记进行删除',
},
},
},
},
}
featureLayerG_area = L.layerGroup().addTo(homeMap)
featureLayerG_point = L.layerGroup().addTo(homeMap)
})
@ -142,13 +56,33 @@ onMounted(() => {
*/
const mapOperations = {
wktParseToMap: (res) => {
return omnivore.wkt.parse(res).addTo(featureLayerG_point)
// if(omnivore.wkt.parse(res) instanceof L.Marker){
let layer = omnivore.wkt.parse(res)
layer.addTo(featureLayerG_point)
// }
// else{
// return omnivore.wkt.parse(res).addTo(featureLayerG_area )
// }
let attr=Object.values(layer._layers)
// 判断审核的数据类型，如果是点则直接flyTo
if(attr[0].feature.geometry.type.indexOf('Polygon')==-1){
homeMap.flyTo([attr[0].feature.geometry.coordinates[1],attr[0].feature.geometry.coordinates[0]],3)
}
// 判断审核的数据类型，如果是面则计算中心点 然后再fly
else{
let polygons=[];
for(let i=0;i<attr[0].feature.geometry.coordinates.length;i++){
console.log(attr[0].feature.geometry.coordinates[i])
polygons.push(turf.polygon([attr[0].feature.geometry.coordinates[i]]));
}
let centers = polygons.map(polygon => turf.centroid(polygon));
// console.log(centers)
let features=[]
for(let i=0;i<centers.length;i++){
features.push(turf.point(centers[i].geometry.coordinates))
}
let final_center=turf.center(turf.featureCollection(features))
// console.log(final_center)
homeMap.flyTo([final_center.geometry.coordinates[1],final_center.geometry.coordinates[0]],3)
}
return layer
},
/** 添加点标注
@ -177,7 +111,7 @@ const mapOperations = {
addInteractMarker: (lat, lon) => {
featureLayerG_point.clearLayers()
variableStore.layerGroupPoint = null
var marker = L.marker([lat, lon], { draggable: true }).addTo(
var marker = L.marker([lat, lon]).addTo(
featureLayerG_point
)
let features = featureLayerG_point.toGeoJSON().features
@ -189,6 +123,7 @@ const mapOperations = {
// marker.on('click',function(){
// featureLayerG_point.removeLayer(marker)
// })
},
/** 添加多边形标注
* Object param 参数集合
@ -344,10 +279,7 @@ const mapOperations = {
featureLayerG_point.clearLayers()
variableStore.layerGroupPoint = null
variableStore.layerGroupPoly = null
if (variableStore.polygoncontrol == 'option2') {
text = new L.Draw.Polygon(homeMap)
text.enable()
}
},
/**
* 清楚wkt添加的所有
@ -369,75 +301,82 @@ const mapOperations = {
// console.log('2-2')
variableStore.layerGroupPoint = null
featureLayerG_point.clearLayers()
homeMap.pm.enableDraw('Polygon',{ snappable: false });
let polygon=null;
homeMap.on("pm:create",(e)=>{
featureLayerG_area.clearLayers()
e.layer.setStyle({
color: '#FF0080',
opacity: 1,
})
e.layer.addTo(featureLayerG_area)
polygon=e.layer
})
// featureLayerG_area.clearLayers()
// variableStore.layerGroupPoly=null;
text = new L.Draw.Polygon(homeMap)
text.enable()
return polygon
},
clearPolygon: () => {
// console.log('1-2')
text.disable()
featureLayerG_area.clearLayers()
variableStore.layerGroupPoly = null
homeMap.pm.disableDraw();
// variableStore.layerGroupPoint=null
// featureLayerG_point.clearLayers()
},
drawCreated: () => {
// console.log("2-3")
homeMap.on('draw:created', function (elll) {
featureLayerG_area.clearLayers()
variableStore.layerGroupPoly = null
elll.layer.setStyle({
color: '#FF0080',
opacity: 1,
// homeMap.on('draw:created', function (elll) {
// featureLayerG_area.clearLayers()
// variableStore.layerGroupPoly = null
// elll.layer.setStyle({
// color: '#FF0080',
// opacity: 1,
// })
// featureLayerG_area.addLayer(elll.layer)
// let features = featureLayerG_area.toGeoJSON().features
// // console.log(features)
// variableStore.layerGroupPoly = features.map(function (feature) {
// return WKT.convert(feature.geometry)
// })
// variableStore.layerGroupPoly =
// variableStore.layerGroupPoly.join('\n')
// })
},
Edit: () => {
homeMap.pm.enableGlobalEditMode({
allowSelfIntersection: false,
})
featureLayerG_area.addLayer(elll.layer)
if(featureLayerG_area.getLayers().length==1){
featureLayerG_area.eachLayer(function (layer) {
layer.on('pm:edit', (e) => {
let features = featureLayerG_area.toGeoJSON().features
// console.log(features)
variableStore.layerGroupPoly = features.map(function (feature) {
return WKT.convert(feature.geometry)
})
variableStore.layerGroupPoly =
variableStore.layerGroupPoly.join('\n')
text.enable()
})
},
drawDestroyed: () => {
homeMap.off('draw:created', function (elll) {
elll.layer.setStyle({
color: '#FF0080',
opacity: 1,
})
featureLayerG_area.addLayer(elll.layer)
let features = featureLayerG_area.toGeoJSON().features
// console.log(features)
variableStore.layerGroupPoly = features.map(function (feature) {
return WKT.convert(feature.geometry)
})
variableStore.layerGroupPoly =
variableStore.layerGroupPoly.join('\n')
text = new L.Draw.Polygon(homeMap)
text.enable()
})
},
drawRectangle: () => {
if (layerRectangle != null) {
homeMap.removeLayer(layerRectangle)
layerRectangle = null
variableStore.layerGroupPoly = variableStore.layerGroupPoly.join('\n')
});
});
}
homeMap.pm.enableDraw('Rectangle', {
snappable: true,
snapDistance: 20,
else if(featureLayerG_point.getLayers().length==1){
featureLayerG_point.eachLayer(function (layer) {
layer.on('pm:edit', (e) => {
let features = featureLayerG_point.toGeoJSON().features
variableStore.layerGroupPoint = features.map(function (feature) {
return WKT.convert(feature.geometry)
})
variableStore.layerGroupPoint = variableStore.layerGroupPoint.join('\n')
});
homeMap.on('pm:create', (e) => {
L.PM.reInitLayer(e.layer);
layerRectangle = e.layer
});
},
deleteRectangle: () => {
homeMap.removeLayer(layerRectangle)
}
else{
console.log('error')
}
},
}
//omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
@ -445,4 +384,3 @@ defineExpose({
mapOperations,
})
</script>

56
src/views/responseManagement/userResponse/index.vue
View File

@ -14,7 +14,7 @@
<el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="disasterKeyword" label="Disaster keywords" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="affectedCountry" label="Affected country" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column>
<el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> -->
@ -33,8 +33,7 @@
</el-table-column>
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<template #default="scope">
<el-button size="small" text type="primary"
@click="onOpenEditRole('edit', scope.row)">Approve</el-button>
<el-button size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)">Approve</el-button>
</template>
</el-table-column>
@ -63,9 +62,9 @@
:total="state.tableData.total">
</el-pagination>
</el-tab-pane>
<el-tab-pane label="Approved" name="second">
<el-tab-pane label="Approved | Rejected" name="second">
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
<el-table-column type="index" label="ID" width="50" />
<el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="Administrator" label="Administrator" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="organization" label="Organization" show-overflow-tooltip></el-table-column>
@ -76,7 +75,7 @@
<el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="disasterKeyword" label="Disaster keywords" show-overflow-tooltip></el-table-column>
<el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="Affected country" label="Affected country" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column>
<el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> -->
@ -89,20 +88,18 @@
<el-table-column prop="chiefName" label="Answer" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="Operate" label="Operate" show-overflow-tooltip></el-table-column> -->
<el-table-column width="170" prop="respondStatus" label="Response status" show-overflow-tooltip>
<el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
<template #default="scope">
<el-tag type="info" v-if="scope.row.respondStatus === 2">Approved</el-tag>
<el-tag type="info" v-if="scope.row.respondStatus === 1">Rejected</el-tag>
<el-tag type="success" v-if="scope.row.respondStatus === 3">Complete response</el-tag>
</template>
</el-table-column>
<el-table-column width="200" prop="Operate" label="Operate" show-overflow-tooltip>
<el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
<template #default="scope">
<el-button size="small" text type="primary" @click="onAllocation(scope.row)">Allocation</el-button>
<el-button size="small" text type="danger" @click="responseEnded(scope.row)">Response ended</el-button>
</template>
</el-table-column>
</el-table>
@ -114,7 +111,7 @@
</el-tab-pane>
</el-tabs>
</div>
<el-dialog v-model="state.dialogVisible" title="Approval" width="30%">
<el-dialog v-model="state.dialogVisible" title="Review" width="30%">
<el-container style="margin-top: -2%;margin-bottom: 2%;">
<el-radio v-model="state.radio" label='1' @click="mapEvents('1')">Point</el-radio>
<el-radio v-model="state.radio" label='2' @click="mapEvents('2')">Area</el-radio>
@ -123,8 +120,7 @@
</el-container>
<el-container style="margin-top: 2%;margin-bottom: 2%;" v-if="state.radio==='1'?true:false">
<span style="line-height: 35px;"> Latitude：</span>
<el-input placeholder="wait……" style="height:35px;margin-right: 1%;" v-model="state.dislat" readonly="readonly">
</el-input>
<el-input placeholder="wait……" style="height:35px;margin-right: 1%;" v-model="state.dislat" readonly="readonly"> </el-input>
<span style="line-height: 35px;">Longitude：</span>
<el-input placeholder="wait……" style="height:35px;" v-model="state.dislon" readonly="readonly"></el-input>
</el-container>
@ -155,7 +151,7 @@
import en from 'element-plus/dist/locale/en.mjs'
import { reactive, onMounted, ref, nextTick,watchEffect,defineAsyncComponent } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { getList, review, responseEndedDisasterInfo } from '/@/api/disasterInfo/index';
import { getList, review } from '/@/api/disasterInfo/index';
import { getDictionary } from '/@/api/system/dictbiz';
import { useVariableStore } from '/@/stores/index.ts'
//引入地图
@ -185,23 +181,6 @@ const MapPage = defineAsyncComponent({
const onAllocation = (row) => {
select.value.openDialog(row)
};
const responseEnded = (row) => {
ElMessageBox.confirm(`Confirm completion of response?`, 'Prompt', {
confirmButtonText: 'Yes',
cancelButtonText: 'No',
type: 'warning',
})
.then(() => {
responseEndedDisasterInfo(row.id).then((da) => {
ElMessage.success('Operation successful');
})
})
.catch(() => { });
};
const dateFormat = (date) => {
return useDateFormat(date, 'YYYY-MM-DD').value;
}
@ -235,7 +214,7 @@ const getTableData = () => {
if (state.selectName === 'first') {
state.tableData.param.respondStatus = 0;
} else {
state.tableData.param.respondStatus = 3;
state.tableData.param.respondStatus = 2;
}
getList(state.tableData.param).then((res) => {
state.tableData.data = res.records;
@ -295,9 +274,9 @@ const ClearSubmit = () => {
}, 100)
}
const mapClick=(res)=>{
// mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
changelatlon(res);
mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3), res.latlng.lng.toFixed(3))
state.wktPoint_Poly=mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3))
// console.log(state.wktPoint_Poly)
}
const reviews = (index) => {
@ -384,7 +363,7 @@ const getValue = (key) => {
return state.disasterTypeList.find((item) => item.dictKey === key)?.dictValue;
};
</script>
<style lang="scss">
<style>
.demo-tabs>.el-tabs__content {
padding: 0px;
color: #6b778c;
@ -401,11 +380,4 @@ const getValue = (key) => {
}
}
}
.mt15 {
display: flex;
justify-content: end;
float: right;
margin-bottom: 15px;
}
</style>