From 37d01ffb9bc98bda919362e0413b57e8e79797d9 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 08 Apr 2026 10:08:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/mobile-web-view/env/.env.development | 2 +-
applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue | 1 +
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue
index eeab733..f01d873 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue
@@ -282,6 +282,7 @@
fwDeviceConfigDetailApi({ deviceId: formData.value.deviceId }).then(res => {
const configJson = res.data.data ? JSON.parse(res.data.data.configJson) : {}
formData.value = { ...formData.value, ...configJson }
+ formData.value.id = res.data?.data?.id || ''
})
}
diff --git a/applications/mobile-web-view/env/.env.development b/applications/mobile-web-view/env/.env.development
index 607107e..46f51e0 100644
--- a/applications/mobile-web-view/env/.env.development
+++ b/applications/mobile-web-view/env/.env.development
@@ -8,7 +8,7 @@
VITE_APP_XT_URL = http://220.177.172.27:8100/yisuanzhijian
#工单详情（分享链接）
-VITE_APP_XT_URL_GD = http://219.146.74.42:8015
+VITE_APP_XT_URL_GD = http://220.177.172.27:8100
# ws地址
VITE_APP_WS_API_URL = wss://wrj.shuixiongit.com/drone-wss/api/v1/ws
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index f5f46ff..f422371 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -403,7 +403,7 @@
async function getDeviceList() {
try {
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
- let geom = `'POLYGON((${str}))'`
+ let geom = `POLYGON((${str}))`
const res = await gdManageDeviceListApi({
deviceIds: dialogMode.value === 'add' ? '' : formData.value.recommendDeviceIds,
devicePayload: formData.value?.deviceLoadDemand,
--
Gitblit v1.9.3