From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/resource/components/DrawPolygon.vue | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/views/resource/components/DrawPolygon.vue b/src/views/resource/components/DrawPolygon.vue
index e4d40d0..ae7a8ac 100644
--- a/src/views/resource/components/DrawPolygon.vue
+++ b/src/views/resource/components/DrawPolygon.vue
@@ -23,7 +23,14 @@
const viewInstance = inject('viewInstance');
const homeViewer = inject('homeViewer');
-
+watch(
+ () => selectionIds.value,
+ (newValue, oldValue) => {
+ if (newValue && oldValue && newValue !== oldValue) {
+ cancel();
+ }
+ }
+);
function preventDefault(event) {
event.preventDefault();
@@ -216,40 +223,32 @@
}, []);
polygon.push(polygon[0]);
console.log('绘制', `POLYGON((${polygon.join(',')}))`);
- ElMessage.success('重新绘制图斑成功！！');
- if (selectionIds.value) {
- emit('upDateDrawState');
- selectionIds.value = null;
- clearSelect();
- }
-getTableList()
// 接口
- // sdfwUpdate({
- // ids: selectionIds.value,
- // sdfw: `POLYGON((${polygon.join(',')}))`,
- // })
- // .then(res => {
- // if (selectionIds.value) {
- // emit('upDateDrawState')
- // selectionIds.value = null
- // // clearSelect()
- // }
+ sdfwUpdate({
+ ids: selectionIds.value,
+ sdfw: `POLYGON((${polygon.join(',')}))`,
+ })
+ .then(res => {
+ if (selectionIds.value) {
+ emit('upDateDrawState')
+ selectionIds.value = null
+ clearSelect()
+ }
- // if (res.data.code !== 0) return ElMessage.error(res.message)
- // ElMessage.success('重新绘制图斑成功！！')
-
- // // getTableList()
- // })
- // .catch(e => {
- // cancel()
- // })
+ if (res.data.code !== 0) return ElMessage.error(res.message)
+ ElMessage.success('重新绘制图斑成功！！')
+ getTableList()
+ })
+ .catch(e => {
+ cancel()
+ })
}
function cancel() {
remove();
removeMenuPanel();
clearPlanar();
-
+ removeSaveMenuPanel();
init();
}
--
Gitblit v1.9.3