Merge remote-tracking branch 'origin/master'

张含笑

2026-01-14 46f71f1985eabbf84926d6416659370f1e8c8c3e

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

@@ -449,7 +449,15 @@
        }
    }

    .history-search {
    .el-dialog__body {
        height: 0;
        flex: 1;
        display: flex;
        flex-direction: column;
    }
}

.ztzf-dialog-history-search {
        .el-form-item__label {
            font-family: Source Han Sans CN, Source Han Sans CN;
            font-weight: 500;
@@ -524,19 +532,151 @@
        }
    }

    .el-dialog__body {
.ztzf-page-history-search {
    .el-form-item__label {
        font-family: Source Han Sans CN, Source Han Sans CN;
        font-weight: 500;
        font-size: 14px;
        color: #C5C9D6;
        font-style: normal;
        text-transform: none;
    }

    .ztzf-data-cockpit-select {
        .el-select__wrapper {
            background: #1C1C31;
        }
    }

    .ztzf-data-cockpit-search-input {
        .el-input__wrapper {
            background: #1C1C31;
        }

        &.is-disabled {
            .el-input__wrapper {
                background-color: #1C1C31;
            }
        }
    }

    .ztzf-data-cockpit-date-picker {
        background: #1C1C31;
    }

    .ztzf-data-cockpit-date-picker-popper {
        background: #1C1C31 !important;

        .el-picker-panel {
            .el-picker-panel__body-wrapper {
                .el-picker-panel__body {
                    background: #1C1C31 !important;

                    .el-date-picker__time-header {

                        .el-date-picker__editor-wrap {
                            .el-time-panel {
                                background: #1C1C31 !important;

                                // 将 time-picker-popper 的样式移到这里
                                .el-time-panel__header {
                                    background: #1C1C31 !important;
                                }
                            }
                        }
                    }
                }
            }
        }

        .el-popper__arrow {
            &::before {
                background: #1C1C31 !important;
                border: 1px solid #1C1C31 !important;
                box-sizing: border-box;
            }
        }
    }

    .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;
            }
        }

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

.ztzf-dialog-history-search,
.ztzf-page-history-search {
    display: flex;

    .el-form-item {
        margin-left: 30px;
        margin-bottom: 0;

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

    .el-form-item__label {
        margin-right: 12px;
        height: 40px;
        line-height: 40px;
    }

    .el-input {
        width: 200px;
        height: 40px;
    }

    .el-select {
        .el-select__wrapper {
            width: 200px;
            height: 40px;
        }
    }

    .el-date-editor {
        width: 240px;
        height: 40px;
    }

    .el-button {
        width: 96px;
        height: 40px;
    }
}

.ztzf-table-toolbar {
    margin-top: 30px;

    .el-button {
        min-width: 88px;
    }
}

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

        height: 0;
        flex: 1;
        display: flex;
        flex-direction: column;

        .table-container {
            height: 0;
            flex: 1;
            display: flex;
            flex-direction: column;

            .table-content {
    .ztzf-table-content {
                height: 0;
                flex: 1;
                display: flex;
@@ -547,7 +687,10 @@
                    flex: 1;
                    background: transparent !important;

               .el-table--border .el-table__inner-wrapper:after, .el-table--border:after, .el-table--border:before, .el-table__inner-wrapper:before {
            .el-table--border .el-table__inner-wrapper:after,
            .el-table--border:after,
            .el-table--border:before,
            .el-table__inner-wrapper:before {
                  height: 0;
               }

@@ -556,10 +699,13 @@
                    }

                    th.el-table__cell {
                height: 40px;
                  border-bottom: 1px solid #323241;
                        background: transparent !important;

                        .cell {
                    padding: 0;
                    padding-left: 16px;
                            font-family: Source Han Sans CN, Source Han Sans CN;
                            font-weight: 500;
                            font-size: 14px;
@@ -571,23 +717,50 @@
                    }

                    td.el-table__cell {
                padding: 9px 0;
                height: 56px;
                  border-bottom: 1px solid #323241;
                        background: transparent !important;

                        .cell {
                    padding: 0;
                    padding-left: 16px;
                            font-family: Source Han Sans CN, Source Han Sans CN;
                            font-weight: 400;
                            font-size: 14px;
                            color: #9E9EBA;
                    color: #D2D2E7;
                            line-height: 18px;
                            font-style: normal;
                            text-transform: none;
                        }
                    }

            td.operation-btns .cell {
                display: flex;
                flex-wrap: nowrap;
                gap: 12px;
                /* 按钮间距（推荐） */
                white-space: nowrap;
                /* 双保险 */

                a {
                    min-width: 28px;
                    color: #6A89FF;

                    &:last-child {
                        margin-right: 0;
                    }
                }
            }
                }
            }

            .table-pagination {
    .ztzf-table-content-bg {
        background: #1A1A2A;
    }
}

.ztzf-table-pagination {
                padding-top: 30px;
                padding-bottom: 10px;
                display: flex;
@@ -652,9 +825,6 @@
                        background: #1C1C31;
                        border: none;
                        box-shadow: none;
                    }
                }
            }
        }
    }
}