Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-21 03dc3414b542ff8aea0709527eaa8de65071ea82

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/views/basicManage/deviceStock/DeviceChart2.vue

@@ -75,15 +75,17 @@
                show: false,
            },
            axisLabel: {
                color: '#FFFFFF',
                color: '#B4C0CC',
                fontSize: 12,
                interval: 0,
            },
        },
        yAxis: {
            type: 'value',
            max: Math.ceil(Math.max(...values) * 1.2),
            minInterval: 1,
            axisLabel: {
                color: '#FFFFFF',
                color: '#B4C0CC',
                fontSize: 12,
            },
            axisLine: {
@@ -93,8 +95,12 @@
                show: false,
            },
            splitLine: {
                show: false,
            },
                show: true,
                lineStyle: {
                    color: "rgba(93, 106, 143, .5)",
                    type: "dashed"
                }
            }
        },
        series: [
            {

 applications/drone-command/src/views/basicManage/deviceStock/DeviceChart3.vue

@@ -16,7 +16,7 @@
let { chart } = useEchartsResize(chartRef)

const list = ref([])
function buildOption() {
function buildOption () {
    const names = list.value.map(item => item.type)
    const values = list.value.map(item => item.count)
    const hasData = values.length > 0
@@ -25,19 +25,19 @@
        graphic: hasData
            ? []
            : [
                    {
                        type: 'text',
                        left: 'center',
                        top: 'middle',
                        style: {
                            text: '暂无数据',
                            fill: '#FFFFFF',
                            font: '14px Arial',
                            textAlign: 'center',
                            textVerticalAlign: 'middle',
                        },
                {
                    type: 'text',
                    left: 'center',
                    top: 'middle',
                    style: {
                        text: '暂无数据',
                        fill: '#FFFFFF',
                        font: '14px Arial',
                        textAlign: 'center',
                        textVerticalAlign: 'middle',
                    },
              ],
                },
            ],
        grid: {
            top: 15,
            left: 10,
@@ -73,7 +73,7 @@
                show: false,
            },
            axisLabel: {
                color: '#FFFFFF',
                color: '#B4C0CC',
                fontSize: 12,
                interval: 0,
                rotate: 25,
@@ -87,10 +87,10 @@
        },
        yAxis: {
            type: 'value',
            min: 1,
            max: Math.ceil(Math.max(...values) * 1.2),
            minInterval: 1,
            axisLabel: {
                color: '#FFFFFF',
                color: '#B4C0CC',
                fontSize: 12,
            },
            axisLine: {
@@ -100,8 +100,12 @@
                show: false,
            },
            splitLine: {
                show: false,
            },
                show: true,
                lineStyle: {
                    color: "rgba(93, 106, 143, .5)",
                    type: "dashed"
                }
            }
        },
        series: [
            {
@@ -147,6 +151,7 @@
.deviceChart {
    width: 638px;
}

.titleBg {
    width: 618px;
    height: 34px;