From 353bfba3b47e353249fe73c6753505eec49f643b Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 16 Jul 2025 13:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modal-content/add-or-edit-marker-form.vue | 82 +++++++++++++------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
index 3dc463d..62c59a4 100644
--- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue
+++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
@@ -257,14 +257,9 @@ const onHandleConfirm = () => {
         puId: deviceInfo.value?.puId,
         type: '2',
     }).then(async (res) => {
-        console.log(res.data, 'res?.data')
-
         const { Robot_x, Robot_y, PTZ_x, PTZ_y, PTZ_zoom, Robot_theta } = res?.data.data
 
         // 如果是修改时判断当前位置是否与点位一致
-        // if (markerParams.value.type === '修改') {
-
-        // }
 
         if (
             Math.abs(Robot_x - markerParams.value.xCount) > 2 ||
@@ -309,29 +304,64 @@ const onHandleConfirm = () => {
                     },
                 })
             } else {
-                markerParams.value.xCount = Robot_x
-                markerParams.value.yCount = Robot_y
-                markerParams.value.PTZ_x = PTZ_x
-                markerParams.value.PTZ_y = PTZ_y
-                markerParams.value.markerAngle = Robot_theta
-                markerParams.value.PTZ_zoom = PTZ_zoom
+                dialog.warning({
+                    title: '温馨提示',
+                    content: '机器人当前位置与预置点位不一致，确定新增吗？',
+                    positiveText: '确定新增',
+                    negativeText: '取消',
+                    onPositiveClick: () => {},
+                    onNegativeClick: async () => {
+                        markerParams.value.xCount = Robot_x
+                        markerParams.value.yCount = Robot_y
+                        markerParams.value.PTZ_x = PTZ_x
+                        markerParams.value.PTZ_y = PTZ_y
+                        markerParams.value.markerAngle = Robot_theta
+                        markerParams.value.PTZ_zoom = PTZ_zoom
 
-                const addMarkerParams = {
-                    ptzz: markerParams.value.PTZ_zoom,
-                    theta: markerParams.value.markerAngle,
-                    ptzx: markerParams.value.PTZ_x,
-                    ptzy: markerParams.value.PTZ_y,
-                    positionX: Math.ceil(markerParams.value.xCount),
-                    positionY: Math.ceil(markerParams.value.yCount),
-                    mapId: markerParams.value.mapId,
-                    pointName: markerParams.value.markerName,
-                }
+                        const addMarkerParams = {
+                            ptzz: markerParams.value.PTZ_zoom,
+                            theta: markerParams.value.markerAngle,
+                            ptzx: markerParams.value.PTZ_x,
+                            ptzy: markerParams.value.PTZ_y,
+                            positionX: Math.ceil(markerParams.value.xCount),
+                            positionY: Math.ceil(markerParams.value.yCount),
+                            mapId: markerParams.value.mapId,
+                            pointName: markerParams.value.markerName,
+                        }
 
-                const { data: result } = await addMarkerApi(addMarkerParams)
-                if (result.code == 200) {
-                    message.success('新增点位成功')
-                    onHandleCloseAddModal()
-                }
+                        const { data: result } = await addMarkerApi(addMarkerParams)
+                        if (result.code == 200) {
+                            message.success('新增点位成功')
+                            onHandleCloseAddModal()
+                        }
+                    },
+                })
+            }
+        } else {
+            markerParams.value.xCount = Robot_x
+            markerParams.value.yCount = Robot_y
+            markerParams.value.PTZ_x = PTZ_x
+            markerParams.value.PTZ_y = PTZ_y
+            markerParams.value.markerAngle = Robot_theta
+            markerParams.value.PTZ_zoom = PTZ_zoom
+
+            const addMarkerParams = {
+                ptzz: markerParams.value.PTZ_zoom,
+                theta: markerParams.value.markerAngle,
+                ptzx: markerParams.value.PTZ_x,
+                ptzy: markerParams.value.PTZ_y,
+                positionX: Math.ceil(markerParams.value.xCount),
+                positionY: Math.ceil(markerParams.value.yCount),
+                mapId: markerParams.value.mapId,
+                pointName: markerParams.value.markerName,
+            }
+
+            addMarkerParams.id = markerParams.value.id
+            const { data: result } = await addMarkerApi(addMarkerParams)
+
+            if (result.code == 200) {
+                message.success('修改点位成功')
+                onHandleCloseAddModal()
             }
         }
     })