From e05ae8c05dc5d448b355206c5f1f29c4d54fd861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Fri, 21 Apr 2023 10:52:39 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 3349c61..0763a98 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,8 +4,8 @@ import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
 // export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'yyhouc-biz-vordm';
-// export const moduleName = 'glj-biz-vordm';
+// export const moduleName = 'yyhouc-biz-vordm';
+export const moduleName = 'glj-biz-vordm';
 // 配置新建一个 axios 实例
 const service = axios.create({
 	//baseURL: import.meta.env.VITE_API_URL,

From 12397d35565186ee8b9b8630fb356bb125a4b4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Fri, 21 Apr 2023 15:32:45 +0800
Subject: [PATCH 02/14] flyTo

---
 package-lock.json                             | 1205 +++++++++++++++++
 package.json                                  |    1 +
 src/components/Map.vue                        |  187 +--
 .../responseManagement/userResponse/index.vue |    5 +-
 4 files changed, 1260 insertions(+), 138 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f10cb3..e5c4022 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -352,6 +352,38 @@
 				"picomatch": "^2.2.2"
 			}
 		},
+		"@turf/along": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/along/-/along-6.5.0.tgz",
+			"integrity": "sha512-LLyWQ0AARqJCmMcIEAXF4GEu8usmd4Kbz3qk1Oy5HoRNpZX47+i5exQtmIWKdqJ1MMhW26fCTXgpsEs5zgJ5gw==",
+			"requires": {
+				"@turf/bearing": "^6.5.0",
+				"@turf/destination": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/angle": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/angle/-/angle-6.5.0.tgz",
+			"integrity": "sha512-4pXMbWhFofJJAOvTMCns6N4C8CMd5Ih4O2jSAG9b3dDHakj3O4yN1+Zbm+NUei+eVEZ9gFeVp9svE3aMDenIkw==",
+			"requires": {
+				"@turf/bearing": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/rhumb-bearing": "^6.5.0"
+			}
+		},
+		"@turf/area": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/area/-/area-6.5.0.tgz",
+			"integrity": "sha512-xCZdiuojokLbQ+29qR6qoMD89hv+JAgWjLrwSEWL+3JV8IXKeNFl6XkEJz9HGkVpnXvQKJoRz4/liT+8ZZ5Jyg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
 		"@turf/bbox": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/bbox/-/bbox-6.5.0.tgz",
@@ -361,6 +393,23 @@
 				"@turf/meta": "^6.5.0"
 			}
 		},
+		"@turf/bbox-clip": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/bbox-clip/-/bbox-clip-6.5.0.tgz",
+			"integrity": "sha512-F6PaIRF8WMp8EmgU/Ke5B1Y6/pia14UAYB5TiBC668w5rVVjy5L8rTm/m2lEkkDMHlzoP9vNY4pxpNthE7rLcQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/bbox-polygon": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz",
+			"integrity": "sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0"
+			}
+		},
 		"@turf/bearing": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/bearing/-/bearing-6.5.0.tgz",
@@ -370,6 +419,24 @@
 				"@turf/invariant": "^6.5.0"
 			}
 		},
+		"@turf/bezier-spline": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/bezier-spline/-/bezier-spline-6.5.0.tgz",
+			"integrity": "sha512-vokPaurTd4PF96rRgGVm6zYYC5r1u98ZsG+wZEv9y3kJTuJRX/O3xIY2QnTGTdbVmAJN1ouOsD0RoZYaVoXORQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/boolean-clockwise": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-clockwise/-/boolean-clockwise-6.5.0.tgz",
+			"integrity": "sha512-45+C7LC5RMbRWrxh3Z0Eihsc8db1VGBO5d9BLTOAwU4jR6SgsunTfRWR16X7JUwIDYlCVEmnjcXJNi/kIU3VIw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
 		"@turf/boolean-contains": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/boolean-contains/-/boolean-contains-6.5.0.tgz",
@@ -382,6 +449,75 @@
 				"@turf/invariant": "^6.5.0"
 			}
 		},
+		"@turf/boolean-crosses": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-crosses/-/boolean-crosses-6.5.0.tgz",
+			"integrity": "sha512-gvshbTPhAHporTlQwBJqyfW+2yV8q/mOTxG6PzRVl6ARsqNoqYQWkd4MLug7OmAqVyBzLK3201uAeBjxbGw0Ng==",
+			"requires": {
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/line-intersect": "^6.5.0",
+				"@turf/polygon-to-line": "^6.5.0"
+			}
+		},
+		"@turf/boolean-disjoint": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-disjoint/-/boolean-disjoint-6.5.0.tgz",
+			"integrity": "sha512-rZ2ozlrRLIAGo2bjQ/ZUu4oZ/+ZjGvLkN5CKXSKBcu6xFO6k2bgqeM8a1836tAW+Pqp/ZFsTA5fZHsJZvP2D5g==",
+			"requires": {
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/line-intersect": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/polygon-to-line": "^6.5.0"
+			}
+		},
+		"@turf/boolean-equal": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-equal/-/boolean-equal-6.5.0.tgz",
+			"integrity": "sha512-cY0M3yoLC26mhAnjv1gyYNQjn7wxIXmL2hBmI/qs8g5uKuC2hRWi13ydufE3k4x0aNRjFGlg41fjoYLwaVF+9Q==",
+			"requires": {
+				"@turf/clean-coords": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"geojson-equality": "0.1.6"
+			}
+		},
+		"@turf/boolean-intersects": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-intersects/-/boolean-intersects-6.5.0.tgz",
+			"integrity": "sha512-nIxkizjRdjKCYFQMnml6cjPsDOBCThrt+nkqtSEcxkKMhAQj5OO7o2CecioNTaX8EayqwMGVKcsz27oP4mKPTw==",
+			"requires": {
+				"@turf/boolean-disjoint": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/boolean-overlap": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-overlap/-/boolean-overlap-6.5.0.tgz",
+			"integrity": "sha512-8btMIdnbXVWUa1M7D4shyaSGxLRw6NjMcqKBcsTXcZdnaixl22k7ar7BvIzkaRYN3SFECk9VGXfLncNS3ckQUw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/line-intersect": "^6.5.0",
+				"@turf/line-overlap": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"geojson-equality": "0.1.6"
+			}
+		},
+		"@turf/boolean-parallel": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-parallel/-/boolean-parallel-6.5.0.tgz",
+			"integrity": "sha512-aSHJsr1nq9e5TthZGZ9CZYeXklJyRgR5kCLm5X4urz7+MotMOp/LsGOsvKvK9NeUl9+8OUmfMn8EFTT8LkcvIQ==",
+			"requires": {
+				"@turf/clean-coords": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/line-segment": "^6.5.0",
+				"@turf/rhumb-bearing": "^6.5.0"
+			}
+		},
 		"@turf/boolean-point-in-polygon": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz",
@@ -400,6 +536,203 @@
 				"@turf/invariant": "^6.5.0"
 			}
 		},
+		"@turf/boolean-within": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/boolean-within/-/boolean-within-6.5.0.tgz",
+			"integrity": "sha512-YQB3oU18Inx35C/LU930D36RAVe7LDXk1kWsQ8mLmuqYn9YdPsDQTMTkLJMhoQ8EbN7QTdy333xRQ4MYgToteQ==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/boolean-point-on-line": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/buffer": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/buffer/-/buffer-6.5.0.tgz",
+			"integrity": "sha512-qeX4N6+PPWbKqp1AVkBVWFerGjMYMUyencwfnkCesoznU6qvfugFHNAngNqIBVnJjZ5n8IFyOf+akcxnrt9sNg==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/center": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/projection": "^6.5.0",
+				"d3-geo": "1.7.1",
+				"turf-jsts": "*"
+			}
+		},
+		"@turf/center": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/center/-/center-6.5.0.tgz",
+			"integrity": "sha512-T8KtMTfSATWcAX088rEDKjyvQCBkUsLnK/Txb6/8WUXIeOZyHu42G7MkdkHRoHtwieLdduDdmPLFyTdG5/e7ZQ==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/center-mean": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/center-mean/-/center-mean-6.5.0.tgz",
+			"integrity": "sha512-AAX6f4bVn12pTVrMUiB9KrnV94BgeBKpyg3YpfnEbBpkN/znfVhL8dG8IxMAxAoSZ61Zt9WLY34HfENveuOZ7Q==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/center-median": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/center-median/-/center-median-6.5.0.tgz",
+			"integrity": "sha512-dT8Ndu5CiZkPrj15PBvslpuf01ky41DEYEPxS01LOxp5HOUHXp1oJxsPxvc+i/wK4BwccPNzU1vzJ0S4emd1KQ==",
+			"requires": {
+				"@turf/center-mean": "^6.5.0",
+				"@turf/centroid": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/center-of-mass": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/center-of-mass/-/center-of-mass-6.5.0.tgz",
+			"integrity": "sha512-EWrriU6LraOfPN7m1jZi+1NLTKNkuIsGLZc2+Y8zbGruvUW+QV7K0nhf7iZWutlxHXTBqEXHbKue/o79IumAsQ==",
+			"requires": {
+				"@turf/centroid": "^6.5.0",
+				"@turf/convex": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/centroid": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/centroid/-/centroid-6.5.0.tgz",
+			"integrity": "sha512-MwE1oq5E3isewPprEClbfU5pXljIK/GUOMbn22UM3IFPDJX0KeoyLNwghszkdmFp/qMGL/M13MMWvU+GNLXP/A==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/circle": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/circle/-/circle-6.5.0.tgz",
+			"integrity": "sha512-oU1+Kq9DgRnoSbWFHKnnUdTmtcRUMmHoV9DjTXu9vOLNV5OWtAAh1VZ+mzsioGGzoDNT/V5igbFOkMfBQc0B6A==",
+			"requires": {
+				"@turf/destination": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/clean-coords": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/clean-coords/-/clean-coords-6.5.0.tgz",
+			"integrity": "sha512-EMX7gyZz0WTH/ET7xV8MyrExywfm9qUi0/MY89yNffzGIEHuFfqwhcCqZ8O00rZIPZHUTxpmsxQSTfzJJA1CPw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/clone": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/clone/-/clone-6.5.0.tgz",
+			"integrity": "sha512-mzVtTFj/QycXOn6ig+annKrM6ZlimreKYz6f/GSERytOpgzodbQyOgkfwru100O1KQhhjSudKK4DsQ0oyi9cTw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/clusters": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/clusters/-/clusters-6.5.0.tgz",
+			"integrity": "sha512-Y6gfnTJzQ1hdLfCsyd5zApNbfLIxYEpmDibHUqR5z03Lpe02pa78JtgrgUNt1seeO/aJ4TG1NLN8V5gOrHk04g==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/clusters-dbscan": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/clusters-dbscan/-/clusters-dbscan-6.5.0.tgz",
+			"integrity": "sha512-SxZEE4kADU9DqLRiT53QZBBhu8EP9skviSyl+FGj08Y01xfICM/RR9ACUdM0aEQimhpu+ZpRVcUK+2jtiCGrYQ==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"density-clustering": "1.3.0"
+			}
+		},
+		"@turf/clusters-kmeans": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/clusters-kmeans/-/clusters-kmeans-6.5.0.tgz",
+			"integrity": "sha512-DwacD5+YO8kwDPKaXwT9DV46tMBVNsbi1IzdajZu1JDSWoN7yc7N9Qt88oi+p30583O0UPVkAK+A10WAQv4mUw==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"skmeans": "0.9.7"
+			}
+		},
+		"@turf/collect": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/collect/-/collect-6.5.0.tgz",
+			"integrity": "sha512-4dN/T6LNnRg099m97BJeOcTA5fSI8cu87Ydgfibewd2KQwBexO69AnjEFqfPX3Wj+Zvisj1uAVIZbPmSSrZkjg==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"rbush": "2.x"
+			},
+			"dependencies": {
+				"quickselect": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmmirror.com/quickselect/-/quickselect-1.1.1.tgz",
+					"integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
+				},
+				"rbush": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmmirror.com/rbush/-/rbush-2.0.2.tgz",
+					"integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
+					"requires": {
+						"quickselect": "^1.0.1"
+					}
+				}
+			}
+		},
+		"@turf/combine": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/combine/-/combine-6.5.0.tgz",
+			"integrity": "sha512-Q8EIC4OtAcHiJB3C4R+FpB4LANiT90t17uOd851qkM2/o6m39bfN5Mv0PWqMZIHWrrosZqRqoY9dJnzz/rJxYQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/concave": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/concave/-/concave-6.5.0.tgz",
+			"integrity": "sha512-I/sUmUC8TC5h/E2vPwxVht+nRt+TnXIPRoztDFvS8/Y0+cBDple9inLSo9nnPXMXidrBlGXZ9vQx/BjZUJgsRQ==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/tin": "^6.5.0",
+				"topojson-client": "3.x",
+				"topojson-server": "3.x"
+			}
+		},
+		"@turf/convex": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/convex/-/convex-6.5.0.tgz",
+			"integrity": "sha512-x7ZwC5z7PJB0SBwNh7JCeCNx7Iu+QSrH7fYgK0RhhNop13TqUlvHMirMLRgf2db1DqUetrAO2qHJeIuasquUWg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"concaveman": "*"
+			}
+		},
 		"@turf/destination": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/destination/-/destination-6.5.0.tgz",
@@ -409,6 +742,27 @@
 				"@turf/invariant": "^6.5.0"
 			}
 		},
+		"@turf/difference": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/difference/-/difference-6.5.0.tgz",
+			"integrity": "sha512-l8iR5uJqvI+5Fs6leNbhPY5t/a3vipUF/3AeVLpwPQcgmedNXyheYuy07PcMGH5Jdpi5gItOiTqwiU/bUH4b3A==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"polygon-clipping": "^0.15.3"
+			}
+		},
+		"@turf/dissolve": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/dissolve/-/dissolve-6.5.0.tgz",
+			"integrity": "sha512-WBVbpm9zLTp0Bl9CE35NomTaOL1c4TQCtEoO43YaAhNEWJOOIhZMFJyr8mbvYruKl817KinT3x7aYjjCMjTAsQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"polygon-clipping": "^0.15.3"
+			}
+		},
 		"@turf/distance": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/distance/-/distance-6.5.0.tgz",
@@ -418,11 +772,119 @@
 				"@turf/invariant": "^6.5.0"
 			}
 		},
+		"@turf/distance-weight": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/distance-weight/-/distance-weight-6.5.0.tgz",
+			"integrity": "sha512-a8qBKkgVNvPKBfZfEJZnC3DV7dfIsC3UIdpRci/iap/wZLH41EmS90nM+BokAJflUHYy8PqE44wySGWHN1FXrQ==",
+			"requires": {
+				"@turf/centroid": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/ellipse": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/ellipse/-/ellipse-6.5.0.tgz",
+			"integrity": "sha512-kuXtwFviw/JqnyJXF1mrR/cb496zDTSbGKtSiolWMNImYzGGkbsAsFTjwJYgD7+4FixHjp0uQPzo70KDf3AIBw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/rhumb-destination": "^6.5.0",
+				"@turf/transform-rotate": "^6.5.0"
+			}
+		},
+		"@turf/envelope": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/envelope/-/envelope-6.5.0.tgz",
+			"integrity": "sha512-9Z+FnBWvOGOU4X+fMZxYFs1HjFlkKqsddLuMknRaqcJd6t+NIv5DWvPtDL8ATD2GEExYDiFLwMdckfr1yqJgHA==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/bbox-polygon": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/explode": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/explode/-/explode-6.5.0.tgz",
+			"integrity": "sha512-6cSvMrnHm2qAsace6pw9cDmK2buAlw8+tjeJVXMfMyY+w7ZUi1rprWMsY92J7s2Dar63Bv09n56/1V7+tcj52Q==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/flatten": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/flatten/-/flatten-6.5.0.tgz",
+			"integrity": "sha512-IBZVwoNLVNT6U/bcUUllubgElzpMsNoCw8tLqBw6dfYg9ObGmpEjf9BIYLr7a2Yn5ZR4l7YIj2T7kD5uJjZADQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/flip": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/flip/-/flip-6.5.0.tgz",
+			"integrity": "sha512-oyikJFNjt2LmIXQqgOGLvt70RgE2lyzPMloYWM7OR5oIFGRiBvqVD2hA6MNw6JewIm30fWZ8DQJw1NHXJTJPbg==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/great-circle": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/great-circle/-/great-circle-6.5.0.tgz",
+			"integrity": "sha512-7ovyi3HaKOXdFyN7yy1yOMa8IyOvV46RC1QOQTT+RYUN8ke10eyqExwBpL9RFUPvlpoTzoYbM/+lWPogQlFncg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
 		"@turf/helpers": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/helpers/-/helpers-6.5.0.tgz",
 			"integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw=="
 		},
+		"@turf/hex-grid": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/hex-grid/-/hex-grid-6.5.0.tgz",
+			"integrity": "sha512-Ln3tc2tgZT8etDOldgc6e741Smg1CsMKAz1/Mlel+MEL5Ynv2mhx3m0q4J9IB1F3a4MNjDeVvm8drAaf9SF33g==",
+			"requires": {
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/intersect": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/interpolate": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/interpolate/-/interpolate-6.5.0.tgz",
+			"integrity": "sha512-LSH5fMeiGyuDZ4WrDJNgh81d2DnNDUVJtuFryJFup8PV8jbs46lQGfI3r1DJ2p1IlEJIz3pmAZYeTfMMoeeohw==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/centroid": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/hex-grid": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/point-grid": "^6.5.0",
+				"@turf/square-grid": "^6.5.0",
+				"@turf/triangle-grid": "^6.5.0"
+			}
+		},
+		"@turf/intersect": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/intersect/-/intersect-6.5.0.tgz",
+			"integrity": "sha512-2legGJeKrfFkzntcd4GouPugoqPUjexPZnOvfez+3SfIMrHvulw8qV8u7pfVyn2Yqs53yoVCEjS5sEpvQ5YRQg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"polygon-clipping": "^0.15.3"
+			}
+		},
 		"@turf/invariant": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/invariant/-/invariant-6.5.0.tgz",
@@ -431,6 +893,33 @@
 				"@turf/helpers": "^6.5.0"
 			}
 		},
+		"@turf/isobands": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/isobands/-/isobands-6.5.0.tgz",
+			"integrity": "sha512-4h6sjBPhRwMVuFaVBv70YB7eGz+iw0bhPRnp+8JBdX1UPJSXhoi/ZF2rACemRUr0HkdVB/a1r9gC32vn5IAEkw==",
+			"requires": {
+				"@turf/area": "^6.5.0",
+				"@turf/bbox": "^6.5.0",
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/explode": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"object-assign": "*"
+			}
+		},
+		"@turf/isolines": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/isolines/-/isolines-6.5.0.tgz",
+			"integrity": "sha512-6ElhiLCopxWlv4tPoxiCzASWt/jMRvmp6mRYrpzOm3EUl75OhHKa/Pu6Y9nWtCMmVC/RcWtiiweUocbPLZLm0A==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"object-assign": "*"
+			}
+		},
 		"@turf/kinks": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/kinks/-/kinks-6.5.0.tgz",
@@ -439,6 +928,37 @@
 				"@turf/helpers": "^6.5.0"
 			}
 		},
+		"@turf/length": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/length/-/length-6.5.0.tgz",
+			"integrity": "sha512-5pL5/pnw52fck3oRsHDcSGrj9HibvtlrZ0QNy2OcW8qBFDNgZ4jtl6U7eATVoyWPKBHszW3dWETW+iLV7UARig==",
+			"requires": {
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/line-arc": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-arc/-/line-arc-6.5.0.tgz",
+			"integrity": "sha512-I6c+V6mIyEwbtg9P9zSFF89T7QPe1DPTG3MJJ6Cm1MrAY0MdejwQKOpsvNl8LDU2ekHOlz2kHpPVR7VJsoMllA==",
+			"requires": {
+				"@turf/circle": "^6.5.0",
+				"@turf/destination": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/line-chunk": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-chunk/-/line-chunk-6.5.0.tgz",
+			"integrity": "sha512-i1FGE6YJaaYa+IJesTfyRRQZP31QouS+wh/pa6O3CC0q4T7LtHigyBSYjrbjSLfn2EVPYGlPCMFEqNWCOkC6zg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/length": "^6.5.0",
+				"@turf/line-slice-along": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
 		"@turf/line-intersect": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/line-intersect/-/line-intersect-6.5.0.tgz",
@@ -451,6 +971,31 @@
 				"geojson-rbush": "3.x"
 			}
 		},
+		"@turf/line-offset": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-offset/-/line-offset-6.5.0.tgz",
+			"integrity": "sha512-CEXZbKgyz8r72qRvPchK0dxqsq8IQBdH275FE6o4MrBkzMcoZsfSjghtXzKaz9vvro+HfIXal0sTk2mqV1lQTw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/line-overlap": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-overlap/-/line-overlap-6.5.0.tgz",
+			"integrity": "sha512-xHOaWLd0hkaC/1OLcStCpfq55lPHpPNadZySDXYiYjEz5HXr1oKmtMYpn0wGizsLwrOixRdEp+j7bL8dPt4ojQ==",
+			"requires": {
+				"@turf/boolean-point-on-line": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/line-segment": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/nearest-point-on-line": "^6.5.0",
+				"deep-equal": "1.x",
+				"geojson-rbush": "3.x"
+			}
+		},
 		"@turf/line-segment": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/line-segment/-/line-segment-6.5.0.tgz",
@@ -461,6 +1006,27 @@
 				"@turf/meta": "^6.5.0"
 			}
 		},
+		"@turf/line-slice": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-slice/-/line-slice-6.5.0.tgz",
+			"integrity": "sha512-vDqJxve9tBHhOaVVFXqVjF5qDzGtKWviyjbyi2QnSnxyFAmLlLnBfMX8TLQCAf2GxHibB95RO5FBE6I2KVPRuw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/nearest-point-on-line": "^6.5.0"
+			}
+		},
+		"@turf/line-slice-along": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-slice-along/-/line-slice-along-6.5.0.tgz",
+			"integrity": "sha512-KHJRU6KpHrAj+BTgTNqby6VCTnDzG6a1sJx/I3hNvqMBLvWVA2IrkR9L9DtsQsVY63IBwVdQDqiwCuZLDQh4Ng==",
+			"requires": {
+				"@turf/bearing": "^6.5.0",
+				"@turf/destination": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
 		"@turf/line-split": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/line-split/-/line-split-6.5.0.tgz",
@@ -478,6 +1044,26 @@
 				"geojson-rbush": "3.x"
 			}
 		},
+		"@turf/line-to-polygon": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/line-to-polygon/-/line-to-polygon-6.5.0.tgz",
+			"integrity": "sha512-qYBuRCJJL8Gx27OwCD1TMijM/9XjRgXH/m/TyuND4OXedBpIWlK5VbTIO2gJ8OCfznBBddpjiObLBrkuxTpN4Q==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/mask": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/mask/-/mask-6.5.0.tgz",
+			"integrity": "sha512-RQha4aU8LpBrmrkH8CPaaoAfk0Egj5OuXtv6HuCQnHeGNOQt3TQVibTA3Sh4iduq4EPxnZfDjgsOeKtrCA19lg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"polygon-clipping": "^0.15.3"
+			}
+		},
 		"@turf/meta": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/meta/-/meta-6.5.0.tgz",
@@ -486,6 +1072,38 @@
 				"@turf/helpers": "^6.5.0"
 			}
 		},
+		"@turf/midpoint": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/midpoint/-/midpoint-6.5.0.tgz",
+			"integrity": "sha512-MyTzV44IwmVI6ec9fB2OgZ53JGNlgOpaYl9ArKoF49rXpL84F9rNATndbe0+MQIhdkw8IlzA6xVP4lZzfMNVCw==",
+			"requires": {
+				"@turf/bearing": "^6.5.0",
+				"@turf/destination": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/moran-index": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/moran-index/-/moran-index-6.5.0.tgz",
+			"integrity": "sha512-ItsnhrU2XYtTtTudrM8so4afBCYWNaB0Mfy28NZwLjB5jWuAsvyV+YW+J88+neK/ougKMTawkmjQqodNJaBeLQ==",
+			"requires": {
+				"@turf/distance-weight": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/nearest-point": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/nearest-point/-/nearest-point-6.5.0.tgz",
+			"integrity": "sha512-fguV09QxilZv/p94s8SMsXILIAMiaXI5PATq9d7YWijLxWUj6Q/r43kxyoi78Zmwwh1Zfqz9w+bCYUAxZ5+euA==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
 		"@turf/nearest-point-on-line": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/nearest-point-on-line/-/nearest-point-on-line-6.5.0.tgz",
@@ -500,6 +1118,232 @@
 				"@turf/meta": "^6.5.0"
 			}
 		},
+		"@turf/nearest-point-to-line": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/nearest-point-to-line/-/nearest-point-to-line-6.5.0.tgz",
+			"integrity": "sha512-PXV7cN0BVzUZdjj6oeb/ESnzXSfWmEMrsfZSDRgqyZ9ytdiIj/eRsnOXLR13LkTdXVOJYDBuf7xt1mLhM4p6+Q==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/point-to-line-distance": "^6.5.0",
+				"object-assign": "*"
+			}
+		},
+		"@turf/planepoint": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/planepoint/-/planepoint-6.5.0.tgz",
+			"integrity": "sha512-R3AahA6DUvtFbka1kcJHqZ7DMHmPXDEQpbU5WaglNn7NaCQg9HB0XM0ZfqWcd5u92YXV+Gg8QhC8x5XojfcM4Q==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/point-grid": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/point-grid/-/point-grid-6.5.0.tgz",
+			"integrity": "sha512-Iq38lFokNNtQJnOj/RBKmyt6dlof0yhaHEDELaWHuECm1lIZLY3ZbVMwbs+nXkwTAHjKfS/OtMheUBkw+ee49w==",
+			"requires": {
+				"@turf/boolean-within": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/point-on-feature": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/point-on-feature/-/point-on-feature-6.5.0.tgz",
+			"integrity": "sha512-bDpuIlvugJhfcF/0awAQ+QI6Om1Y1FFYE8Y/YdxGRongivix850dTeXCo0mDylFdWFPGDo7Mmh9Vo4VxNwW/TA==",
+			"requires": {
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/center": "^6.5.0",
+				"@turf/explode": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/nearest-point": "^6.5.0"
+			}
+		},
+		"@turf/point-to-line-distance": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/point-to-line-distance/-/point-to-line-distance-6.5.0.tgz",
+			"integrity": "sha512-opHVQ4vjUhNBly1bob6RWy+F+hsZDH9SA0UW36pIRzfpu27qipU18xup0XXEePfY6+wvhF6yL/WgCO2IbrLqEA==",
+			"requires": {
+				"@turf/bearing": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/projection": "^6.5.0",
+				"@turf/rhumb-bearing": "^6.5.0",
+				"@turf/rhumb-distance": "^6.5.0"
+			}
+		},
+		"@turf/points-within-polygon": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/points-within-polygon/-/points-within-polygon-6.5.0.tgz",
+			"integrity": "sha512-YyuheKqjliDsBDt3Ho73QVZk1VXX1+zIA2gwWvuz8bR1HXOkcuwk/1J76HuFMOQI3WK78wyAi+xbkx268PkQzQ==",
+			"requires": {
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/polygon-smooth": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/polygon-smooth/-/polygon-smooth-6.5.0.tgz",
+			"integrity": "sha512-LO/X/5hfh/Rk4EfkDBpLlVwt3i6IXdtQccDT9rMjXEP32tRgy0VMFmdkNaXoGlSSKf/1mGqLl4y4wHd86DqKbg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/polygon-tangents": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/polygon-tangents/-/polygon-tangents-6.5.0.tgz",
+			"integrity": "sha512-sB4/IUqJMYRQH9jVBwqS/XDitkEfbyqRy+EH/cMRJURTg78eHunvJ708x5r6umXsbiUyQU4eqgPzEylWEQiunw==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/boolean-within": "^6.5.0",
+				"@turf/explode": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/nearest-point": "^6.5.0"
+			}
+		},
+		"@turf/polygon-to-line": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/polygon-to-line/-/polygon-to-line-6.5.0.tgz",
+			"integrity": "sha512-5p4n/ij97EIttAq+ewSnKt0ruvuM+LIDzuczSzuHTpq4oS7Oq8yqg5TQ4nzMVuK41r/tALCk7nAoBuw3Su4Gcw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/polygonize": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/polygonize/-/polygonize-6.5.0.tgz",
+			"integrity": "sha512-a/3GzHRaCyzg7tVYHo43QUChCspa99oK4yPqooVIwTC61npFzdrmnywMv0S+WZjHZwK37BrFJGFrZGf6ocmY5w==",
+			"requires": {
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/envelope": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/projection": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/projection/-/projection-6.5.0.tgz",
+			"integrity": "sha512-/Pgh9mDvQWWu8HRxqpM+tKz8OzgauV+DiOcr3FCjD6ubDnrrmMJlsf6fFJmggw93mtVPrZRL6yyi9aYCQBOIvg==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/random": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/random/-/random-6.5.0.tgz",
+			"integrity": "sha512-8Q25gQ/XbA7HJAe+eXp4UhcXM9aOOJFaxZ02+XSNwMvY8gtWSCBLVqRcW4OhqilgZ8PeuQDWgBxeo+BIqqFWFQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/rectangle-grid": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/rectangle-grid/-/rectangle-grid-6.5.0.tgz",
+			"integrity": "sha512-yQZ/1vbW68O2KsSB3OZYK+72aWz/Adnf7m2CMKcC+aq6TwjxZjAvlbCOsNUnMAuldRUVN1ph6RXMG4e9KEvKvg==",
+			"requires": {
+				"@turf/boolean-intersects": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/rewind": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/rewind/-/rewind-6.5.0.tgz",
+			"integrity": "sha512-IoUAMcHWotBWYwSYuYypw/LlqZmO+wcBpn8ysrBNbazkFNkLf3btSDZMkKJO/bvOzl55imr/Xj4fi3DdsLsbzQ==",
+			"requires": {
+				"@turf/boolean-clockwise": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/rhumb-bearing": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/rhumb-bearing/-/rhumb-bearing-6.5.0.tgz",
+			"integrity": "sha512-jMyqiMRK4hzREjQmnLXmkJ+VTNTx1ii8vuqRwJPcTlKbNWfjDz/5JqJlb5NaFDcdMpftWovkW5GevfnuzHnOYA==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/rhumb-destination": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/rhumb-destination/-/rhumb-destination-6.5.0.tgz",
+			"integrity": "sha512-RHNP1Oy+7xTTdRrTt375jOZeHceFbjwohPHlr9Hf68VdHHPMAWgAKqiX2YgSWDcvECVmiGaBKWus1Df+N7eE4Q==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/rhumb-distance": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/rhumb-distance/-/rhumb-distance-6.5.0.tgz",
+			"integrity": "sha512-oKp8KFE8E4huC2Z1a1KNcFwjVOqa99isxNOwfo4g3SUABQ6NezjKDDrnvC4yI5YZ3/huDjULLBvhed45xdCrzg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0"
+			}
+		},
+		"@turf/sample": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/sample/-/sample-6.5.0.tgz",
+			"integrity": "sha512-kSdCwY7el15xQjnXYW520heKUrHwRvnzx8ka4eYxX9NFeOxaFITLW2G7UtXb6LJK8mmPXI8Aexv23F2ERqzGFg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/sector": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/sector/-/sector-6.5.0.tgz",
+			"integrity": "sha512-cYUOkgCTWqa23SOJBqxoFAc/yGCUsPRdn/ovbRTn1zNTm/Spmk6hVB84LCKOgHqvSF25i0d2kWqpZDzLDdAPbw==",
+			"requires": {
+				"@turf/circle": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/line-arc": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/shortest-path": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/shortest-path/-/shortest-path-6.5.0.tgz",
+			"integrity": "sha512-4de5+G7+P4hgSoPwn+SO9QSi9HY5NEV/xRJ+cmoFVRwv2CDsuOPDheHKeuIAhKyeKDvPvPt04XYWbac4insJMg==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/bbox-polygon": "^6.5.0",
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/clean-coords": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/transform-scale": "^6.5.0"
+			}
+		},
+		"@turf/simplify": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/simplify/-/simplify-6.5.0.tgz",
+			"integrity": "sha512-USas3QqffPHUY184dwQdP8qsvcVH/PWBYdXY5am7YTBACaQOMAlf6AKJs9FT8jiO6fQpxfgxuEtwmox+pBtlOg==",
+			"requires": {
+				"@turf/clean-coords": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
 		"@turf/square": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/square/-/square-6.5.0.tgz",
@@ -509,6 +1353,110 @@
 				"@turf/helpers": "^6.5.0"
 			}
 		},
+		"@turf/square-grid": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/square-grid/-/square-grid-6.5.0.tgz",
+			"integrity": "sha512-mlR0ayUdA+L4c9h7p4k3pX6gPWHNGuZkt2c5II1TJRmhLkW2557d6b/Vjfd1z9OVaajb1HinIs1FMSAPXuuUrA==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/rectangle-grid": "^6.5.0"
+			}
+		},
+		"@turf/standard-deviational-ellipse": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/standard-deviational-ellipse/-/standard-deviational-ellipse-6.5.0.tgz",
+			"integrity": "sha512-02CAlz8POvGPFK2BKK8uHGUk/LXb0MK459JVjKxLC2yJYieOBTqEbjP0qaWhiBhGzIxSMaqe8WxZ0KvqdnstHA==",
+			"requires": {
+				"@turf/center-mean": "^6.5.0",
+				"@turf/ellipse": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/points-within-polygon": "^6.5.0"
+			}
+		},
+		"@turf/tag": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/tag/-/tag-6.5.0.tgz",
+			"integrity": "sha512-XwlBvrOV38CQsrNfrxvBaAPBQgXMljeU0DV8ExOyGM7/hvuGHJw3y8kKnQ4lmEQcmcrycjDQhP7JqoRv8vFssg==",
+			"requires": {
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0"
+			}
+		},
+		"@turf/tesselate": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/tesselate/-/tesselate-6.5.0.tgz",
+			"integrity": "sha512-M1HXuyZFCfEIIKkglh/r5L9H3c5QTEsnMBoZOFQiRnGPGmJWcaBissGb7mTFX2+DKE7FNWXh4TDnZlaLABB0dQ==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"earcut": "^2.0.0"
+			}
+		},
+		"@turf/tin": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/tin/-/tin-6.5.0.tgz",
+			"integrity": "sha512-YLYikRzKisfwj7+F+Tmyy/LE3d2H7D4kajajIfc9mlik2+esG7IolsX/+oUz1biguDYsG0DUA8kVYXDkobukfg==",
+			"requires": {
+				"@turf/helpers": "^6.5.0"
+			}
+		},
+		"@turf/transform-rotate": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/transform-rotate/-/transform-rotate-6.5.0.tgz",
+			"integrity": "sha512-A2Ip1v4246ZmpssxpcL0hhiVBEf4L8lGnSPWTgSv5bWBEoya2fa/0SnFX9xJgP40rMP+ZzRaCN37vLHbv1Guag==",
+			"requires": {
+				"@turf/centroid": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/rhumb-bearing": "^6.5.0",
+				"@turf/rhumb-destination": "^6.5.0",
+				"@turf/rhumb-distance": "^6.5.0"
+			}
+		},
+		"@turf/transform-scale": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/transform-scale/-/transform-scale-6.5.0.tgz",
+			"integrity": "sha512-VsATGXC9rYM8qTjbQJ/P7BswKWXHdnSJ35JlV4OsZyHBMxJQHftvmZJsFbOqVtQnIQIzf2OAly6rfzVV9QLr7g==",
+			"requires": {
+				"@turf/bbox": "^6.5.0",
+				"@turf/center": "^6.5.0",
+				"@turf/centroid": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/rhumb-bearing": "^6.5.0",
+				"@turf/rhumb-destination": "^6.5.0",
+				"@turf/rhumb-distance": "^6.5.0"
+			}
+		},
+		"@turf/transform-translate": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/transform-translate/-/transform-translate-6.5.0.tgz",
+			"integrity": "sha512-NABLw5VdtJt/9vSstChp93pc6oel4qXEos56RBMsPlYB8hzNTEKYtC146XJvyF4twJeeYS8RVe1u7KhoFwEM5w==",
+			"requires": {
+				"@turf/clone": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/rhumb-destination": "^6.5.0"
+			}
+		},
+		"@turf/triangle-grid": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/triangle-grid/-/triangle-grid-6.5.0.tgz",
+			"integrity": "sha512-2jToUSAS1R1htq4TyLQYPTIsoy6wg3e3BQXjm2rANzw4wPQCXGOxrur1Fy9RtzwqwljlC7DF4tg0OnWr8RjmfA==",
+			"requires": {
+				"@turf/distance": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/intersect": "^6.5.0"
+			}
+		},
 		"@turf/truncate": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmmirror.com/@turf/truncate/-/truncate-6.5.0.tgz",
@@ -518,6 +1466,165 @@
 				"@turf/meta": "^6.5.0"
 			}
 		},
+		"@turf/turf": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/turf/-/turf-6.5.0.tgz",
+			"integrity": "sha512-ipMCPnhu59bh92MNt8+pr1VZQhHVuTMHklciQURo54heoxRzt1neNYZOBR6jdL+hNsbDGAECMuIpAutX+a3Y+w==",
+			"requires": {
+				"@turf/along": "^6.5.0",
+				"@turf/angle": "^6.5.0",
+				"@turf/area": "^6.5.0",
+				"@turf/bbox": "^6.5.0",
+				"@turf/bbox-clip": "^6.5.0",
+				"@turf/bbox-polygon": "^6.5.0",
+				"@turf/bearing": "^6.5.0",
+				"@turf/bezier-spline": "^6.5.0",
+				"@turf/boolean-clockwise": "^6.5.0",
+				"@turf/boolean-contains": "^6.5.0",
+				"@turf/boolean-crosses": "^6.5.0",
+				"@turf/boolean-disjoint": "^6.5.0",
+				"@turf/boolean-equal": "^6.5.0",
+				"@turf/boolean-intersects": "^6.5.0",
+				"@turf/boolean-overlap": "^6.5.0",
+				"@turf/boolean-parallel": "^6.5.0",
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/boolean-point-on-line": "^6.5.0",
+				"@turf/boolean-within": "^6.5.0",
+				"@turf/buffer": "^6.5.0",
+				"@turf/center": "^6.5.0",
+				"@turf/center-mean": "^6.5.0",
+				"@turf/center-median": "^6.5.0",
+				"@turf/center-of-mass": "^6.5.0",
+				"@turf/centroid": "^6.5.0",
+				"@turf/circle": "^6.5.0",
+				"@turf/clean-coords": "^6.5.0",
+				"@turf/clone": "^6.5.0",
+				"@turf/clusters": "^6.5.0",
+				"@turf/clusters-dbscan": "^6.5.0",
+				"@turf/clusters-kmeans": "^6.5.0",
+				"@turf/collect": "^6.5.0",
+				"@turf/combine": "^6.5.0",
+				"@turf/concave": "^6.5.0",
+				"@turf/convex": "^6.5.0",
+				"@turf/destination": "^6.5.0",
+				"@turf/difference": "^6.5.0",
+				"@turf/dissolve": "^6.5.0",
+				"@turf/distance": "^6.5.0",
+				"@turf/distance-weight": "^6.5.0",
+				"@turf/ellipse": "^6.5.0",
+				"@turf/envelope": "^6.5.0",
+				"@turf/explode": "^6.5.0",
+				"@turf/flatten": "^6.5.0",
+				"@turf/flip": "^6.5.0",
+				"@turf/great-circle": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/hex-grid": "^6.5.0",
+				"@turf/interpolate": "^6.5.0",
+				"@turf/intersect": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"@turf/isobands": "^6.5.0",
+				"@turf/isolines": "^6.5.0",
+				"@turf/kinks": "^6.5.0",
+				"@turf/length": "^6.5.0",
+				"@turf/line-arc": "^6.5.0",
+				"@turf/line-chunk": "^6.5.0",
+				"@turf/line-intersect": "^6.5.0",
+				"@turf/line-offset": "^6.5.0",
+				"@turf/line-overlap": "^6.5.0",
+				"@turf/line-segment": "^6.5.0",
+				"@turf/line-slice": "^6.5.0",
+				"@turf/line-slice-along": "^6.5.0",
+				"@turf/line-split": "^6.5.0",
+				"@turf/line-to-polygon": "^6.5.0",
+				"@turf/mask": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"@turf/midpoint": "^6.5.0",
+				"@turf/moran-index": "^6.5.0",
+				"@turf/nearest-point": "^6.5.0",
+				"@turf/nearest-point-on-line": "^6.5.0",
+				"@turf/nearest-point-to-line": "^6.5.0",
+				"@turf/planepoint": "^6.5.0",
+				"@turf/point-grid": "^6.5.0",
+				"@turf/point-on-feature": "^6.5.0",
+				"@turf/point-to-line-distance": "^6.5.0",
+				"@turf/points-within-polygon": "^6.5.0",
+				"@turf/polygon-smooth": "^6.5.0",
+				"@turf/polygon-tangents": "^6.5.0",
+				"@turf/polygon-to-line": "^6.5.0",
+				"@turf/polygonize": "^6.5.0",
+				"@turf/projection": "^6.5.0",
+				"@turf/random": "^6.5.0",
+				"@turf/rewind": "^6.5.0",
+				"@turf/rhumb-bearing": "^6.5.0",
+				"@turf/rhumb-destination": "^6.5.0",
+				"@turf/rhumb-distance": "^6.5.0",
+				"@turf/sample": "^6.5.0",
+				"@turf/sector": "^6.5.0",
+				"@turf/shortest-path": "^6.5.0",
+				"@turf/simplify": "^6.5.0",
+				"@turf/square": "^6.5.0",
+				"@turf/square-grid": "^6.5.0",
+				"@turf/standard-deviational-ellipse": "^6.5.0",
+				"@turf/tag": "^6.5.0",
+				"@turf/tesselate": "^6.5.0",
+				"@turf/tin": "^6.5.0",
+				"@turf/transform-rotate": "^6.5.0",
+				"@turf/transform-scale": "^6.5.0",
+				"@turf/transform-translate": "^6.5.0",
+				"@turf/triangle-grid": "^6.5.0",
+				"@turf/truncate": "^6.5.0",
+				"@turf/union": "^6.5.0",
+				"@turf/unkink-polygon": "^6.5.0",
+				"@turf/voronoi": "^6.5.0"
+			}
+		},
+		"@turf/union": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/union/-/union-6.5.0.tgz",
+			"integrity": "sha512-igYWCwP/f0RFHIlC2c0SKDuM/ObBaqSljI3IdV/x71805QbIvY/BYGcJdyNcgEA6cylIGl/0VSlIbpJHZ9ldhw==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"polygon-clipping": "^0.15.3"
+			}
+		},
+		"@turf/unkink-polygon": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/unkink-polygon/-/unkink-polygon-6.5.0.tgz",
+			"integrity": "sha512-8QswkzC0UqKmN1DT6HpA9upfa1HdAA5n6bbuzHy8NJOX8oVizVAqfEPY0wqqTgboDjmBR4yyImsdPGUl3gZ8JQ==",
+			"requires": {
+				"@turf/area": "^6.5.0",
+				"@turf/boolean-point-in-polygon": "^6.5.0",
+				"@turf/helpers": "^6.5.0",
+				"@turf/meta": "^6.5.0",
+				"rbush": "^2.0.1"
+			},
+			"dependencies": {
+				"quickselect": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmmirror.com/quickselect/-/quickselect-1.1.1.tgz",
+					"integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
+				},
+				"rbush": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmmirror.com/rbush/-/rbush-2.0.2.tgz",
+					"integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
+					"requires": {
+						"quickselect": "^1.0.1"
+					}
+				}
+			}
+		},
+		"@turf/voronoi": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmmirror.com/@turf/voronoi/-/voronoi-6.5.0.tgz",
+			"integrity": "sha512-C/xUsywYX+7h1UyNqnydHXiun4UPjK88VDghtoRypR9cLlb7qozkiLRphQxxsCM0KxyxpVPHBVQXdAL3+Yurow==",
+			"requires": {
+				"@turf/helpers": "^6.5.0",
+				"@turf/invariant": "^6.5.0",
+				"d3-voronoi": "1.1.2"
+			}
+		},
 		"@types/estree": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
@@ -919,6 +2026,11 @@
 				"delayed-stream": "~1.0.0"
 			}
 		},
+		"commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+		},
 		"concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -936,6 +2048,17 @@
 				"typedarray": "^0.0.6"
 			}
 		},
+		"concaveman": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/concaveman/-/concaveman-1.2.1.tgz",
+			"integrity": "sha512-PwZYKaM/ckQSa8peP5JpVr7IMJ4Nn/MHIaWUjP4be+KoZ7Botgs8seAZGpmaOM+UZXawcdYRao/px9ycrCihHw==",
+			"requires": {
+				"point-in-polygon": "^1.1.0",
+				"rbush": "^3.0.1",
+				"robust-predicates": "^2.0.4",
+				"tinyqueue": "^2.0.3"
+			}
+		},
 		"core-util-is": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -1019,6 +2142,11 @@
 			"resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
 			"integrity": "sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg=="
 		},
+		"d3-array": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
+		},
 		"d3-dsv": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.1.tgz",
@@ -1027,6 +2155,14 @@
 				"rw": "1"
 			}
 		},
+		"d3-geo": {
+			"version": "1.7.1",
+			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-1.7.1.tgz",
+			"integrity": "sha512-O4AempWAr+P5qbk2bC2FuN/sDW4z+dN2wDf9QV3bxQt4M5HfOEeXLgJ/UKQW0+o1Dj8BE+L5kiDbdWUMjsmQpw==",
+			"requires": {
+				"d3-array": "1"
+			}
+		},
 		"d3-geo-projection": {
 			"version": "0.2.16",
 			"resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz",
@@ -1040,6 +2176,11 @@
 			"resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz",
 			"integrity": "sha512-ejbdHqZYEmk9ns/ljSbEcD6VRiuNwAkZMdFf6rsUb3vHROK5iMFd8xewDQnUVr6m/ba2BG63KmR/LySfsluxbg=="
 		},
+		"d3-voronoi": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmmirror.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz",
+			"integrity": "sha512-RhGS1u2vavcO7ay7ZNAPo4xeDh/VYeGof3x5ZLJBQgYhLegxr3s5IykvWmJ94FTU6mcbtp4sloqZ54mP6R4Utw=="
+		},
 		"dayjs": {
 			"version": "1.11.7",
 			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
@@ -1106,6 +2247,11 @@
 			"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
 			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
 		},
+		"density-clustering": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmmirror.com/density-clustering/-/density-clustering-1.3.0.tgz",
+			"integrity": "sha512-icpmBubVTwLnsaor9qH/4tG5+7+f61VcqMN3V3pm9sxxSCt2Jcs0zWOgwZW9ARJYaKD3FumIgHiMOcIMRRAzFQ=="
+		},
 		"doctrine": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1146,6 +2292,11 @@
 				}
 			}
 		},
+		"earcut": {
+			"version": "2.2.4",
+			"resolved": "https://registry.npmmirror.com/earcut/-/earcut-2.2.4.tgz",
+			"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
+		},
 		"echarts": {
 			"version": "5.4.2",
 			"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
@@ -1542,6 +2693,14 @@
 			"resolved": "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz",
 			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
 		},
+		"geojson-equality": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmmirror.com/geojson-equality/-/geojson-equality-0.1.6.tgz",
+			"integrity": "sha512-TqG8YbqizP3EfwP5Uw4aLu6pKkg6JQK9uq/XZ1lXQntvTHD1BBKJWhNpJ2M0ax6TuWMP3oyx6Oq7FCIfznrgpQ==",
+			"requires": {
+				"deep-equal": "^1.0.0"
+			}
+		},
 		"geojson-rbush": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmmirror.com/geojson-rbush/-/geojson-rbush-3.2.0.tgz",
@@ -2007,6 +3166,11 @@
 				"boolbase": "^1.0.0"
 			}
 		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+		},
 		"object-inspect": {
 			"version": "1.12.3",
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -2140,6 +3304,11 @@
 				"vue-demi": "*"
 			}
 		},
+		"point-in-polygon": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/point-in-polygon/-/point-in-polygon-1.1.0.tgz",
+			"integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw=="
+		},
 		"polygon-clipping": {
 			"version": "0.15.3",
 			"resolved": "https://registry.npmmirror.com/polygon-clipping/-/polygon-clipping-0.15.3.tgz",
@@ -2349,6 +3518,11 @@
 				"glob": "^7.1.3"
 			}
 		},
+		"robust-predicates": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-2.0.4.tgz",
+			"integrity": "sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg=="
+		},
 		"rollup": {
 			"version": "3.20.2",
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz",
@@ -2467,6 +3641,11 @@
 				"object-inspect": "^1.9.0"
 			}
 		},
+		"skmeans": {
+			"version": "0.9.7",
+			"resolved": "https://registry.npmmirror.com/skmeans/-/skmeans-0.9.7.tgz",
+			"integrity": "sha512-hNj1/oZ7ygsfmPZ7ZfN5MUBRoGg1gtpnImuJBgLO0ljQ67DtJuiQaiYdS4lUA6s0KCwnPhGivtC/WRwIZLkHyg=="
+		},
 		"sortablejs": {
 			"version": "1.15.0",
 			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
@@ -2673,6 +3852,11 @@
 			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
 			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
 		},
+		"tinyqueue": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmmirror.com/tinyqueue/-/tinyqueue-2.0.3.tgz",
+			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
+		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2753,11 +3937,32 @@
 				}
 			}
 		},
+		"topojson-client": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmmirror.com/topojson-client/-/topojson-client-3.1.0.tgz",
+			"integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
+			"requires": {
+				"commander": "2"
+			}
+		},
+		"topojson-server": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmmirror.com/topojson-server/-/topojson-server-3.0.1.tgz",
+			"integrity": "sha512-/VS9j/ffKr2XAOjlZ9CgyyeLmgJ9dMwq6Y0YEON8O7p/tGGk+dCWnrE03zEdu7i4L7YsFZLEPZPzCvcB7lEEXw==",
+			"requires": {
+				"commander": "2"
+			}
+		},
 		"tslib": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
 			"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
 		},
+		"turf-jsts": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmmirror.com/turf-jsts/-/turf-jsts-1.2.3.tgz",
+			"integrity": "sha512-Ja03QIJlPuHt4IQ2FfGex4F4JAr8m3jpaHbFbQrgwr7s7L6U8ocrHiF3J1+wf9jzhGKxvDeaCAnGDot8OjGFyA=="
+		},
 		"type-check": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
diff --git a/package.json b/package.json
index 826ed3d..0ba43a2 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
 		"@element-plus/icons-vue": "^2.1.0",
 		"@geoman-io/leaflet-geoman-free": "^2.14.2",
 		"@mapbox/leaflet-omnivore": "^0.3.4",
+		"@turf/turf": "^6.5.0",
 		"@vueup/vue-quill": "^1.0.0-alpha.40",
 		"axios": "^1.3.4",
 		"echarts": "^5.4.2",
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 5aea370..1fa3079 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -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,7 +19,6 @@ 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
 
@@ -43,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)
 })
@@ -141,13 +56,32 @@ onMounted(() => {
    */
 const mapOperations = {
   wktParseToMap: (res) => {
-    return omnivore.wkt.parse(res).addTo(featureLayerG_point)
-    // if(omnivore.wkt.parse(res) instanceof L.Marker){
-      
-    // }
-    // else{
-    //   return omnivore.wkt.parse(res).addTo(featureLayerG_area )
-    // }
+    let layer = omnivore.wkt.parse(res)
+    layer.addTo(featureLayerG_point)
+    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
     
   },
   /** 添加点标注
@@ -343,10 +277,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添加的所有
@@ -370,54 +301,38 @@ const mapOperations = {
     featureLayerG_point.clearLayers()
     // featureLayerG_area.clearLayers()
     // variableStore.layerGroupPoly=null;
-    text = new L.Draw.Polygon(homeMap)
-    text.enable()
+    
   },
   clearPolygon: () => {
     // console.log('1-2')
-    text.disable()
+    
     featureLayerG_area.clearLayers()
     variableStore.layerGroupPoly = null
     // 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,
-      })
-      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.enable()
-    })
+    
+    // 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')
+      
+    // })
   },
   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()
-    })
+    
   },
 }
 //omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 02abe26..278b23a 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -164,6 +164,7 @@ import "leaflet/dist/leaflet.css";
 import 'leaflet-draw/dist/leaflet.draw'
 import 'leaflet-draw/dist/leaflet.draw.css'
 import { map } from 'lodash';
+import * as turf from '@turf/turf'
 const variableStore = useVariableStore();
 const mapRef = ref();
 const activeName = ref('first');
@@ -247,8 +248,8 @@ const onOpenEditRole = (type, row) => {
 };
 const mapEvents = (ev)=>{
   if(ev == '1'){    
-    mapRef.value.mapOperations.clearPolygon()
-    // mapRef.value.mapOperations.on("click", mapClick)
+    // mapRef.value.mapOperations.clearPolygon()
+    mapRef.value.mapOperations.on("click", mapClick)
     mapRef.value.mapOperations.on("mousemove", changelatlon)
     variableStore.polygoncontrol = "option1"
   }else{

From 3d68dcfe9cd583611045dc6737f3e650f888cc82 Mon Sep 17 00:00:00 2001
From: qqGroup0 <253114712@qq.com>
Date: Sun, 23 Apr 2023 16:42:10 +0800
Subject: [PATCH 03/14] =?UTF-8?q?zqq:=E9=81=A5=E6=84=9F=E7=88=AC=E8=99=AB?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=88=E5=BE=85=E8=A1=A5=E5=85=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crawl/index.js                        | 128 ++---
 src/components/Map.vue                        | 219 ++++++--
 src/utils/request.js                          |   4 +-
 .../components/searchCondition.vue            | 510 +++++++++++-------
 .../dataService/remoteSensingData/index.vue   |   3 +-
 .../responseManagement/userResponse/index.vue |   4 -
 6 files changed, 540 insertions(+), 328 deletions(-)

diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js
index d3d0838..08df2f7 100644
--- a/src/api/crawl/index.js
+++ b/src/api/crawl/index.js
@@ -1,68 +1,68 @@
-import request, {crawlModule ,moduleName } from '/@/utils/request';
+import request, { crawlModule, moduleName } from '/@/utils/request';
 
+export const geoserve = (vordm_id, link, disaster_id, name) => {
+	return request({
+		url: '/api/' + crawlModule + '/geoserve/pushing',
+		method: 'post',
+		data: {
+			vordm_id,
+			link,
+			disaster_id,
+			name,
+		},
+	});
+};
+export const news = (disaster_id, keywords, page, isBaidu, id) => {
+	return request({
+		url: '/api/' + crawlModule + '/news/' + (isBaidu ? 'baidu' : 'bing'),
+		method: 'post',
+		data: {
+			disaster_id,
+			keywords,
+			page,
+			id,
+		},
+	});
+};
+export const rs = (stime, etime, disaster_id, ranges, type = 1) => {
+	let method = 'sentinel';
+	if (type == 1) {
+		method = 'sentinel';
+	} else if (type == 2) {
+		method = 'landsat';
+	} else {
+		method = 'searchone';
+	}
 
-
-export const geoserve = (vordm_id , link , disaster_id, name) =>{ 
-    return request({
-        url: '/api/' + crawlModule + '/geoserve/pushing',
-        method: 'post',
-        data: {
-            vordm_id,
-            link,
-            disaster_id,
-            name
-        }
-    });
-}
-export const news = (disaster_id, keywords, page,isBaidu,id) =>{ 
-    return request({
-        url: '/api/' + crawlModule + '/news/'+(isBaidu?"baidu":"bing"),
-        method: 'post',
-        data: {
-            disaster_id,
-            keywords,
-            page,
-            id
-        }
-    });
-}
-export const rs = (stime, etime, disaster_id,ranges ,type =1) =>{ 
-    let method = 'sentinel';
-    if(type == 1){
-        method = 'sentinel';
-    }else if(type == 2){
-        method = 'landsat';
-    }else {
-        method = 'searchone';
-    }
-
-    return request({
-        url: '/api/' + crawlModule + '/news/'+method,
-        method: 'post',
-        data: {
-            stime, etime, disaster_id,ranges
-        }
-    });
-}
+	return request({
+		url: '/api/' + crawlModule + '/rs/' + method,
+		method: 'post',
+		data: {
+			stime,
+			etime,
+			disaster_id,
+			ranges,
+		},
+	});
+};
 export const submit = (row) => {
-    return request({
-        url: '/api/'+moduleName+'/ui/crawlInfo/submit',
-        method: 'post',
-        data: row
-    })
-}
+	return request({
+		url: '/api/' + moduleName + '/ui/crawlInfo/submit',
+		method: 'post',
+		data: row,
+	});
+};
 export const getList = (current, size, param) => {
-    let params =  {
-        current,
-        size,
-    };
-    if(param){
-        params = Object.assign(params, param);
-    }
-    return request({
-        url: '/api/'+moduleName+'/ui/crawlInfo/list',
-        method: 'get',
-        params: params
-    });
-
-}
\ No newline at end of file
+	let params = {
+		current,
+		size,
+	};
+	if (param) {
+		params = Object.assign(params, param);
+	}
+	return request({
+		url: '/api/' + moduleName + '/ui/crawlInfo/list',
+		method: 'get',
+		params: params,
+	});
+};
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 1fa3079..3c6c5d8 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -2,25 +2,27 @@
   <div ref="map"
        class="container"></div>
 </template>
-
-<script setup>
+  
+  <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'
 import 'leaflet-draw/dist/leaflet.draw.css'
-import '@geoman-io/leaflet-geoman-free';  
-import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';  
+import '@geoman-io/leaflet-geoman-free';
+import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
 import 'Leaflet-ImageOverlay-Rotated'
 import { useVariableStore } from '/@/stores/index.ts'
 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, {
@@ -42,8 +44,92 @@ 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)
 })
@@ -56,33 +142,14 @@ onMounted(() => {
    */
 const mapOperations = {
   wktParseToMap: (res) => {
-    let layer = omnivore.wkt.parse(res)
-    layer.addTo(featureLayerG_point)
-    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
-    
+    return omnivore.wkt.parse(res).addTo(featureLayerG_point)
+    // if(omnivore.wkt.parse(res) instanceof L.Marker){
+
+    // }
+    // else{
+    //   return omnivore.wkt.parse(res).addTo(featureLayerG_area )
+    // }
+
   },
   /** 添加点标注
    * Object param 参数集合
@@ -277,7 +344,10 @@ const mapOperations = {
     featureLayerG_point.clearLayers()
     variableStore.layerGroupPoint = null
     variableStore.layerGroupPoly = null
-    
+    if (variableStore.polygoncontrol == 'option2') {
+      text = new L.Draw.Polygon(homeMap)
+      text.enable()
+    }
   },
   /**
    * 清楚wkt添加的所有
@@ -301,43 +371,78 @@ const mapOperations = {
     featureLayerG_point.clearLayers()
     // featureLayerG_area.clearLayers()
     // variableStore.layerGroupPoly=null;
-    
+    text = new L.Draw.Polygon(homeMap)
+    text.enable()
   },
   clearPolygon: () => {
     // console.log('1-2')
-    
+    text.disable()
     featureLayerG_area.clearLayers()
     variableStore.layerGroupPoly = null
     // variableStore.layerGroupPoint=null
     // featureLayerG_point.clearLayers()
   },
   drawCreated: () => {
-    
-    // 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')
-      
-    // })
+    // console.log("2-3")
+    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')
+      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
+    }
+    homeMap.pm.enableDraw('Rectangle', {
+      snappable: true,
+      snapDistance: 20,
+    });
+    homeMap.on('pm:create', (e) => {
+      L.PM.reInitLayer(e.layer);
+      layerRectangle = e.layer
+    });
+  },
+  deleteRectangle: () => {
+    homeMap.removeLayer(layerRectangle)
+  }
+
 }
 //omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
 
 defineExpose({
   mapOperations,
 })
-</script>
+  </script>
+  
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 23898cb..8e4e748 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,8 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
-// export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'biz-vordm';
+export const moduleName = 'zqq-biz-vordm';
+// export const moduleName = 'biz-vordm';
 export const crawlModule = 'vordm-crawl';
 // 配置新建一个 axios 实例
 const service = axios.create({
diff --git a/src/views/dataService/remoteSensingData/components/searchCondition.vue b/src/views/dataService/remoteSensingData/components/searchCondition.vue
index 2d7fbae..406ad6e 100644
--- a/src/views/dataService/remoteSensingData/components/searchCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/searchCondition.vue
@@ -7,7 +7,7 @@
           <el-card class="box-card">
             <span>Select time range</span>
             <el-row class="block">
-              <el-col :span="3">
+              <el-col :span="5">
                 <span class="demonstration">Start time</span>
               </el-col>
               <el-col :span="19">
@@ -15,11 +15,12 @@
                                 v-model="state.startTime"
                                 type="datetime"
                                 placeholder="Select start time"
-                                :shortcuts="shortcuts" />
+                                value-format="YYYY-MM-DD HH:mm:ss"
+                                :shortcuts="state.shortcuts" />
               </el-col>
             </el-row>
             <el-row class="block">
-              <el-col :span="3">
+              <el-col :span="5">
                 <span class="demonstration">End time</span>
               </el-col>
               <el-col :span="19">
@@ -27,7 +28,8 @@
                                 v-model="state.endTime"
                                 type="datetime"
                                 placeholder="Select end time"
-                                :shortcuts="shortcuts" />
+                                value-format="YYYY-MM-DD HH:mm:ss"
+                                :shortcuts="state.shortcuts" />
               </el-col>
             </el-row>
           </el-card>
@@ -43,8 +45,8 @@
                   <el-col :span="1"></el-col>
                   <el-col :span="19">
                     <span style="font-size:14px;width: 100%;">{{
-                      'Lat:&emsp;' + parseFloat(coordinate.Lat).toFixed(4) + ',&emsp;&emsp;Lng:&emsp;' + parseFloat(coordinate.Lng).toFixed(4)
-                      }}</span>
+                        'Lat:&emsp;' + parseFloat(coordinate.Lat).toFixed(4) + ',&emsp;&emsp;Lng:&emsp;' + parseFloat(coordinate.Lng).toFixed(4)
+                        }}</span>
                   </el-col>
                   <el-col :span="2">
                     <el-button class="el-icon"
@@ -82,7 +84,7 @@
             <span>Select satellite type</span>
             <el-tree-select class="satelliteSelect"
                             v-model="state.satelliteSelected"
-                            :data="sensor"
+                            :data="state.sensor"
                             multiple
                             collapse-tags
                             collapse-tags-tooltip
@@ -98,7 +100,7 @@
                        v-model="state.selectID"
                        clearable
                        placeholder="Select VoRDM ID">
-              <el-option v-for="item in idOptions"
+              <el-option v-for="item in state.idOptions"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value" />
@@ -118,160 +120,24 @@
         </div>
       </el-col>
       <el-col :span="16">
-        <Map id="map"></Map>
+        <Map id="map"
+             ref="map">
+        </Map>
       </el-col>
 
     </el-row>
   </div>
 </template>
-
-<script setup>
+  
+  <script setup>
 import Map from "/@/components/Map.vue";
-import { ref, reactive } from 'vue';
-
-// 卫星类型
-const sensor = ref([
-  {
-    value: 'landsat',
-    label: 'landsat',
-    //   children: [{
-    //     value: 1 - 1,
-    //     label: 'LANDSAT_8_C1'
-    //   },
-    //   {
-    //     value: 1 - 2,
-    //     label: 'LANDSAT_ETM_C1'
-    //   },
-    //   {
-    //     value: 1 - 3,
-    //     label: 'LANDSAT_TM_C1'
-    //   }
-    //   ]
-  },
-  {
-    value: 'Sentinel',
-    label: 'Sentinel',
-    //   children: [{
-    //     value: 2 - 1,
-    //     label: 'Sentinel - 2',
-    //     children: [{
-    //       value: 2 - 1 - 1,
-    //       label: 'S2MSI2A'
-    //     }]
-    //   },
-    //   {
-    //     value: 2 - 2,
-    //     label: 'Sentinel - 1',
-    //     children: [{
-    //       value: 2 - 2 - 1,
-    //       label: 'SLC'
-    //     }]
-    //   }
-    //   ]
-  },
-  {
-    value: '国产系列卫星',
-    label: '国产系列卫星',
-    children: [
-      {
-        value: 'GF - 1',
-        label: 'GF - 1',
-      },
-      {
-        value: 'GF - 2',
-        label: 'GF - 2',
-      },
-      {
-        value: 'GF - 3',
-        label: 'GF - 3',
-      },
-      {
-        value: 'GF - 4',
-        label: 'GF - 4',
-      },
-      {
-        value: 'GF - 6',
-        label: 'GF - 6',
-      },
-      {
-        value: 'ZY - 3',
-        label: 'ZY - 3',
-      },
-      {
-        value: 'ZY - 302',
-        label: 'ZY - 302',
-      },
-      {
-        value: 'ZY - 02C',
-        label: 'ZY - 02C',
-      },
-    ],
-  },
-  {
-    value: '欧比特珠海一号系列卫星',
-    label: '欧比特珠海一号系列卫星',
-    children: [
-      {
-        value: 'OVS - 2A',
-        label: 'OVS - 2A',
-      },
-      {
-        value: 'OVS - 3A',
-        label: 'OVS - 3A',
-      },
-      {
-        value: 'OVS - 1A',
-        label: 'OVS - 1A',
-      },
-      {
-        value: 'OVS - 1B',
-        label: 'OVS - 1B',
-      },
-      {
-        value: 'OHS - 2A',
-        label: 'OHS - 2A',
-      },
-      {
-        value: 'OHS - 2B',
-        label: 'OHS - 2B',
-      },
-      {
-        value: 'OHS - 2C',
-        label: 'OHS - 2C',
-      },
-      {
-        value: 'OHS - 2D',
-        label: 'OHS - 2D',
-      },
-    ],
-  }
-])
-
-// VoRDM ID
-const idOptions = [
-  {
-    value: '2023001001',
-    label: '2023001001',
-  },
-  {
-    value: '2023001002',
-    label: '2023001002',
-  },
-  {
-    value: '2023001003',
-    label: '2023001003',
-  },
-  {
-    value: '2023001004',
-    label: '2023001004',
-  },
-  {
-    value: '2023001005',
-    label: '2023001005',
-  },
-]
+import { ref, reactive, watch } from 'vue';
+import { rs, submit } from '/@/api/crawl/index';
+import { useUserInfo } from '/@/stores/userInfo';
+const userInfo = useUserInfo();
 
 // 初始化数据
+const map = ref()
 const state = reactive({
   startTime: '',
   endTime: '',
@@ -279,68 +145,304 @@ const state = reactive({
   satelliteSelected: [],
   coordinateList: [],
   selectID: '',
+  sensor: [
+    {
+      value: 'landsat',
+      label: 'landsat',
+      //   children: [{
+      //     value: 1 - 1,
+      //     label: 'LANDSAT_8_C1'
+      //   },
+      //   {
+      //     value: 1 - 2,
+      //     label: 'LANDSAT_ETM_C1'
+      //   },
+      //   {
+      //     value: 1 - 3,
+      //     label: 'LANDSAT_TM_C1'
+      //   }
+      //   ]
+    },
+    {
+      value: 'Sentinel',
+      label: 'Sentinel',
+      //   children: [{
+      //     value: 2 - 1,
+      //     label: 'Sentinel - 2',
+      //     children: [{
+      //       value: 2 - 1 - 1,
+      //       label: 'S2MSI2A'
+      //     }]
+      //   },
+      //   {
+      //     value: 2 - 2,
+      //     label: 'Sentinel - 1',
+      //     children: [{
+      //       value: 2 - 2 - 1,
+      //       label: 'SLC'
+      //     }]
+      //   }
+      //   ]
+    },
+    {
+      value: '国产系列卫星',
+      label: '国产系列卫星',
+      children: [
+        {
+          value: 'GF - 1',
+          label: 'GF - 1',
+        },
+        {
+          value: 'GF - 2',
+          label: 'GF - 2',
+        },
+        {
+          value: 'GF - 3',
+          label: 'GF - 3',
+        },
+        {
+          value: 'GF - 4',
+          label: 'GF - 4',
+        },
+        {
+          value: 'GF - 6',
+          label: 'GF - 6',
+        },
+        {
+          value: 'ZY - 3',
+          label: 'ZY - 3',
+        },
+        {
+          value: 'ZY - 302',
+          label: 'ZY - 302',
+        },
+        {
+          value: 'ZY - 02C',
+          label: 'ZY - 02C',
+        },
+      ],
+    },
+    {
+      value: '欧比特珠海一号系列卫星',
+      label: '欧比特珠海一号系列卫星',
+      children: [
+        {
+          value: 'OVS - 2A',
+          label: 'OVS - 2A',
+        },
+        {
+          value: 'OVS - 3A',
+          label: 'OVS - 3A',
+        },
+        {
+          value: 'OVS - 1A',
+          label: 'OVS - 1A',
+        },
+        {
+          value: 'OVS - 1B',
+          label: 'OVS - 1B',
+        },
+        {
+          value: 'OHS - 2A',
+          label: 'OHS - 2A',
+        },
+        {
+          value: 'OHS - 2B',
+          label: 'OHS - 2B',
+        },
+        {
+          value: 'OHS - 2C',
+          label: 'OHS - 2C',
+        },
+        {
+          value: 'OHS - 2D',
+          label: 'OHS - 2D',
+        },
+      ],
+    }
+  ],
+  shortcuts: [
+    {
+      text: '1 month ago',
+      value: () => {
+        const date = new Date()
+        date.setTime(date.getTime() - 3600 * 1000 * 24 * 30)
+        return date
+      },
+    },
+    {
+      text: '3 months ago',
+      value: () => {
+        const date = new Date()
+        date.setTime(date.getTime() - 3600 * 1000 * 24 * 90)
+        return date
+      },
+    },
+    {
+      text: '6 months ago',
+      value: () => {
+        const date = new Date()
+        date.setTime(date.getTime() - 3600 * 1000 * 24 * 180)
+        return date
+      },
+    },
+  ],
+  idOptions: [{
+    value: '1',
+    label: '1',
+  },
+  {
+    value: '2',
+    label: '2',
+  },
+  {
+    value: '3',
+    label: '3',
+  },
+  {
+    value: '4',
+    label: '4',
+  },
+  {
+    value: '5',
+    label: '5',
+  }],
+  layerInfo: null,
+  lat: '',
+  lon: '',
+  disLat: '',
+  disLon: '',
 })
 
-const shortcuts = [
-  {
-    text: '1 month ago',
-    value: () => {
-      const date = new Date()
-      date.setTime(date.getTime() - 3600 * 1000 * 24 * 30)
-      return date
-    },
-  },
-  {
-    text: '3 months ago',
-    value: () => {
-      const date = new Date()
-      date.setTime(date.getTime() - 3600 * 1000 * 24 * 90)
-      return date
-    },
-  },
-  {
-    text: '6 months ago',
-    value: () => {
-      const date = new Date()
-      date.setTime(date.getTime() - 3600 * 1000 * 24 * 180)
-      return date
-    },
-  },
-]
+const onMapClick = (e) => {
+  state.lat = e.latlng.lat.toFixed(3);
+  state.lon = e.latlng.lng.toFixed(3);
+  state.coordinateList.push({
+    Lat: state.lat,
+    Lng: state.lon
+  })
+  //   changeLatLon(e)
+}
+
+const changeLatLon = (e) => {
+  state.disLat = e.latlng.lat.toFixed(3);
+  state.disLon = e.latlng.lng.toFixed(3);
+  // state.lon = state.lon % 360;
+  // if (state.lon < 0) {
+  //   state.lon = state.lon + 360;
+  // }
+  // state.lon = state.lon.toFixed(3);
+  if (state.disLat < 0) {
+    state.disLat = String(Math.abs(state.disLat)) + "°S"
+  }
+  else {
+    state.disLat = String(state.disLat) + "°N"
+  }
+
+  if (state.disLon <= 180 && state.disLon >= 0) {
+    state.disLon = String(Math.abs(state.disLon)) + "°E"
+  }
+  else if (state.disLon > 180 && state.disLon <= 360) {
+    state.disLon = String((360 - state.disLon).toFixed(3)) + "°W"
+  }
+  else if (state.disLon < 0) {
+    let n = Math.floor(state.disLon / 360)
+    state.disLon = (state.disLon - n * 360).toFixed(3)
+    if (state.disLon <= 180 && state.disLon >= 0) {
+      state.disLon = String(Math.abs(state.disLon)) + "°E"
+    }
+    else if (state.disLon > 180 && state.disLon <= 360) {
+      state.disLon = String((360 - state.disLon).toFixed(3)) + "°W"
+    }
+  }
+  else if (state.disLon > 360) {
+    let n = Math.floor(state.disLon / 360)
+    state.disLon = (state.disLon - n * 360).toFixed(3)
+    if (state.disLon <= 180 && state.disLon >= 0) {
+      state.disLon = String(Math.abs(state.disLon)) + "°E"
+    }
+    else if (state.disLon > 180 && state.disLon <= 360) {
+      state.disLon = String((360 - state.disLon).toFixed(3)) + "°W"
+    }
+  }
+
+}
+
 
 // 添加坐标点
 const addCoordinate = () => {
   state.addCoord = !state.addCoord;
-  state.coordinateList = [
-    {
-      Lat: '43.538'
-      ,
-      Lng: '111.530'
-    },
-    {
-      Lat: '36.195'
-      ,
-      Lng: '120.761'
-    }
-  ]
+  if (state.addCoord && state.coordinateList.length <= 2) {
+    map.value.mapOperations.drawRectangle()
+    map.value.mapOperations.on("click", onMapClick)
+    document.getElementsByClassName('coordinateBtn')[0].innerText = 'Stop';
+  }
+  else {
+    map.value.mapOperations.off("click", onMapClick)
+    document.getElementsByClassName('coordinateBtn')[0].innerText = 'Add coordinates';
+  }
+
 }
 // 清空坐标点
 const clearCoordinate = () => {
   state.coordinateList = [];
   state.startTime = '';
   state.endTime = '';
+  state.addCoord = false
+  map.value.mapOperations.deleteRectangle()
+  map.value.mapOperations.off("click", onMapClick)
+  document.getElementsByClassName('coordinateBtn')[0].innerText = 'Add coordinates';
 }
 // 编辑坐标点
 const editCoordinate = () => {
-
 }
 
 // 开始爬虫
 const startCrawl = () => {
-  console.log("start time:", state.startTime)
-  console.log("end time:", state.endTime)
-  console.log("addCoord:", state.addCoord)
-  console.log("satelliteSelected:", state.satelliteSelected)
+  var ranges = state.coordinateList[0].Lat + ' ' + state.coordinateList[0].Lng + ',' + state.coordinateList[1].Lat + ' ' + state.coordinateList[1].Lng
+  var type = null
+  if (state.satelliteSelected[0] == 'landsat') {
+    type = '5'
+  } else if (state.satelliteSelected[0] == 'Sentinel') {
+    type = '6'
+  } else if (state.satelliteSelected[0] == '') {
+    type = '7'
+  }
+  var id = 2
+
+  var param = {
+    "stime": state.startTime,
+    "etime": state.endTime,
+    "disaster_id": state.selectID * 1,
+    "ranges": ranges,
+    "id": id
+  }
+
+  console.log(param);
+  submit(
+    {
+      type: type,
+      manageId: userInfo.userInfos.id,
+      status: 0,
+      disasterId: state.selectID,
+      id: (id ? id : null)
+    }
+  ).then(ret => {
+    if (ret == 1042) {
+      ElMessage.error("error")
+    } else {
+
+      rs(param).then(res => {
+        console.log(res);
+        // getData();
+        ElMessage({
+          message: 'Success, Start crawling.',
+          type: 'success',
+        })
+      })
+
+    }
+  })
 }
 
 // 清空搜索条件
@@ -352,9 +454,19 @@ const ClearCondition = () => {
   state.coordinateList = []
   state.selectID = ''
 }
-</script>
 
-<style scoped lang="scss">
+// 监听 
+watch(
+  () => state.coordinateList.length,
+  (newValue, oldValue) => {
+    if (newValue > 1) {
+      map.value.mapOperations.off("click", onMapClick)
+    }
+  },
+  { immediate: true })
+  </script>
+  
+  <style scoped lang="scss">
 .rsSelect {
 	border: 1px solid #040728;
 	height: 52rem;
diff --git a/src/views/dataService/remoteSensingData/index.vue b/src/views/dataService/remoteSensingData/index.vue
index 003e903..5709a9d 100644
--- a/src/views/dataService/remoteSensingData/index.vue
+++ b/src/views/dataService/remoteSensingData/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="container">
-    <el-tabs v-model="state.activeName"
-             @tab-click="handleClick">
+    <el-tabs v-model="state.activeName">
       <el-tab-pane label="Search condition"
                    name="first">
         <search-condition></search-condition>
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 2a29345..e041097 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -190,9 +190,6 @@
                     style="height:35px;"></el-input>
         </el-container>
 
-        <Map style="height:350px ; width:100% ;margin-bottom: 10px;"
-             ref="map"></Map>
-
         <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;"
                  ref="mapRef"></MapPage>
 
@@ -228,7 +225,6 @@ import { ElMessageBox, ElMessage } from 'element-plus';
 import { getList, review } from '/@/api/disasterInfo/index';
 import { getDictionary } from '/@/api/system/dictbiz';
 //引入地图
-import Map from '/@/components/Map.vue';
 import { useDateFormat } from '@vueuse/shared';
 import L from "leaflet";
 import '@geoman-io/leaflet-geoman-free';

From 50a8460afb64bea6c9b88b1d63e57b5ef8ecebfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 16:45:33 +0800
Subject: [PATCH 04/14] .

---
 package-lock.json    | 12 +++++-------
 src/utils/request.js |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f10cb3..1b3f4d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -342,6 +342,11 @@
 				"fastq": "^1.6.0"
 			}
 		},
+		"@popperjs/core": {
+			"version": "npm:@sxzz/popperjs-es@2.11.7",
+			"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+			"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+		},
 		"@rollup/pluginutils": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
@@ -1175,13 +1180,6 @@
 				"lodash-unified": "^1.0.2",
 				"memoize-one": "^6.0.0",
 				"normalize-wheel-es": "^1.2.0"
-			},
-			"dependencies": {
-				"@popperjs/core": {
-					"version": "npm:@sxzz/popperjs-es@2.11.7",
-					"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-					"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-				}
 			}
 		},
 		"esbuild": {
diff --git a/src/utils/request.js b/src/utils/request.js
index c100693..26618f9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
 // export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'biz-vordm';
+export const moduleName = 'glj-biz-vordm';
 export const crawlModule = "vordm-crawl";
 // 配置新建一个 axios 实例
 const service = axios.create({

From a48d1ae1b12da490d4dea1bf8346c8a10c6a6167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 16:46:41 +0800
Subject: [PATCH 05/14] .

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 676e334..1e18ec7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
 // export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'glj-biz-vordm';
+export const moduleName = 'biz-vordm';
 export const crawlModule = "vordm-crawl";
 // 配置新建一个 axios 实例
 const service = axios.create({

From d31ca1d96763b059a536ee8a77c51adf601ac148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 16:53:40 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Map.vue                        | 262 ++++-----
 src/stores/index.ts                           |   1 +
 src/utils/request.js                          |   4 +-
 .../responseManagement/userResponse/index.vue | 505 ++++++++----------
 4 files changed, 314 insertions(+), 458 deletions(-)

diff --git a/src/components/Map.vue b/src/components/Map.vue
index 3c6c5d8..6c4740c 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -2,27 +2,25 @@
   <div ref="map"
        class="container"></div>
 </template>
-  
-  <script setup>
+
+<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'
 import 'leaflet-draw/dist/leaflet.draw.css'
-import '@geoman-io/leaflet-geoman-free';
-import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
+import '@geoman-io/leaflet-geoman-free';  
+import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';  
 import 'Leaflet-ImageOverlay-Rotated'
 import { useVariableStore } from '/@/stores/index.ts'
 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,14 +56,34 @@ onMounted(() => {
    */
 const mapOperations = {
   wktParseToMap: (res) => {
-    return omnivore.wkt.parse(res).addTo(featureLayerG_point)
-    // if(omnivore.wkt.parse(res) instanceof L.Marker){
-
-    // }
-    // else{
-    //   return omnivore.wkt.parse(res).addTo(featureLayerG_area )
-    // }
-
+    let layer = omnivore.wkt.parse(res)
+    layer.addTo(featureLayerG_point)
+    
+    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
+    
   },
   /** 添加点标注
    * Object param 参数集合
@@ -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,80 +301,86 @@ 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,
-      })
-      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.enable()
-    })
+    
+    // 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')
+      
+    // })
   },
-  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()
+  Edit: () => {
+    homeMap.pm.enableGlobalEditMode({
+      allowSelfIntersection: false,
     })
-  },
-  drawRectangle: () => {
-    if (layerRectangle != null) {
-      homeMap.removeLayer(layerRectangle)
-      layerRectangle = null
+    if(featureLayerG_area.getLayers().length==1){
+      featureLayerG_area.eachLayer(function (layer) {
+        layer.on('pm:edit', (e) => {
+          let features = featureLayerG_area.toGeoJSON().features
+          variableStore.layerGroupPoly = features.map(function (feature) {
+            return WKT.convert(feature.geometry)
+          })
+          variableStore.layerGroupPoly = variableStore.layerGroupPoly.join('\n')
+        });
+      });
     }
-    homeMap.pm.enableDraw('Rectangle', {
-      snappable: true,
-      snapDistance: 20,
-    });
-    homeMap.on('pm:create', (e) => {
-      L.PM.reInitLayer(e.layer);
-      layerRectangle = e.layer
-    });
+    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')
+        });
+      });
+    }
+    else{
+      console.log('error')
+    }
+    
+    
   },
-  deleteRectangle: () => {
-    homeMap.removeLayer(layerRectangle)
-  }
-
 }
 //omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
 
 defineExpose({
   mapOperations,
 })
-  </script>
-  
\ No newline at end of file
+</script>
diff --git a/src/stores/index.ts b/src/stores/index.ts
index c99ca11..3d0fa72 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -56,6 +56,7 @@ export const useVariableStore = defineStore(Names.TEST, {
             //   Data_upload_agency:""
             // }
         ],
+        // 存储wkt格式数据
         layerGroupPoint:null,
         layerGroupPoly:null,
         polygoncontrol:null,
diff --git a/src/utils/request.js b/src/utils/request.js
index 8e4e748..68714cd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,8 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
-export const moduleName = 'zqq-biz-vordm';
-// export const moduleName = 'biz-vordm';
+// export const moduleName = 'zqq-biz-vordm';
+export const moduleName = 'glj-biz-vordm';
 export const crawlModule = 'vordm-crawl';
 // 配置新建一个 axios 实例
 const service = axios.create({
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index e041097..974a15e 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -1,72 +1,45 @@
 <template>
   <div class="system-role-container layout-padding">
     <el-config-provider :locale="en">
-      <div class="system-role-padding layout-padding-auto layout-padding-view">
-        <el-tabs v-model="activeName"
-                 class="demo-tabs"
-                 @tab-click="handleClick"
-                 style="margin-left: 20px">
-          <el-tab-pane label="unchecked"
-                       name="first">
-            <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="organization"
-                               label="Organization"
-                               show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterType"
-                               label="Disaster type"
-                               show-overflow-tooltip>
-                <!-- 在disasterType中获取dictKey 对应的dictValue -->
-                <template #default="scope">
-                  <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
-                </template>
-              </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>
+    <div class="system-role-padding layout-padding-auto layout-padding-view">
+      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
+        <el-tab-pane label="unchecked" name="first">
+          <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="organization" label="Organization" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip>
+              <!-- 在disasterType中获取dictKey 对应的dictValue -->
+              <template #default="scope">
+                <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
+              </template>
+            </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> -->
-              <el-table-column prop="disasterTime"
-                               label="Disaster time"
-                               show-overflow-tooltip>
-                <template #default="scope">
-                  <!-- 格式化去除时分秒 -->
-                  {{ dateFormat(scope.row.disasterTime) }}
-                </template>
-              </el-table-column>
-              <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
-              <el-table-column prop="respondStatus"
-                               label="Response status"
-                               show-overflow-tooltip>
-                <template #default="scope">
-                  <el-tag type="info"
-                          v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
-                  <el-tag type="info"
-                          v-if="scope.row.respondStatus === 1">Failed</el-tag>
-                </template>
-              </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)">Review</el-button>
-                </template>
-              </el-table-column>
+            <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip>
+              <template #default="scope">
+                <!-- 格式化去除时分秒 -->
+                {{ dateFormat(scope.row.disasterTime) }}
+              </template>
+            </el-table-column>
+            <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
+            <el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
+              <template #default="scope">
+                <el-tag type="info" v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
+                <el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag>
+              </template>
+            </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)">Review</el-button>
+              </template>
+            </el-table-column>
 
-              <!-- <el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column> -->
-              <!-- <el-table-column prop="status" label="角色状态" show-overflow-tooltip>
+            <!-- <el-table-column prop="status" label="角色状态" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tag type="success" v-if="scope.row.status">启用</el-tag>
 								<el-tag type="info" v-else>禁用</el-tag>
@@ -82,165 +55,127 @@
 								>
 							</template>
 						</el-table-column> -->
-            </el-table>
-            <el-pagination @size-change="onHandleSizeChange"
-                           @current-change="onHandleCurrentChange"
-                           class="mt15"
-                           :pager-count="3"
-                           :page-sizes="[10, 20, 30]"
-                           v-model:current-page="state.tableData.param.current"
-                           background
-                           v-model:page-size="state.tableData.param.size"
-                           layout="total, sizes, prev, pager, next"
-                           :total="state.tableData.total">
-            </el-pagination>
-          </el-tab-pane>
-          <el-tab-pane label="checked"
-                       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>
-              <el-table-column prop="email"
-                               label="Email"
-                               show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterType"
-                               label="Disaster type"
-                               show-overflow-tooltip>
-                <!-- 在disasterType中获取dictKey 对应的dictValue -->
-                <template #default="scope">
-                  <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
-                </template>
-              </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> -->
-              <el-table-column prop="disasterTime"
-                               label="Disaster time"
-                               show-overflow-tooltip>
+          </el-table>
+          <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
+            :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.current" background
+            v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper"
+            :total="state.tableData.total">
+          </el-pagination>
+        </el-tab-pane>
+        <el-tab-pane label="checked" 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>
+            <el-table-column prop="email" label="Email" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip>
+              <!-- 在disasterType中获取dictKey 对应的dictValue -->
+              <template #default="scope">
+                <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
+              </template>
+            </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> -->
+              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip>
                 <template #default="scope">
                   <!-- 格式化去除时分秒 -->
                   {{ dateFormat(scope.row.disasterTime) }}
                 </template>
               </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 prop="respondStatus"
-                               label="Response status"
-                               show-overflow-tooltip>
+              <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 prop="respondStatus" label="Response status" show-overflow-tooltip>
 
-                <template #default="scope">
-                  <el-tag type="info"
-                          v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
-                  <el-tag type="info"
-                          v-if="scope.row.respondStatus === 1">Failed</el-tag>
-                </template>
+              <template #default="scope">
+                <el-tag type="info" v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
+                <el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag>
+              </template>
 
-              </el-table-column>
-            </el-table>
-            <el-pagination @size-change="onHandleSizeChange"
-                           @current-change="onHandleCurrentChange"
-                           class="mt15"
-                           :pager-count="3"
-                           :page-sizes="[10, 20, 30]"
-                           v-model:current-page="state.tableData.param.current"
-                           background
-                           v-model:page-size="state.tableData.param.size"
-                           layout="total, sizes, prev, pager, next"
-                           :total="state.tableData.total">
-            </el-pagination>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <el-dialog v-model="state.dialogVisible"
-                 title="Review"
-                 width="30%"
-                 :before-close="handleClose">
-        <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>
-          <el-button type="primary"
-                     style="margin-left: 5%;"
-                     @click="ClearSubmit">Clear</el-button>
-        </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="请输入内容"
-                    style="height:35px;margin-right: 1%;"
-                    v-model="state.dislat"></el-input>
-          <span style="line-height: 35px;">Longitude：</span>
-          <el-input placeholder="请输入内容"
-                    style="height:35px;"></el-input>
-        </el-container>
+            </el-table-column>
 
-        <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;"
-                 ref="mapRef"></MapPage>
+            <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>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
+            :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.current" background
+            v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper"
+            :total="state.tableData.total">
+          </el-pagination>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <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>
+        <el-radio v-model="state.radio" label='3' @click="mapEvents('3')">Edit</el-radio>
+        <el-button type="primary" style="margin-left: 5%;" @click="ClearSubmit">Clear</el-button>
+      </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>
+        <span style="line-height: 35px;">Longitude：</span>
+        <el-input  placeholder="wait……" style="height:35px;"  v-model="state.dislon" readonly="readonly"></el-input>
+      </el-container>
+      <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;" ref="mapRef"></MapPage>
+      <el-form-item label="Disaster Time">
+        <el-date-picker v-model="state.edit.disasterTime" type="date" value-format="YYYY-MM-DD"
+          placeholder="Select date and time" />
+      </el-form-item>
 
-        <el-form-item label="Disaster Time">
-          <el-date-picker v-model="state.edit.disasterTime"
-                          type="date"
-                          value-format="YYYY-MM-DD"
-                          placeholder="Select date and time" />
-        </el-form-item>
-
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="dialogVisible = false">Cancel</el-button>
-            <el-button type="danger"
-                       @click="reviews(1)">
-              Not Review
-            </el-button>
-            <el-button type="primary"
-                       @click="reviews(2)">
-              Review
-            </el-button>
-          </span>
-        </template>
-      </el-dialog>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">Cancel</el-button>
+          <el-button type="danger" @click="reviews(1)">
+            Not Review
+          </el-button>
+          <el-button type="primary" @click="reviews(2)">
+            Review
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <selectUser ref ="select" @callback="getTableData"></selectUser>
     </el-config-provider>
   </div>
 </template>
 
 <script  setup name="userResponse">
 import en from 'element-plus/dist/locale/en.mjs'
-import { reactive, onMounted, ref, nextTick, watchEffect, defineAsyncComponent } from 'vue';
+import { reactive, onMounted, ref, nextTick,watchEffect,defineAsyncComponent } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { getList, review } from '/@/api/disasterInfo/index';
 import { getDictionary } from '/@/api/system/dictbiz';
+import { useVariableStore } from '/@/stores/index.ts'
 //引入地图
+import Map from '/@/components/Map.vue';
 import { useDateFormat } from '@vueuse/shared';
+import selectUser from './component/selectUser.vue';
 import L from "leaflet";
-import '@geoman-io/leaflet-geoman-free';
-import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
+import '@geoman-io/leaflet-geoman-free';  
+import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';  
 import "leaflet/dist/leaflet.css";
 import 'leaflet-draw/dist/leaflet.draw'
 import 'leaflet-draw/dist/leaflet.draw.css'
-const map = ref();
+import { map } from 'lodash';
+import * as turf from '@turf/turf'
+const variableStore = useVariableStore();
+const mapRef = ref();
 const activeName = ref('first');
-
+const select = ref();
 const handleClick = (tab, event) => {
   state.selectName = tab.props.name;
   getTableData();
 };
 const MapPage = defineAsyncComponent({
-  loader: () => import('/@/components/Map.vue'),
+  loader:() =>import('/@/components/Map.vue'),
   delay: 200,
 })
 const onAllocation = (row) => {
@@ -267,9 +202,10 @@ const state = reactive({
   disasterTypeList: [],
   selectName: 'first',
   edit: {},
-  radio: null,
-  dislat: '',
-  dislon: ''
+  radio:null,
+  dislat:'',
+  dislon:'',
+  wktPoint_Poly:undefined
 });
 // 初始化表格数据
 const getTableData = () => {
@@ -280,7 +216,6 @@ const getTableData = () => {
   } else {
     state.tableData.param.respondStatus = 2;
   }
-  console.log(activeName.value);
   getList(state.tableData.param).then((res) => {
     state.tableData.data = res.records;
     state.tableData.total = res.total;
@@ -292,67 +227,73 @@ const onHandleSizeChange = (val) => {
   getTableData();
 };
 const onOpenEditRole = (type, row) => {
-
+  
   //深拷贝
   state.edit = JSON.parse(JSON.stringify(row));
-  nextTick(() => {
-    //赋值地图范围，并且可以修改点或者区域
-    //TODO
-    map.mapOperations.wktParseToMap(row.geometry)
-  });
   state.dialogVisible = true;
   setTimeout(() => {
-    state.radio = "1"
-    // mapRef.value.mapOperations.removeAll()
-    //赋值地图范围，并且可以修改点或者区域
-    if (state.wktPoint) {
-      mapRef.value.mapOperations.removeLayer(state.wktPoint)
-    }
-    state.wktPoint = mapRef.value.mapOperations.wktParseToMap(row.geometry)
-    // mapRef.value.mapOperations.on("click", (res)=>{
-    //   mapRef.value.mapOperations.clearPolygon()
-    //   mapRef.value.mapOperations.removeLayer( state.wktPoint)
-    //   mapRef.value.mapOperations.addInteractMarker(res.latlng.lat, res.latlng.lng)
-    // })
-    mapEvents('1')
-  }, 100);
+      state.radio = "1"
+      // mapRef.value.mapOperations.removeAll()
+      //赋值地图范围，并且可以修改点或者区域
+      if(state.wktPoint_Poly){
+        mapRef.value.mapOperations.removeLayer(state.wktPoint_Poly)
+      }
+      state.wktPoint_Poly=  mapRef.value.mapOperations.wktParseToMap(row.geometry)
+      // mapRef.value.mapOperations.on("click", (res)=>{
+      //   mapRef.value.mapOperations.clearPolygon()
+      //   mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly)
+      //   mapRef.value.mapOperations.addInteractMarker(res.latlng.lat, res.latlng.lng)
+      // })
+      mapEvents('1')
+  },100);
 };
-const mapEvents = (ev) => {
-  if (ev == '1') {
-    mapRef.value.mapOperations.clearPolygon()
-    // mapRef.value.mapOperations.on("click", mapClick)
+const mapEvents = (ev)=>{
+  if(ev == '1'){    
+    // mapRef.value.mapOperations.clearPolygon()
+    mapRef.value.mapOperations.on("click", mapClick)
     mapRef.value.mapOperations.on("mousemove", changelatlon)
-    variableStore.polygoncontrol = "option1"
-  } else {
-    mapRef.value.mapOperations.off("click", mapClick);
+    mapRef.value.mapOperations.clearPolygon()
+    
+  }else if(ev == '2'){
+    mapRef.value.mapOperations.off("click",mapClick);
+    mapRef.value.mapOperations.drawPolygon()
     // mapRef.value.mapOperations.drawPolygon()
     // mapRef.value.mapOperations.drawCreated()
-    variableStore.polygoncontrol = "option2"
+    
+  }
+  else{
+    mapRef.value.mapOperations.Edit()
   }
 };
 const ClearSubmit = () => {
   setTimeout(() => {
     mapRef.value.mapOperations.removeAll()
     variableStore.wktdata = null
+    variableStore.layerGroupPoint=null;
+        layerGroupPoly=null;
   }, 100)
 }
-const mapClick = (res) => {
-  mapRef.value.mapOperations.removeLayer(state.wktPoint)
+const mapClick=(res)=>{
+  // 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) => {
   //将修改后的地图位置赋值到state.edit.geometry
   //TODO 修改地图赋值
   //state.edit.geometry = map.mapOperations.getWkt();
 
   //判断index的值来判断是审核通过还是不通过
+
+
+
   if (index === 1) {
     state.edit.respondStatus = 1;
   } else {
     state.edit.respondStatus = 2;
   }
+  state.edit.geometry = variableStore.layerGroupPoint === null ? variableStore.layerGroupPoly : variableStore.layerGroupPoint;
   //时间格式化
   state.edit.disasterTime = useDateFormat(state.edit.disasterTime, 'YYYY-MM-DD').value + " 00:00:00";
   review(state.edit).then((res) => {
@@ -363,57 +304,50 @@ const reviews = (index) => {
 }
 // 分页改变
 const onHandleCurrentChange = (val) => {
-  console.log(val);
   state.tableData.param.pageNum = val;
   getTableData();
 };
-const onMapClick = (e) => {
-  state.lat = e.latlng.lat.toFixed(3);
-  state.lon = e.latlng.lng.toFixed(3);
-  map.value.mapOperations.addInteractMarker(state.lat, state.lon)
-}
 const changelatlon = (e) => {
-
+  //深拷贝e
   state.dislat = e.latlng.lat.toFixed(3);
-  state.dislon = e.latlng.lng.toFixed(3);
-  // state.lon = state.lon % 360;
-  // if (state.lon < 0) {
-  //   state.lon = state.lon + 360;
-  // }
-  // state.lon = state.lon.toFixed(3);
-  if (state.dislat < 0) {
-    state.dislat = String(Math.abs(state.dislat)) + "°S"
-  }
-  else {
-    state.dislat = String(state.dislat) + "°N"
-  }
+  state.dislon= e.latlng.lng.toFixed(3);
+// if (state.lon < 0) {
+//   state.lon = state.lon + 360;
+// }
+// state.lon = state.lon.toFixed(3);
+if (state.dislat < 0) {
+  state.dislat = String(Math.abs(state.dislat)) + "°S"
+}
+else {
+  state.dislat = String(state.dislat) + "°N"
+}
 
+if (state.dislon <= 180 && state.dislon >= 0) {
+  state.dislon = String(Math.abs(state.dislon)) + "°E"
+}
+else if (state.dislon > 180 && state.dislon <= 360) {
+  state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
+}
+else if (state.dislon < 0) {
+  let n = Math.floor(state.dislon / 360)
+  state.dislon = (state.dislon - n * 360).toFixed(3)
   if (state.dislon <= 180 && state.dislon >= 0) {
     state.dislon = String(Math.abs(state.dislon)) + "°E"
   }
   else if (state.dislon > 180 && state.dislon <= 360) {
     state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
   }
-  else if (state.dislon < 0) {
-    let n = Math.floor(state.dislon / 360)
-    state.dislon = (state.dislon - n * 360).toFixed(3)
-    if (state.dislon <= 180 && state.dislon >= 0) {
-      state.dislon = String(Math.abs(state.dislon)) + "°E"
-    }
-    else if (state.dislon > 180 && state.dislon <= 360) {
-      state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
-    }
+}
+else if (state.dislon > 360) {
+  let n = Math.floor(state.dislon / 360)
+  state.dislon = (state.dislon - n * 360).toFixed(3)
+  if (state.dislon <= 180 && state.dislon >= 0) {
+    state.dislon = String(Math.abs(state.dislon)) + "°E"
   }
-  else if (state.dislon > 360) {
-    let n = Math.floor(state.dislon / 360)
-    state.dislon = (state.dislon - n * 360).toFixed(3)
-    if (state.dislon <= 180 && state.dislon >= 0) {
-      state.dislon = String(Math.abs(state.dislon)) + "°E"
-    }
-    else if (state.dislon > 180 && state.dislon <= 360) {
-      state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
-    }
+  else if (state.dislon > 180 && state.dislon <= 360) {
+    state.dislon = String((360 - state.dislon).toFixed(3)) + "°W"
   }
+}
 
 }
 // 页面加载时
@@ -422,20 +356,7 @@ onMounted(() => {
   getDictionary({ code: 'disaster' }).then((res) => {
     state.disasterTypeList = res;
   });
-  watchEffect(() => {
-    if (state.radio == "1") {
-      // map.value.mapOperations.on("click", onMapClick)
-      // map.value.mapOperations.clearPolygon()     
-      // map.value.mapOperations.on("mousemove", changelatlon)
-      // variableStore.polygoncontrol = "option1"
-    }
-    else {
-      // map.value.mapOperations.off("click", onMapClick)
-      // map.value.mapOperations.drawPolygon()
-      // map.value.mapOperations.drawCreated()
-      // variableStore.polygoncontrol = "option2"
-    }
-  })
+  
 });
 const getValue = (key) => {
   //返回state.disasterTypeLis 对应的value 
@@ -443,24 +364,20 @@ const getValue = (key) => {
 };
 </script>
 <style>
-.demo-tabs > .el-tabs__content {
-	padding: 0px;
-	color: #6b778c;
-	font-size: 32px;
-	font-weight: 600;
+.demo-tabs>.el-tabs__content {
+  padding: 0px;
+  color: #6b778c;
+  font-size: 32px;
+  font-weight: 600;
 }
 
 .system-role-container {
-	.system-role-padding {
-		padding: 15px;
+  .system-role-padding {
+    padding: 15px;
 
-		.el-table {
-			flex: 1;
-		}
-	}
-}
-.mt15 {
-	float: right;
-	margin-bottom: 15px;
+    .el-table {
+      flex: 1;
+    }
+  }
 }
 </style>

From 71db5daf8016f1ca45de5a170b58ffaae5b7fd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 16:54:46 +0800
Subject: [PATCH 07/14] .

---
 src/views/responseManagement/userResponse/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 974a15e..8b6098d 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -276,7 +276,7 @@ const ClearSubmit = () => {
 const mapClick=(res)=>{
   // mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
   changelatlon(res);
-  state.wktPoint_Poly=mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3))
+  mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3))
   // console.log(state.wktPoint_Poly)
 }
 const reviews = (index) => {

From 5b1b8b3f89ff316e597552fc4d924fe4f35f19af Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Sun, 23 Apr 2023 17:17:36 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../multimediaData/component/boot.vue          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/dataService/multimediaData/component/boot.vue b/src/views/dataService/multimediaData/component/boot.vue
index 52a460a..2d90d5d 100644
--- a/src/views/dataService/multimediaData/component/boot.vue
+++ b/src/views/dataService/multimediaData/component/boot.vue
@@ -1,21 +1,21 @@
 <template>
-    <el-dialog title="Collection robot" v-model="state.isShowDialog" width="700px">
+    <el-dialog title="Collection robot" v-model="state.isShowDialog" width="1100px">
         <el-row>
             <el-col :span="5" style="text-align:center ;">
                 <el-image style="height:40px ; width:100px!" src="/baidu.jpg"></el-image>
             </el-col>
-            <el-col :span="9">
+            <el-col :span="12">
                 <el-form-item label="Confirm keywords"  style="text-align:center;">
                     <el-input v-model="state.baidu.keywords">
                     </el-input> 
                 </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="3">
                 <el-form-item label="page"  style="text-align:center ; margin-left: 10px;">
                     <el-input v-model="state.baidu.page" type="number" style="width: 70px ;"></el-input> 
                 </el-form-item>
             </el-col>
-            <el-col :span="4" style="text-align:center ;">
+            <el-col :span="3" style="text-align:center ;">
                 <el-icon  :size="40" style="cursor:pointer ;" :title="state.baidu.status==0?'Waiting in queue……':'start'" :color="state.baidu.status==0?'#4f4':'blue'"   @click="state.baidu.status==0?confirmBox('baidu'):start('baidu')" v-if="state.baiduOption.buttonIs&&(state.baidu.status==0||!state.baidu.status)">
                     <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="m249.6 417.088 319.744 43.072 39.168 310.272L845.12 178.88 249.6 417.088zm-129.024 47.168a32 32 0 0 1-7.68-61.44l777.792-311.04a32 32 0 0 1 41.6 41.6l-310.336 775.68a32 32 0 0 1-61.44-7.808L512 516.992l-391.424-52.736z"></path></svg>
                 </el-icon>
@@ -33,17 +33,17 @@
             <el-col :span="5" style="text-align:center ;">
                 <el-image style="height:40px ; width:100px!" src="/bing.webp"></el-image>
             </el-col>
-            <el-col :span="9" >
+            <el-col :span="12" >
                 <el-form-item label="Confirm keywords"  style="text-align:center ;">
                     <el-input v-model="state.bing.keywords"></el-input> 
                 </el-form-item>
             </el-col>
-            <el-col :span="5"  >
+            <el-col :span="3"  >
                 <el-form-item label="page" style="text-align:center;  margin-left: 10px;">
                     <el-input v-model="state.bing.page" type="number"  style="width: 70px ;"></el-input> 
                 </el-form-item>
             </el-col>
-            <el-col :span="4" style="text-align:center ;">
+            <el-col :span="3" style="text-align:center ;">
                 <el-icon  :size="40" style="cursor:pointer ;" :title="state.bing.status==0?'Waiting in queue……':'start'" :color="state.bing.status==0?'#4f4':'blue'"   @click="state.bing.status==0?confirmBox('bing'):start('bing')" v-if="state.bingOption.buttonIs&&(state.bing.status==0||!state.bing.status)">
                     <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="m249.6 417.088 319.744 43.072 39.168 310.272L845.12 178.88 249.6 417.088zm-129.024 47.168a32 32 0 0 1-7.68-61.44l777.792-311.04a32 32 0 0 1 41.6 41.6l-310.336 775.68a32 32 0 0 1-61.44-7.808L512 516.992l-391.424-52.736z"></path></svg>
                 </el-icon>
@@ -119,6 +119,8 @@ const confirmBox = (text)=>{
     })
 }
 const openDialog = (row) => {
+    state.baidu={};
+    state.bing={};
     state.data = row;
     state.baidu.keywords = row.disasterKeyword;
     state.baidu.disaster_id = row.id
@@ -136,7 +138,7 @@ const getDate = ()=>{
                 state.baidu = element;
             }
             if(element.type == 1){
-                state.baidu = element;
+                state.bing = element;
             }
             
         }

From cf31fe552cd51074005f2c6e8a3486cd7ce12ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 17:35:28 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../responseManagement/contact/index.vue      | 20 +++++++++----------
 .../responseManagement/dataUpload/index.vue   |  8 ++++----
 src/views/responseManagement/tool/index.vue   | 14 ++++++-------
 .../responseManagement/userResponse/index.vue |  6 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/responseManagement/contact/index.vue b/src/views/responseManagement/contact/index.vue
index ac9e866..d97bae7 100644
--- a/src/views/responseManagement/contact/index.vue
+++ b/src/views/responseManagement/contact/index.vue
@@ -8,12 +8,12 @@
                         <el-form>
                                 <el-row>
                                     <el-col :span="4">
-                                        <el-form-item label="UserName"><el-input size="default" style="max-width: 180px"
+                                        <el-form-item label="User name"><el-input size="default" style="max-width: 180px"
                                             v-model="state.query.userName" clearable placeholder="Please enter the UserName">
                                         </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="4">
+                                    <!-- <el-col :span="4">
                                         <el-form-item label="checked" style="margin-left: 10px;">
                                             <el-select size="default" v-model="state.query.status" clearable style="max-width: 180px"
                                                 placeholder="Replied">
@@ -22,13 +22,13 @@
                                                 <el-option label="Observed" :value="2"></el-option>
                                             </el-select>
                                         </el-form-item>
-                                    </el-col>
+                                    </el-col> -->
                                     <el-button size="default" type="primary" class="ml15" style="margin-top: 4px ;"
                                         @click="initTableData">
                                         <el-icon>
                                             <ele-Search />
                                         </el-icon>
-                                        search
+                                        Search
                                     </el-button>
 
                                 </el-row>
@@ -39,14 +39,14 @@
                     </div>
                     <el-table :data="state.tableData.data" style="width: 100%" v-loading="state.tableData.loading"
                         @selection-change="handleSelectionChange">
-                        <el-table-column prop="userName" label="userName"> </el-table-column>
-                        <el-table-column prop="email" label="email"> </el-table-column>
-                        <el-table-column prop="organization" label="organization"> </el-table-column>
-                        <el-table-column prop="message" label="message"> </el-table-column>
+                        <el-table-column prop="userName" label="User name"> </el-table-column>
+                        <el-table-column prop="email" label="Email"> </el-table-column>
+                        <el-table-column prop="organization" label="Organization"> </el-table-column>
+                        <el-table-column prop="message" label="Message"> </el-table-column>
                         <el-table-column label="Operate" width="180">
                             <template #default="scope">
-                                <el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status != 2 " text type="primary"
-                                    @click="onObserved(scope.row)">Observed</el-button>
+                                <!-- <el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status != 2 " text type="primary"
+                                    @click="onObserved(scope.row)">Observed</el-button> -->
                                 <el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status != 1 " text type="primary"
                                     @click="onOpenEdit(scope.row)">Reply e-mail</el-button>
                                 <el-button :disabled="scope.row.userName === 'admin'" size="small" v-if="scope.row.status == 1 " text type="primary"
diff --git a/src/views/responseManagement/dataUpload/index.vue b/src/views/responseManagement/dataUpload/index.vue
index 842c47e..ff4a099 100644
--- a/src/views/responseManagement/dataUpload/index.vue
+++ b/src/views/responseManagement/dataUpload/index.vue
@@ -8,8 +8,8 @@
               highlight-current-row @row-click="tableClick">
               <el-table-column type="index" label="ID" width="50" />
               <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip></el-table-column>
             </el-table>
             <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
               class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
@@ -26,14 +26,14 @@
                 <el-icon>
                   <ele-EditPen />
                 </el-icon>
-                batch audit
+                Batch operation
               </el-button>
             </div>
             <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
               @selection-change="handleSelectionChange" style="width: 100%">
               <el-table-column type="selection" width="55" />
               <el-table-column type="index" label="ID" width="50" />
-              <el-table-column prop="uploaderName" label="uploader Name" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="uploaderName" label="Uploader name" show-overflow-tooltip></el-table-column>
               <el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
               <el-table-column prop="title" label="Professional title" show-overflow-tooltip
                 width="150"></el-table-column>
diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue
index 873e22e..4dbd607 100644
--- a/src/views/responseManagement/tool/index.vue
+++ b/src/views/responseManagement/tool/index.vue
@@ -14,11 +14,11 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4">
-                                        <el-form-item label="checked" style="margin-left: 10px;">
+                                        <el-form-item label="review status" style="margin-left: 10px;">
                                             <el-select size="default" v-model="state.query.checked" clearable
                                                 placeholder="Please select">
-                                                <el-option label="checked" value="0"></el-option>
-                                                <el-option label="unchecked" value="1"></el-option>
+                                                <el-option label="Reviewed" value="0"></el-option>
+                                                <el-option label="Not reviewed" value="1"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
@@ -27,7 +27,7 @@
                                         <el-icon>
                                             <ele-Search />
                                         </el-icon>
-                                        search
+                                        Search
                                     </el-button>
 
                                 </el-row>
@@ -48,9 +48,9 @@
                                     <a :href="scope.row.link" target="_blank">{{ scope.row.toolName }}</a>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="label" label="label" width="140"> </el-table-column>
-                            <el-table-column prop="introduction" label="introduction"> </el-table-column>
-                            <el-table-column prop="showName" label="Show Name"></el-table-column>
+                            <el-table-column prop="label" label="Label" width="140"> </el-table-column>
+                            <el-table-column prop="introduction" label="Introduction"> </el-table-column>
+                            <el-table-column prop="showName" label="Uploader name"></el-table-column>
                             <el-table-column prop="reviewTime" label="Review Time"></el-table-column>
                             <el-table-column label="Operate" width="140">
                                 <template #default="scope">
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 8b6098d..ff8b85d 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -3,7 +3,7 @@
     <el-config-provider :locale="en">
     <div class="system-role-padding layout-padding-auto layout-padding-view">
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
-        <el-tab-pane label="unchecked" name="first">
+        <el-tab-pane label="Not reviewed" name="first">
           <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>
@@ -28,7 +28,7 @@
             <el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
               <template #default="scope">
                 <el-tag type="info" v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
-                <el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag>
+                <el-tag type="info" v-if="scope.row.respondStatus === 1">Reviewed failed</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
@@ -62,7 +62,7 @@
             :total="state.tableData.total">
           </el-pagination>
         </el-tab-pane>
-        <el-tab-pane label="checked" name="second">
+        <el-tab-pane label="Reviewed" 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>

From e183745ca3b8c8ee9cf4aa76dc5380dfa8a460d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 17:53:27 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 .../dataService/multimediaData/index.vue      | 30 +++++++++----------
 src/views/dataService/otherData/index.vue     | 14 ++++-----
 src/views/dataService/pictureInfo/index.vue   | 12 ++++----
 .../components/retrievalCondition.vue         |  4 +--
 src/views/dataService/visualData/index.vue    | 24 +++++++--------
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 23898cb..68714cd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
 // export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'biz-vordm';
+export const moduleName = 'glj-biz-vordm';
 export const crawlModule = 'vordm-crawl';
 // 配置新建一个 axios 实例
 const service = axios.create({
diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue
index 1767187..2ff663d 100644
--- a/src/views/dataService/multimediaData/index.vue
+++ b/src/views/dataService/multimediaData/index.vue
@@ -14,7 +14,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip></el-table-column>
               <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
                 <template #default="scope">
                   <el-button size="small" text type="primary" @click="startBot(scope.row)">start</el-button>
@@ -33,45 +33,45 @@
         <el-col :span="14">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
             <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
-              <el-form-item label="type" label-width="100px">
+              <el-form-item label="Type" label-width="100px">
                 <el-select v-model="state.searchName" placeholder="Please select data type" style="max-width: 200px"
                   size="default" clearable @change="getTableData(); state.queryTitle = ''">
-                  <el-option value="1" label="news"></el-option>
-                  <el-option value="2" label="socialMedia"></el-option>
+                  <el-option value="1" label="News"></el-option>
+                  <el-option value="2" label="SocialMedia"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="stateus" label-width="100px">
+              <el-form-item label=" Review status" label-width="100px">
                 <el-select v-model=" state.srarchType " placeholder="Please select data type" style="max-width: 200px"
                   size="default" clearable>
-                  <el-option value="0" label="No review"></el-option>
-                  <el-option value="1" label="reserve"></el-option>
-                  <el-option value="2" label="not retain"></el-option>
+                  <el-option value="0" label="Not Reviewed"></el-option>
+                  <el-option value="1" label="Reviewed"></el-option>
+                  <el-option value="2" label="Review failed"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="title" label-width="100px" v-if=" state.searchName == '1' ">
+              <el-form-item label="Title" label-width="100px" v-if=" state.searchName == '1' ">
                 <el-input v-model=" state.queryTitle " placeholder="Please enter a title"></el-input>
               </el-form-item>
               <el-button size="default" type="primary" class="ml10" @click=" getTableData ">
                 <el-icon>
                   <ele-Search />
                 </el-icon>
-                search
+                Search
               </el-button>
               <el-button size="default" type="success" class="ml10" @click=" openDialog ">
                 <el-icon>
                   <ele-Upload />
                 </el-icon>
-                review
+                Batch operation
               </el-button>
             </div>
             <el-table :data=" state.tableData.data " v-loading=" state.tableData.loading "
               @selection-change=" handleSelectionChange " style="width: 100%">
               <el-table-column type="selection" width="55" />
               <el-table-column type="index" label="ID" width="50" />
-              <el-table-column v-if=" state.searchName == '1' " prop="title" label="title"
+              <el-table-column v-if=" state.searchName == '1' " prop="title" label="Title"
                 show-overflow-tooltip></el-table-column>
-              <el-table-column prop="content" label="content" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="type" label="type" show-overflow-tooltip>
+              <el-table-column prop="content" label="Content" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="type" label="Type" show-overflow-tooltip>
                 <template #default=" scope ">
                   <el-tag type="info" v-if=" state.searchName == '1' && scope.row.type == 0 ">baidu(中文)</el-tag>
                   <el-tag type="info" v-if=" state.searchName == '1' && scope.row.type == 1 ">bing</el-tag>
@@ -79,7 +79,7 @@
                   <el-tag type="info" v-if=" state.searchName == '2' && scope.row.type == 1 ">weibo</el-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="content" label="link" show-overflow-tooltip>
+              <el-table-column prop="content" label="Link" show-overflow-tooltip>
                 <template #default=" scope ">
                   <a :href=" scope.row.link " target="_blank">goto link</a>
                 </template>
diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue
index 20f9a64..9c3681e 100644
--- a/src/views/dataService/otherData/index.vue
+++ b/src/views/dataService/otherData/index.vue
@@ -8,8 +8,8 @@
               highlight-current-row @row-click="tableClick">
               <el-table-column type="index" label="ID" width="50" />
               <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip></el-table-column>
             </el-table>
             <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
               class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
@@ -22,7 +22,7 @@
         <el-col :span="14">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
             <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
-              <el-select v-model="state.searchName" placeholder="please select data type" style="max-width: 200px"
+              <el-select v-model="state.searchName" placeholder="Please select data type" style="max-width: 200px"
                 size="default" clearable>
                 <el-option value="0" label="basic data"></el-option>
                 <el-option value="1" label="responded report"></el-option>
@@ -32,26 +32,26 @@
                 <el-icon>
                   <ele-Search />
                 </el-icon>
-                search
+                Search
               </el-button>
               <el-button size="default" type="success" class="ml10" @click="uploadData">
                 <el-icon>
                   <ele-Upload />
                 </el-icon>
-                upload
+                Add
               </el-button>
               <el-button size="default" type="danger" class="ml10" @click="batchDel">
                 <el-icon>
                   <ele-Delete />
                 </el-icon>
-                batch delete
+                Delete
               </el-button>
             </div>
             <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
               @selection-change="handleSelectionChange" style="width: 100%">
               <el-table-column type="selection" width="55" />
               <el-table-column type="index" label="ID" width="50" />
-              <el-table-column prop="uploaderName" label="uploader Name" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="uploaderName" label="Uploader name" show-overflow-tooltip></el-table-column>
               <el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
               <el-table-column prop="title" label="Professional title" show-overflow-tooltip
                 width="150"></el-table-column>
diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue
index 1f17c2f..7ea3e5f 100644
--- a/src/views/dataService/pictureInfo/index.vue
+++ b/src/views/dataService/pictureInfo/index.vue
@@ -8,8 +8,8 @@
               highlight-current-row @row-click="tableClick">
               <el-table-column type="index" label="ID" width="50" />
               <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip></el-table-column>
             </el-table>
             <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
               class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
@@ -34,13 +34,13 @@
                 <el-icon>
                   <ele-Upload />
                 </el-icon>
-                upload
+                Upload
               </el-button>
               <el-button size="default" type="danger" class="ml10" @click="batchDel">
                 <el-icon>
                   <ele-Delete />
                 </el-icon>
-                batch delete
+                Batch delete
               </el-button>
             </div>
 
@@ -48,12 +48,12 @@
               @selection-change="handleSelectionChange" style="width: 100%">
               <el-table-column type="selection" width="55" />
               <el-table-column type="index" label="ID" width="50" />
-              <el-table-column prop="name" label="name" show-overflow-tooltip>
+              <el-table-column prop="name" label="Name" show-overflow-tooltip>
                 <template #default="scope">
                   {{ formatName(scope.row.name) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="link" label="image" show-overflow-tooltip>
+              <el-table-column prop="link" label="Image" show-overflow-tooltip>
                 <template #default="scope">
                   <el-popover trigger="hover" placement="right" popper-class="max-h-300px overflow-auto" :width="330">
                     <!-- table中原本显示的图片 -->
diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
index a59a923..5bd6080 100644
--- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
@@ -16,10 +16,10 @@
                              label="Disaster type"
                              show-overflow-tooltip></el-table-column>
             <el-table-column prop="disasterCountry"
-                             label="disaster country"
+                             label="Disaster country"
                              show-overflow-tooltip></el-table-column>
             <el-table-column prop="disasterTime"
-                             label="disaster time"
+                             label="Disaster time"
                              show-overflow-tooltip></el-table-column>
           </el-table>
           <el-pagination @size-change="onHandleDisasterSizeChange"
diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue
index a493290..db9b07e 100644
--- a/src/views/dataService/visualData/index.vue
+++ b/src/views/dataService/visualData/index.vue
@@ -8,8 +8,8 @@
               highlight-current-row @row-click="tableClick">
               <el-table-column type="index" label="ID" width="50" />
               <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterCountry" label="Disaster country" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip></el-table-column>
             </el-table>
             <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
               class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
@@ -34,24 +34,24 @@
                 <el-icon>
                   <ele-Upload />
                 </el-icon>
-                upload
+                Upload
               </el-button>
               <el-button size="default" type="danger" class="ml10" @click="batchDel">
                 <el-icon>
                   <ele-Delete />
                 </el-icon>
-                batch delete
+                Batch delete
               </el-button>
             </div>
             <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick" type="card">
-              <el-tab-pane label="wordclouds" name="first">
+              <el-tab-pane label="Word cloud" name="first">
                 <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
                   @selection-change="handleSelectionChange" style="width: 100%">
                   <el-table-column type="selection" width="55" />
                   <el-table-column type="index" label="ID" width="50" />
-                  <el-table-column prop="date" label="date" show-overflow-tooltip></el-table-column>
-                  <el-table-column prop="frequency" label="frequency" show-overflow-tooltip></el-table-column>
-                  <el-table-column prop="word" label="word" show-overflow-tooltip></el-table-column>
+                  <el-table-column prop="date" label="Time" show-overflow-tooltip></el-table-column>
+                  <el-table-column prop="frequency" label="Frequency" show-overflow-tooltip></el-table-column>
+                  <el-table-column prop="word" label="Words" show-overflow-tooltip></el-table-column>
                   <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
                     <template #default="scope">
                       <el-button size="small" text type="primary" @click="editWordCloud(scope.row)">Edit</el-button>
@@ -65,14 +65,14 @@
                   layout="total, sizes, prev, pager, next" :total="state.tableData.total">
                 </el-pagination>
               </el-tab-pane>
-              <el-tab-pane label="hotspot" name="second">
+              <el-tab-pane label="Hotspot area" name="second">
                 <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
                   @selection-change="handleSelectionHotspotChange" style="width: 100%">
                   <el-table-column type="selection" width="55" />
                   <el-table-column type="index" label="ID" width="50" />
-                  <el-table-column prop="areaCn" label="area cn" show-overflow-tooltip></el-table-column>
-                  <el-table-column prop="areaEn" label="area en" show-overflow-tooltip></el-table-column>
-                  <el-table-column prop="frequency" label="frequency" show-overflow-tooltip></el-table-column>
+                  <el-table-column prop="areaCn" label="Area cn" show-overflow-tooltip></el-table-column>
+                  <el-table-column prop="areaEn" label="Area en" show-overflow-tooltip></el-table-column>
+                  <el-table-column prop="frequency" label="Frequency" show-overflow-tooltip></el-table-column>
                   <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
                     <template #default="scope">
                       <el-button size="small" text type="primary" @click="editHotspot(scope.row)">Edit</el-button>

From 899b18708200b5e9cff1a1bb5975d84166f7a092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 17:55:12 +0800
Subject: [PATCH 11/14] .

---
 src/router/route.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/route.js b/src/router/route.js
index 5f7c748..c5dfbfa 100644
--- a/src/router/route.js
+++ b/src/router/route.js
@@ -181,7 +181,7 @@ export const dynamicRoutes = [
 						name: 'otherData',
 						component: () => import('/@/views/dataService/otherData/index.vue'),
 						meta: {
-							title: 'other data service',
+							title: 'Other data service',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
@@ -197,7 +197,7 @@ export const dynamicRoutes = [
 						name: 'visualData',
 						component: () => import('/@/views/dataService/visualData/index.vue'),
 						meta: {
-							title: 'visual data service',
+							title: 'Visual data service',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
@@ -213,7 +213,7 @@ export const dynamicRoutes = [
 						name: 'pictureInfo',
 						component: () => import('/@/views/dataService/pictureInfo/index.vue'),
 						meta: {
-							title: 'picture info service',
+							title: 'Picture info service',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,

From 40502ca82235114bf84c168bde38ff5d433abcdc Mon Sep 17 00:00:00 2001
From: qqGroup0 <253114712@qq.com>
Date: Sun, 23 Apr 2023 19:54:02 +0800
Subject: [PATCH 12/14] =?UTF-8?q?zqq:=E9=81=A5=E6=84=9F=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Map.vue | 266 +++++++++++++++++++++++++----------------
 1 file changed, 164 insertions(+), 102 deletions(-)

diff --git a/src/components/Map.vue b/src/components/Map.vue
index 6c4740c..b22f2fd 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -2,25 +2,27 @@
   <div ref="map"
        class="container"></div>
 </template>
-
-<script setup>
+        
+        <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'
 import 'leaflet-draw/dist/leaflet.draw.css'
-import '@geoman-io/leaflet-geoman-free';  
-import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';  
+import '@geoman-io/leaflet-geoman-free';
+import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
 import 'Leaflet-ImageOverlay-Rotated'
 import { useVariableStore } from '/@/stores/index.ts'
 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, {
@@ -42,8 +44,92 @@ 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)
 })
@@ -56,34 +142,14 @@ onMounted(() => {
    */
 const mapOperations = {
   wktParseToMap: (res) => {
-    let layer = omnivore.wkt.parse(res)
-    layer.addTo(featureLayerG_point)
-    
-    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
-    
+    return omnivore.wkt.parse(res).addTo(featureLayerG_point)
+    // if(omnivore.wkt.parse(res) instanceof L.Marker){
+
+    // }
+    // else{
+    //   return omnivore.wkt.parse(res).addTo(featureLayerG_area )
+    // }
+
   },
   /** 添加点标注
    * Object param 参数集合
@@ -111,7 +177,7 @@ const mapOperations = {
   addInteractMarker: (lat, lon) => {
     featureLayerG_point.clearLayers()
     variableStore.layerGroupPoint = null
-    var marker = L.marker([lat, lon]).addTo(
+    var marker = L.marker([lat, lon], { draggable: true }).addTo(
       featureLayerG_point
     )
     let features = featureLayerG_point.toGeoJSON().features
@@ -123,7 +189,6 @@ const mapOperations = {
     // marker.on('click',function(){
     //   featureLayerG_point.removeLayer(marker)
     // })
-    
   },
   /** 添加多边形标注
    * Object param 参数集合
@@ -279,7 +344,10 @@ const mapOperations = {
     featureLayerG_point.clearLayers()
     variableStore.layerGroupPoint = null
     variableStore.layerGroupPoly = null
-    
+    if (variableStore.polygoncontrol == 'option2') {
+      text = new L.Draw.Polygon(homeMap)
+      text.enable()
+    }
   },
   /**
    * 清楚wkt添加的所有
@@ -301,86 +369,80 @@ 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;
-    return polygon
+    text = new L.Draw.Polygon(homeMap)
+    text.enable()
   },
   clearPolygon: () => {
     // console.log('1-2')
-    
+    text.disable()
     featureLayerG_area.clearLayers()
     variableStore.layerGroupPoly = null
-    homeMap.pm.disableDraw();
     // variableStore.layerGroupPoint=null
     // featureLayerG_point.clearLayers()
   },
   drawCreated: () => {
-    
-    // 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,
+    // console.log("2-3")
+    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')
+      text.enable()
     })
-    if(featureLayerG_area.getLayers().length==1){
-      featureLayerG_area.eachLayer(function (layer) {
-        layer.on('pm:edit', (e) => {
-          let features = featureLayerG_area.toGeoJSON().features
-          variableStore.layerGroupPoly = features.map(function (feature) {
-            return WKT.convert(feature.geometry)
-          })
-          variableStore.layerGroupPoly = variableStore.layerGroupPoly.join('\n')
-        });
-      });
-    }
-    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')
-        });
-      });
-    }
-    else{
-      console.log('error')
-    }
-    
-    
   },
+  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
+    }
+    homeMap.pm.enableDraw('Rectangle', {
+      snappable: true,
+      snapDistance: 20,
+    });
+    homeMap.on('pm:create', (e) => {
+      L.PM.reInitLayer(e.layer);
+      layerRectangle = e.layer
+    });
+  },
+  deleteRectangle: () => {
+    homeMap.removeLayer(layerRectangle)
+  }
+
 }
 //omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
 
 defineExpose({
   mapOperations,
 })
-</script>
+        </script>
+        
\ No newline at end of file

From c492cdd552466e03d37e53ad7d19bbcf427d3503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 20:39:40 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../responseManagement/userResponse/index.vue | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 7a87dd8..a8746c3 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -3,7 +3,7 @@
     <el-config-provider :locale="en">
     <div class="system-role-padding layout-padding-auto layout-padding-view">
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
-        <el-tab-pane label="Not reviewed" name="first">
+        <el-tab-pane label="Awaiting approval" name="first">
           <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>
@@ -27,13 +27,13 @@
             <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
             <el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
               <template #default="scope">
-                <el-tag type="info" v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
-                <el-tag type="info" v-if="scope.row.respondStatus === 1">Reviewed failed</el-tag>
+                <el-tag type="info" v-if="scope.row.respondStatus === 0">Unapproved</el-tag>
+                <el-tag type="info" v-if="scope.row.respondStatus === 1">Rejected</el-tag>
               </template>
             </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)">Review</el-button>
+                <el-button size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)">Approve</el-button>
               </template>
             </el-table-column>
 
@@ -62,7 +62,7 @@
             :total="state.tableData.total">
           </el-pagination>
         </el-tab-pane>
-        <el-tab-pane label="Reviewed" name="second">
+        <el-tab-pane label="Approved" 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>
@@ -98,9 +98,9 @@
 
                 <template #default="scope">
                   <el-tag type="info"
-                          v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
+                          v-if="scope.row.respondStatus === 2">Approved</el-tag>
                   <el-tag type="info"
-                          v-if="scope.row.respondStatus === 1">Failed</el-tag>
+                          v-if="scope.row.respondStatus === 1">Rejected</el-tag>
                 </template>
 
               </el-table-column>
@@ -131,7 +131,7 @@
         </el-tabs>
       </div>
       <el-dialog v-model="state.dialogVisible"
-                 title="Review"
+                 title="Approval"
                  width="30%">
         <el-container style="margin-top: -2%;margin-bottom: 2%;">
           <el-radio v-model="state.radio"
@@ -174,11 +174,11 @@
             <el-button @click="dialogVisible = false">Cancel</el-button>
             <el-button type="danger"
                        @click="reviews(1)">
-              Not Review
+              Reject
             </el-button>
             <el-button type="primary"
                        @click="reviews(2)">
-              Review
+              Approve
             </el-button>
           </span>
         </template>

From f99d0ce5f4afdf453a73a7f25b2830130046aff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Sun, 23 Apr 2023 20:54:54 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navMenu/vertical.vue                     |  4 ++--
 src/router/route.js                                 |  2 +-
 src/views/dataService/multimediaData/index.vue      | 12 ++++++------
 src/views/responseManagement/tool/index.vue         |  8 ++++----
 src/views/responseManagement/userResponse/index.vue |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/layout/navMenu/vertical.vue b/src/layout/navMenu/vertical.vue
index 113f0b8..8b8b3d1 100644
--- a/src/layout/navMenu/vertical.vue
+++ b/src/layout/navMenu/vertical.vue
@@ -12,7 +12,7 @@
 			<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
 				<template #title>
 					<SvgIcon :name="val.meta.icon" />
-					<span v-text="useTranslateStore.translate_control===1?val.meta.title :val.meta.zh"></span>
+					<span v-text="val.meta.title"></span>
 				</template>
 				<SubItem :chil="val.children" />
 			</el-sub-menu>
@@ -20,7 +20,7 @@
 				<el-menu-item :index="val.path" :key="val.path">
 					<SvgIcon :name="val.meta.icon" />
 					<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-						<span v-text="useTranslateStore.translate_control===1?val.meta.title :val.meta.zh"></span>
+						<span v-text="val.meta.title "></span>
 					</template>
 					<template #title v-else>
 						<a class="w100" @click.prevent="onALinkClick(val)">{{ val.meta.title }}</a>
diff --git a/src/router/route.js b/src/router/route.js
index c5dfbfa..bde1d0f 100644
--- a/src/router/route.js
+++ b/src/router/route.js
@@ -280,7 +280,7 @@ export const dynamicRoutes = [
 						name: 'systemDic',
 						component: () => import('/@/views/system/dic/index.vue'),
 						meta: {
-							title: '字典管理',
+							title: 'Dictionary management',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue
index 2ff663d..e87ec7d 100644
--- a/src/views/dataService/multimediaData/index.vue
+++ b/src/views/dataService/multimediaData/index.vue
@@ -43,9 +43,9 @@
               <el-form-item label=" Review status" label-width="100px">
                 <el-select v-model=" state.srarchType " placeholder="Please select data type" style="max-width: 200px"
                   size="default" clearable>
-                  <el-option value="0" label="Not Reviewed"></el-option>
-                  <el-option value="1" label="Reviewed"></el-option>
-                  <el-option value="2" label="Review failed"></el-option>
+                  <el-option value="0" label="Awaiting approval"></el-option>
+                  <el-option value="1" label="Approved"></el-option>
+                  <el-option value="2" label="Rejected"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="Title" label-width="100px" v-if=" state.searchName == '1' ">
@@ -96,11 +96,11 @@
               <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
                 <template #default=" scope ">
                   <el-button size="small" text type="info" v-if=" scope.row.status == 0 "
-                    @click=" openDialog(scope.row, true) ">review</el-button>
+                    @click=" openDialog(scope.row, true) ">Awaiting approval</el-button>
                   <el-button size="small" text type="success" v-if=" scope.row.status == 1 "
-                    @click=" openDialog(scope.row, false) ">review</el-button>
+                    @click=" openDialog(scope.row, false) ">Approved</el-button>
                   <el-button size="small" text type="danger" v-if=" scope.row.status == 2 "
-                    @click=" openDialog(scope.row, false) ">review</el-button>
+                    @click=" openDialog(scope.row, false) ">Rejected</el-button>
                 </template>
               </el-table-column>
             </el-table>
diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue
index 89a85d2..563d286 100644
--- a/src/views/responseManagement/tool/index.vue
+++ b/src/views/responseManagement/tool/index.vue
@@ -16,8 +16,8 @@
                                         <el-form-item label="review status" style="margin-left: 10px;">
                                             <el-select size="default" v-model="state.query.checked" clearable
                                                 placeholder="Please select">
-                                                <el-option label="Reviewed" value="0"></el-option>
-                                                <el-option label="Not reviewed" value="1"></el-option>
+                                                <el-option label="Approved" value="0"></el-option>
+                                                <el-option label="Awaiting approval" value="1"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
@@ -54,9 +54,9 @@
                             <el-table-column label="Operate" width="140">
                                 <template #default="scope">
                                     <el-button :style='scope.row.reviewTime ? "display:none;" : ""' size="small" text
-                                        type="primary" @click="onOpenEdit(scope.row)">Review</el-button>
+                                        type="primary" @click="onOpenEdit(scope.row)">Approve</el-button>
                                     <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
-                                        @click="onRowDel(scope.row)">Delete</el-button>
+                                        @click="onRowDel(scope.row)">Reject</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index a8746c3..d1fb61b 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -3,7 +3,7 @@
     <el-config-provider :locale="en">
     <div class="system-role-padding layout-padding-auto layout-padding-view">
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
-        <el-tab-pane label="Awaiting approval" name="first">
+        <el-tab-pane label="Unapproved" name="first">
           <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>
@@ -27,7 +27,7 @@
             <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
             <el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
               <template #default="scope">
-                <el-tag type="info" v-if="scope.row.respondStatus === 0">Unapproved</el-tag>
+                <el-tag type="info" v-if="scope.row.respondStatus === 0">Awaiting approval</el-tag>
                 <el-tag type="info" v-if="scope.row.respondStatus === 1">Rejected</el-tag>
               </template>
             </el-table-column>