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

shuishen

2026-01-16 bb82b62992e89cdbf759df4f47b126df33852d28

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

 applications/drone-command/src/views/aICrudTemplate/aICrudTemplateApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/device/fwDevice/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/areaManage/defenseZone/defenseZoneApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/area/fwDefenseZone/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/areaManage/partition/partitionApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/area/fwAreaDivide/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}
// 查list

 applications/drone-command/src/views/areaManage/precinctInfo/precinctInfoApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/area/fwPoliceStation/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/areaManage/sceneConfig/sceneConfigApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/area/fwDefenseScene/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/basicManage/deviceStock/fwDevice.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/device/fwDevice/page`,
        method: 'get',
        params,
        params:{descs:'update_time',...params},
    })
}


 applications/drone-command/src/views/basicManage/deviceStock/fwDeviceScrapApi.js

@@ -14,7 +14,7 @@
    return request({
        url: `/drone-fw/device/fwDeviceScrap/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/basicManage/deviceStock/fwDeviceTrackApi.js

@@ -14,7 +14,7 @@
    return request({
        url: `/drone-fw/device/fwDeviceTrack/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/basicManage/maintainRecord/fwDeviceMaintainRecord.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/device/fwDeviceMaintainRecord/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/basicManage/maintainRecord/maintainRecordApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/device/fwDeviceMaintainPlan/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}

@@ -41,6 +41,6 @@
    return request({
        url: `/drone-fw/device/fwDevice/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}

 applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/countermeasureEvaluationApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/detection/fwEffectEval/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/detectionCountermeasure/taskSchedule/taskScheduleApi.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/detection/fwTaskSchedule/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/recordManage/alarmRecords/fwDroneAlarmRecord.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/record/fwDroneAlarmRecord/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}

@@ -37,10 +37,11 @@
}

//导出
export const exportFwDroneAlarmRecordApi = () => {
export const exportFwDroneAlarmRecordApi = (params) => {
    return request({
        url: `/drone-fw/record/fwDroneAlarmRecord/export-fwDroneAlarmRecord`,
        method: 'get',
        responseType: 'blob',
        params,
    })
}

 applications/drone-command/src/views/recordManage/alarmRecords/index.vue

@@ -56,12 +56,15 @@
        </el-form>

        <div class="ztzf-table-toolbar">
            <el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
            <el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">
                导出
            </el-button>
        </div>

        <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
            <div class="ztzf-table-content ztzf-table-content-bg">
                <el-table class="ztzf-data-cockpit-table" :data="list">
                <el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
                    <el-table-column type="selection" width="46" />
                    <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
                    <el-table-column prop="droneName" show-overflow-tooltip width="140" label="无人机名称" />
                    <el-table-column prop="droneSerialNo" show-overflow-tooltip label="无人机序列号" />
@@ -148,6 +151,12 @@
    }
}

const selectedIds = ref([]) // 勾选的ID列表
// 勾选值设置
function handleSelectionChange(rows) {
    selectedIds.value = rows.map(item => item.id)
}

// 查询
function handleSearch() {
    searchParams.value.current = 1
@@ -164,7 +173,7 @@

function exportFile() {
    exportLoading.value = true
    exportFwDroneAlarmRecordApi()
    exportFwDroneAlarmRecordApi({ ids: selectedIds.value.join(',') })
        .then(res => {
            blobDownload(res)
        })

 applications/drone-command/src/views/recordManage/historyTracks/flyTrajectory.js

@@ -14,7 +14,7 @@
    return request({
        url: `/drone-fw/record/fwDroneFlightRecordDetail/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}


 applications/drone-command/src/views/recordManage/historyTracks/fwDroneFlightRecord.js

@@ -5,7 +5,7 @@
    return request({
        url: `/drone-fw/record/fwDroneFlightRecord/page`,
        method: 'get',
        params,
        params: { descs: 'update_time', ...params },
    })
}