Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-22 27f63c34e229f6188400a93d246967c1b4dcb9e2

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue

@@ -171,7 +171,7 @@
                text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
                font: '14px',
                fillColor: Cesium.Color.WHITE, // 文字颜色：白色
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.45), //背景颜色
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.6), //背景颜色
                backgroundPadding: new Cesium.Cartesian2(5, 5), // 水平/垂直内边距（像素）
                pixelOffset: new Cesium.Cartesian2(0, -20), // 可选：微调位置
                showBackground: true, // 确保背景显示（某些版本需要）
@@ -209,7 +209,7 @@
                text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
                font: '14px',
                fillColor: Cesium.Color.WHITE,
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
                backgroundPadding: new Cesium.Cartesian2(5, 5),
                pixelOffset: new Cesium.Cartesian2(0, -20),
                showBackground: true,

 applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue

@@ -151,6 +151,7 @@
import * as Cesium from 'cesium'
import { fwAreaDivideDetailApi, fwAreaDivideListApi } from '../partition/partitionApi'
import { DrawPolygon } from '@/utils/cesium/DrawPolygon'
import commandPost from '@/assets/images/dataCockpit/legend/command-post.png'

const initForm = () => ({
    sceneName: '', // 场景名称
@@ -367,23 +368,25 @@
    if (!redPointEntity) {
        redPointEntity = viewer.entities.add({
            position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
            point: {
                color: Cesium.Color.RED,
                pixelSize: 10,
            billboard: {
                image: commandPost, // 这里替换为你的图片路径或变量 deviceZcImg
                width: 40,
                height: 56,
                verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
            },
            label: {
                text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
                font: '14px',
                fillColor: Cesium.Color.WHITE,
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
                backgroundPadding: new Cesium.Cartesian2(5, 5),
                pixelOffset: new Cesium.Cartesian2(0, -20),
                showBackground: true,
                style: Cesium.LabelStyle.FILL_AND_OUTLINE,
                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                verticalOrigin: Cesium.VerticalOrigin.CENTER,
                outlineWidth: 1,
                outlineColor: Cesium.Color.WHITE,
                pixelOffset: new Cesium.Cartesian2(0, -72),
                eyeOffset: new Cesium.Cartesian3(0, 0, -20),
            },
        })

 applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue

@@ -35,7 +35,7 @@
                        </el-col>
                        <el-col :span="24">
                            <div class="label">设备类型</div>
                            <div class="val">{{ getDeviceTypeLabel(formData.deviceType) }}</div>
                            <div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
                        </el-col>
                        <el-col :span="24">
                            <div class="label">设备位置</div>
@@ -63,6 +63,7 @@
                            popper-class="command-select-popper"
                            v-model="formData.deviceId"
                            placeholder="请选择"
                            :disabled="dialogMode === 'edit'"
                            clearable
                            @change="handleDeviceChange"
                        >
@@ -146,6 +147,8 @@
</template>

<script setup>
import { getDictLabel } from '@ztzf/utils'

import { Close } from '@element-plus/icons-vue'

import { computed, inject, nextTick, ref, watch } from 'vue'
@@ -158,7 +161,7 @@
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'

import commandPost from '@/assets/images/dataCockpit/legend/command-post.png'
import equipment from '@/assets/images/dataCockpit/legend/equipment.png'

const initForm = () => ({
    deviceId: '', // 侦测设备ID
@@ -235,10 +238,14 @@
    if (!isValid) return
    submitting.value = true
    try {
        const {longitude, latitude} = parseDeployLocation(formData.value.deployLocation)

        const payload = {
            ...formData.value,
            id: formData.value.id || formData.value.deviceId || undefined,
            effectiveRangeKmIsNotNull: formData.value.effectiveRangeKm ? 1 : 2,
            effectiveRangeKm: formData.value.effectiveRangeKm,
            longitude,
            latitude
        }
        delete payload.deviceId
        await detectionRangeSubmitApi(payload)
@@ -286,7 +293,7 @@
        redPointEntity = viewer.entities.add({
            position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
            billboard: {
                image: commandPost, // 这里替换为你的图片路径或变量 deviceZcImg
                image: equipment, // 这里替换为你的图片路径或变量 deviceZcImg
                width: 40,
                height: 56,
                verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
@@ -295,7 +302,7 @@
                text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
                font: '16px',
                fillColor: Cesium.Color.WHITE,
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
                backgroundPadding: new Cesium.Cartesian2(5, 5),
                showBackground: true,
                style: Cesium.LabelStyle.FILL_AND_OUTLINE,

 applications/drone-command/src/views/detectionCountermeasure/taskSchedule/FormDiaLog.vue

@@ -333,7 +333,7 @@
                text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
                font: '14px',
                fillColor: Cesium.Color.WHITE,
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
                backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
                backgroundPadding: new Cesium.Cartesian2(5, 5),
                pixelOffset: new Cesium.Cartesian2(0, -20),
                showBackground: true,

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

@@ -185,11 +185,10 @@
                </el-col>
            </el-row>
        </el-form>
        <template #footer>
        <template #footer v-if="!dialogReadonly">
            <el-button
                class="save-btn"
                color="#4C34FF"
                v-if="!dialogReadonly"
                :loading="submitting"
                :disabled="submitting"
                @click="handleSubmit"