Merge remote-tracking branch 'origin/master'

张含笑

2026-01-16 d48d59c7726566a622786ff31e9855ac1aad8b84

Merge remote-tracking branch 'origin/master'

 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/FormDiaLog.vue

@@ -50,7 +50,7 @@
                </el-col>
            </el-row>

            <div class="detail-title">出库去向详情</div>
            <div class="detail-title">设备跟踪流转</div>
            <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
                <div class="ztzf-table-content">
                    <el-table class="ztzf-data-cockpit-table" :data="list">

 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/deviceStock/index.vue

@@ -5,8 +5,9 @@
            <DeviceChart2 />
            <DeviceChart3 />
        </div>

        <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
            <el-form-item label="名称" prop="deviceName">
            <el-form-item label="设备名称" prop="deviceName">
                <el-input
                    class="ztzf-data-cockpit-search-input"
                    v-model="searchParams.deviceName"
@@ -16,7 +17,7 @@
                />
            </el-form-item>

            <el-form-item label="类型" prop="deviceType">
            <el-form-item label="设备类型" prop="deviceType">
                <el-select
                    class="ztzf-data-cockpit-select"
                    popper-class="ztzf-data-cockpit-select-popper"
@@ -34,7 +35,7 @@
                </el-select>
            </el-form-item>

            <el-form-item label="部门" prop="belongDept">
            <el-form-item label="所属部门" prop="belongDept">
                <el-tree-select
                    class="ztzf-data-cockpit-select"
                    popper-class="ztzf-data-cockpit-tree-select-popper"
@@ -69,7 +70,7 @@
        </el-form>

        <div class="ztzf-table-toolbar">
            <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
            <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">设备建档</el-button>
            <el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
            <!--            <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>-->
        </div>
@@ -80,7 +81,7 @@
                    <el-table-column type="selection" width="46" />
                    <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
                    <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="设备名称" />
                    <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="类型">
                    <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="设备类型">
                        <template v-slot="{ row }">
                            {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
                        </template>
@@ -277,6 +278,7 @@
</script>
<style scoped lang="scss">
.chart {
    margin-bottom: 30px;
    width: 100%;
    height: 234px;
    display: flex;
@@ -285,7 +287,7 @@
            box-sizing: border-box;
        }
        .deviceChart {

            margin-left: 20px;
            height: 100%;
            background: rgba(26, 26, 42, 0.3);
            border-radius: 10px 10px 10px 10px;
@@ -296,6 +298,10 @@
            align-items: center;
            padding: 10px;

            &:first-child {
                margin-left: 0;
            }

            .titleBg {
                font-weight: 400;
                font-size: 18px;

 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/index.vue

@@ -1,12 +1,12 @@
<template>
    <basic-container>
        <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
            <el-form-item label="名称" prop="deviceName">
            <el-form-item label="设备名称" prop="deviceName">
                <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
                    clearable @clear="handleSearch" />
            </el-form-item>

            <el-form-item label="类型" prop="deviceType">
            <el-form-item label="设备类型" prop="deviceType">
                <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                    v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
                    <el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
@@ -14,7 +14,7 @@
                </el-select>
            </el-form-item>

            <el-form-item label="部门" prop="belongDept">
            <el-form-item label="所属部门" prop="belongDept">
                <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper"
                    v-model="searchParams.belongDept" :data="deptTree" :props="treeProps" node-key="id" check-strictly
                    clearable @change="handleSearch" />
@@ -35,7 +35,6 @@
            <div class="ztzf-table-content ztzf-table-content-bg">
                <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="deviceName" show-overflow-tooltip label="设备名称" />
                    <el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
                        <template v-slot="{ row }">
@@ -44,6 +43,7 @@
                    </el-table-column>
                    <el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
                    <el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
                    <el-table-column prop="belongDeptName" show-overflow-tooltip label="所属部门" />
                    <el-table-column prop="charger" show-overflow-tooltip label="负责人" />
                    <el-table-column prop="maintainReminder" show-overflow-tooltip label="维护提醒" />
                    <el-table-column prop="planCycleType" show-overflow-tooltip label="维护计划">

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