Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-17 3e12c0d5ffb7a39e9c73345a27c2ffb44cd6a3cf

Merge remote-tracking branch 'origin/master'

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

@@ -1,37 +1,40 @@
/* 下拉菜单整体样式 */
.command-custom-dropdown {
    background: #1A1A2A !important;
    border-radius: 8px;
    border: none !important;
    .el-popper__arrow::before {
        background: #1A1A2A !important;
        border: 1px solid #1A1A2A !important;
    }
    background: #1A1A2A !important;
    border-radius: 8px;
    border: none !important;

    /* 菜单项样式 */
    .el-dropdown-menu {
        background: transparent !important;
    .el-popper__arrow::before {
        background: #1A1A2A !important;
        border: 1px solid #1A1A2A !important;
    }

        .el-dropdown-menu__item {
            color: #fff !important; /* 文字颜色 */
    /* 菜单项样式 */
    .el-dropdown-menu {
        background: transparent !important;

        .el-dropdown-menu__item {
            color: #fff !important;
            /* 文字颜色 */

            a {
                color: #fff !important; /* 文字颜色 */
                color: #fff !important;
                /* 文字颜色 */
            }

            &:hover {
                background: none !important;
            }
            &:hover {
                background: none !important;
            }

            &.is-disabled {
                color: #8f9bb3 !important;
            }
        }
            &.is-disabled {
                color: #8f9bb3 !important;
            }
        }

        .el-dropdown-menu__item--divided {
            display: none;
        }
    }
    }
}

// 数据驾驶舱专属
@@ -380,9 +383,32 @@
    }
}

.command-data-cockpit-select-popper.el-cascader__dropdown {
.command-data-cockpit-cascader {
    .el-input__wrapper {
        --el-input-text-color: #161B2C !important;
    }
}

.command-data-cockpit-cascader-popper.el-cascader__dropdown {
    border: none;
    background: #2E2E48 !important;

    .el-cascader-panel {

        .el-cascader-menu {
            color: #fff;

            .el-cascader-node:hover,
            .el-cascader-node:focus {
                background: transparent !important;
            }

            .el-cascader-node.is-selectable.in-active-path {
                color: #fff;
            }
        }

    }

    .el-popper__arrow::before {
        background: #2E2E48 !important;
@@ -753,7 +779,8 @@
        border: none;
    }

    .el-button.is-disabled, .el-button.is-disabled:hover {
    .el-button.is-disabled,
    .el-button.is-disabled:hover {
        background: #1A2652;
        border: none;
    }
@@ -849,7 +876,7 @@
    }

    th.el-table__cell:not(.fixed-column),
    td.el-table__cell:not(.fixed-column)  {
    td.el-table__cell:not(.fixed-column) {
        background: transparent !important;
    }

@@ -1491,7 +1518,7 @@
                        margin-left: 16px;
                        width: 96px;
                        height: 36px;
            

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

 applications/drone-command/src/views/permissionManage/permissionDept/FormDiaLog.vue

@@ -90,8 +90,8 @@
                <el-col :span="12">
                    <el-form-item label="行政区划" prop="areaCode">
                        <el-cascader
                            class="command-data-cockpit-select"
                            popper-class="command-data-cockpit-select-popper"
                            class="command-data-cockpit-cascader"
                            popper-class="command-data-cockpit-cascader-popper"
                            v-model="formData.areaCode"
                            :props="areaProps"
                            clearable