Merge remote-tracking branch 'origin/master'

罗广辉

2026-04-08 37d01ffb9bc98bda919362e0413b57e8e79797d9

Merge remote-tracking branch 'origin/master'

 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 || ''
    })
}


 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


 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,