From 39c3fb6446594a23147854bb282afaad6ab50153 Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Fri, 19 May 2023 10:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=86=E9=85=8D=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 src/components/Map.vue                        | 31 +++++++++++++++++--
 .../userResponse/component/selectUser.vue     |  1 +
 .../responseManagement/userResponse/index.vue |  4 +--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 0ba43a2..2d40205 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
 		"js-cookie": "^3.0.1",
 		"js-md5": "^0.7.3",
 		"leaflet": "^1.9.3",
+		"leaflet-control-geocoder": "^2.4.0",
 		"leaflet-draw": "^1.0.4",
 		"leaflet-imageoverlay-rotated": "^0.2.1",
 		"mitt": "^3.0.0",
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 3b6a1a4..550c20f 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -1,6 +1,5 @@
 <template>
-  <div ref="map"
-       class="container"></div>
+  <div ref="map" class="container"></div>
 </template>
 
 <script setup>
@@ -14,6 +13,8 @@ import 'leaflet-draw/dist/leaflet.draw.css'
 import '@geoman-io/leaflet-geoman-free';
 import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
 import 'Leaflet-ImageOverlay-Rotated'
+import 'leaflet-control-geocoder/dist/Control.Geocoder.css';
+import 'leaflet-control-geocoder';
 import { useVariableStore } from '/@/stores/index.ts'
 import * as omnivore from '@mapbox/leaflet-omnivore'
 const variableStore = useVariableStore()
@@ -48,7 +49,33 @@ onMounted(() => {
 
   featureLayerG_area = L.layerGroup().addTo(homeMap)
   featureLayerG_point = L.layerGroup().addTo(homeMap)
+  // 'http://t0.tianditu.com/img_c/wmts?layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk='
+  // const CIA_C = "http://t0.tianditu.com/cia_c/wmts?layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=";
+  // const nameLayer =  L.tileLayer(CIA_C + TK_KEY, {
+  //     maxZoom: 20,
+  //     tileSize: 256,
+  //     zoomOffset: 1
+  // }).addTo(homeMap);
+
+  // 创建Geocoding控件
+  const geocoder = L.Control.geocoder({
+    defaultMarkGeocode: false,
+    placeholder: 'Enter address...',
+    collapsed: true,
+  }).addTo(homeMap);
+
+  // 监听Geocoding控件的结果事件
+  geocoder.on('markgeocode', function (event) {
+    const result = event.geocode || {};
+    onGeocodeResult(result);
+  });
+
 })
+const onGeocodeResult = (result) => {
+  homeMap.setView(result.center, 5);
+  L.marker(result.center).addTo(homeMap);
+}
+
 /** WKT加载点和多边形
    * Object param 参数集合
    * @param {
diff --git a/src/views/responseManagement/userResponse/component/selectUser.vue b/src/views/responseManagement/userResponse/component/selectUser.vue
index 579d4a9..5ec2c5d 100644
--- a/src/views/responseManagement/userResponse/component/selectUser.vue
+++ b/src/views/responseManagement/userResponse/component/selectUser.vue
@@ -85,6 +85,7 @@ const save = async () => {
 		id: state.rowData.disasterId,
 		chiefId: state.selectData[0].id,
 		chiefName: state.selectData[0].name,
+		allocation:"YES"
 	};
 	let res = await submit(params).then(da=>{
 		ElMessage.success('Save success');
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 39fd4dc..1b2705f 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -339,7 +339,7 @@ const onOpenEditRole = (type, row) => {
   //深拷贝
   state.edit = JSON.parse(JSON.stringify(row));
   state.dialogVisible = true;
-  if (row.geometry.substring(0, row.geometry.indexOf("((")) == 'Point') {
+  if (row.geometry.indexOf("POINT")!=-1) {
     setTimeout(() => {
       state.radio = "1"
       // mapRef.value.mapOperations.removeAll()
@@ -351,7 +351,7 @@ const onOpenEditRole = (type, row) => {
       mapEvents('1')
     }, 100);
   }
-  else if (row.geometry.substring(0, row.geometry.indexOf("((")) == 'POLYGON') {
+  else if (row.geometry.indexOf("POLYGON")!=-1 ) {
     setTimeout(() => {
       state.radio = "2"
       // mapRef.value.mapOperations.removeAll()