Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-02-05 2dc5f4a1ec4d31a31a1713d3aa6c9befc5e04b9a

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

 applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue

@@ -36,7 +36,7 @@
                        </el-col>
                        <el-col :span="12">
                            <div class="label">设备需求</div>
                            <div class="val">{{ getDictLabel(formData.deviceLoadDemand, dictObj.deviceLoadDemand) }}</div>
                            <div class="val">{{ formData.deviceLoadDemand }}</div>
                        </el-col>
                        <el-col :span="24">
                            <div class="label">工单备注</div>
@@ -128,10 +128,10 @@
                                    @change="loadDemandChange"
                                >
                                    <el-option
                                        v-for="item in dictObj.deviceLoadDemand"
                                        :key="item.dictKey"
                                        :label="item.dictValue"
                                        :value="item.dictKey"
                                        v-for="item in payloadList"
                                        :key="item.name"
                                        :label="item.name"
                                        :value="item.name"
                                    />
                                </el-select>
                            </el-form-item>
@@ -174,10 +174,10 @@
                <el-table
                    class="separateTable"
                    :empty-text="
                        formData.deviceLoadDemand && pointList.length ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'
                        pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'
                    "
                    ref="deviceTableRef"
                    :data="formData.deviceLoadDemand && pointList.length ? deviceList : []"
                    :data="pointList.length ? deviceList : []"
                    row-key="id"
                    @selection-change="handleDeviceSelectionChange"
                >
@@ -265,7 +265,7 @@
    gdWorkOrderHandleStatusApi,
    gdWorkOrderSaveApi,
} from './orderManageApi'
import { gdManageDeviceListApi } from './gdManageDeviceApi'
import { gdDevicePayloadListApi, gdManageDeviceListApi } from './gdManageDeviceApi'
import { cartesian3Convert } from '@/utils/cesium/mapUtil'
import * as Cesium from 'cesium'
import { DrawPolygon } from '@ztzf/utils'
@@ -340,7 +340,6 @@
    workOrderName: fieldRules(true, 50),
    workOrderType: fieldRules(true),
    executeStartTime: fieldRules(true),
    deviceLoadDemand: fieldRules(true),
}

// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消
@@ -580,9 +579,17 @@
    })
}

const payloadList = ref([])
function getPayloadList() {
    gdDevicePayloadListApi().then(res => {
        payloadList.value = res.data.data
    })
}

// 打开弹框
async function open({ mode = 'add', row } = {}) {
    dialogMode.value = mode
    getPayloadList()
    initMap()
    const allDeviceRes = await gdManageDeviceListApi()
    formData.value = dialogMode.value === 'add' ? initForm() : row

 applications/task-work-order/src/views/orderView/orderManage/orderManage/gdManageDeviceApi.js

@@ -44,3 +44,12 @@
        params,
    })
}

// 设备负载
export const gdDevicePayloadListApi = params => {
    return request({
        url: `/drone-gd/workorder/gdManageDevicePayload/list`,
        method: 'get',
        params,
    })
}