Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-19 0b7382d7968c6e48b839bd69abea3b4679acc720

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/styles/common/cockpit.scss

@@ -605,6 +605,8 @@
}

.el-form.command-dialog-history-search {
    margin-bottom: 20px;

    .el-form-item {
        margin-left: 20px;
    }
@@ -667,21 +669,7 @@
            }
        }
    }

    .history-search-actions {
        .el-button {
            width: 96px;
            background: transparent !important;
            border-radius: 4px 4px 4px 4px;
            border: 1px solid rgba(255, 255, 255, 0.3);

            .el-icon {
                font-size: 16px;
                color: #fff;
            }
        }
    }

   
    .el-input {
        width: 160px;
    }
@@ -695,9 +683,17 @@
            width: 160px;
        }
    }

    .history-search-actions {
        .search-btn {
            background: #284FE3 !important;
        }
    }
}

.command-page-history-search {
    margin-bottom: 20px;

    .el-form-item__label {
        font-family: Source Han Sans CN, Source Han Sans CN;
        font-weight: 500;
@@ -831,16 +827,30 @@
    .history-search-actions {
        .el-button {
            margin-left: 20px;
            width: 96px;
            background: transparent !important;
            border-radius: 4px 4px 4px 4px;
            border: 1px solid rgba(255, 255, 255, 0.3);

            .el-icon {
                font-size: 16px;
                color: #fff;
            }

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

        .search-btn {
            background: #1C1C31 !important;
            border: 1px solid rgba(227, 227, 236, 0.3) !important;
        }
    }
}

.command-table-toolbar {
    margin-top: 30px;
    margin-bottom: 20px;

    .el-button {
        min-width: 88px;
@@ -855,8 +865,6 @@
}

.command-table-container {
    margin-top: 20px;

    height: 0;
    flex: 1;
    display: flex;
@@ -1090,7 +1098,7 @@
            padding: 0 10px;

            .detail-title {
                margin-bottom: 20px;
                line-height: 40px;
                font-family: Source Han Sans CN, Source Han Sans CN;
                font-weight: 500;
                font-size: 16px;
@@ -1102,7 +1110,7 @@

            .el-row {
                .el-col {
                    margin-bottom: 20px;
                    margin-bottom: 0;
                    display: flex;
                    align-items: center;

@@ -1405,7 +1413,7 @@


                    .detail-title {
                        margin-bottom: 20px;
                        line-height: 40px;
                        font-family: Source Han Sans CN, Source Han Sans CN;
                        font-weight: 500;
                        font-size: 16px;

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

@@ -149,7 +149,7 @@
        graphic: {
            type: 'text',
            left: '22%',
            top: '35%',
            top: '48%',
            style: {
                text: '设备类型',
                fill: '#FFFFFF',
@@ -166,6 +166,7 @@
                color: '#FFFFFF',
                fontSize: 12,
                rich: legendRich,
                lineHeight: 30
            },
            itemWidth: 8,
            itemHeight: 8,
@@ -198,7 +199,7 @@
        },
        title: {
            x: 'center',
            top: '20',
            top: 0,
            textStyle: {
                color: '#fff',
                fontSize: 22,
@@ -227,7 +228,7 @@
            show: false,
            boxHeight: 26,
            left: '0%',
            top: -20,
            top: '-2%',
            width: '60%',
            viewControl: {
                distance: 210,

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

@@ -45,7 +45,7 @@
            top: 15,
            left: 10,
            right: 10,
            bottom: 10,
            bottom: 0,
            containLabel: true,
        },
        tooltip: {

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

@@ -42,7 +42,7 @@
            top: 15,
            left: 10,
            right: 10,
            bottom: 10,
            bottom: 0,
            containLabel: true,
        },
        tooltip: {
@@ -76,10 +76,19 @@
                color: '#FFFFFF',
                fontSize: 12,
                interval: 0,
                rotate: 25,
                margin: 8,
                formatter: value => {
                    if (value == null) return ''
                    const text = String(value)
                    return text.length > 4 ? `${text.slice(0, 4)}...` : text
                },
            },
        },
        yAxis: {
            type: 'value',
            min: 1,
            minInterval: 1,
            axisLabel: {
                color: '#FFFFFF',
                fontSize: 12,
@@ -115,8 +124,9 @@
                symbolRepeat: 'fixed',
                symbolMargin: 3,
                symbol: 'rect',
                symbolClip: false,
                symbolClip: true,
                symbolPosition: 'end',
                clip: true,
                symbolSize: [10, 3],
                data: values,
                z: 2,

 applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue

@@ -29,7 +29,7 @@

            <el-form-item class="history-search-actions">
                <el-button :icon="RefreshRight" @click="resetForm"></el-button>
                <el-button :icon="Search" @click="handleSearch"></el-button>
                <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
            </el-form-item>
        </el-form>