From a41a0227abfe188ed227265fe023a0ef2dd1198e Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Mon, 18 Dec 2023 11:05:09 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=9C=B0=E5=9B=BE=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E9=80=89=E5=8F=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx | 10 +++++++++-
 src/pages/SystemMgm/AreaManage/loadable.jsx           |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
index 60a601f..9b4a551 100644
--- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
+++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
@@ -26,7 +26,15 @@ function ModalAreaAdd(props) {
 
   const handleOk = () => {
     form.validateFields().then(formData => {
-      onOk(formData={...formData,id: editForm.id}, editStatus, )
+      const latlngObj = {
+        lat: '',
+        lng: ''
+      }
+      if (formData.latlng && formData.latlng.split(',').length) {
+        latlngObj['lat'] = formData.latlng.split(',')[0]
+        latlngObj['lng'] = formData.latlng.split(',')[1]
+      }
+      onOk(formData={...formData,id: editForm.id, ...latlngObj}, editStatus, )
       form.resetFields()
     }).catch((err) => {
       console.log(err)
diff --git a/src/pages/SystemMgm/AreaManage/loadable.jsx b/src/pages/SystemMgm/AreaManage/loadable.jsx
index 42a0d69..55c658d 100644
--- a/src/pages/SystemMgm/AreaManage/loadable.jsx
+++ b/src/pages/SystemMgm/AreaManage/loadable.jsx
@@ -83,7 +83,7 @@ function AreaManage() {
     }
 
     const handleAreaEdit = ({ name, id, virtually_code, code, lng, lat, type }) => {
-        setEditForm({ name, id, virtually_code, code, lng_lat: lng ? `${lng}, ${lat}` : "", type })
+        setEditForm({ name, id, virtually_code, code, latlng: lng ? `${lng}, ${lat}` : "", type })
         setEditStatus(true)
         setModalAreaVisible(true)
     }
@@ -126,7 +126,7 @@ function AreaManage() {
         setModalMapVisible(true)
     }
     const handleMapClick = ({ lat, lng }) => {
-        setLatlng([lat.toFixed(4), lng.toFixed(4)])
+        setLatlng([lat.toFixed(4), lng.toFixed(4)].join(','))
     }
 
     // 区域新增
@@ -150,9 +150,9 @@ function AreaManage() {
     }
 
     const handleLatLngConfirm = () => {
-        if (latlng == '' || latlng == []) {
+        if (latlng == '') {
             message.error('请选择经纬度')
-        } else if (!(isArray(latlng) && latlng.length == 2)) {
+        } else if (latlng.split(',').length != 2) {
             message.error('请检查经纬度格式')
         } else {
             setModalMapVisible(false)