From 46f71f1985eabbf84926d6416659370f1e8c8c3e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 14 Jan 2026 11:39:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/styles/common/cockpit.scss |  488 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 329 insertions(+), 159 deletions(-)

diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 9bf2d0c..563d248 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -449,212 +449,382 @@
         }
     }
 
-    .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;
-        }
+    .el-dialog__body {
+        height: 0;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+    }
+}
 
-        .ztzf-data-cockpit-search-input {
-            .el-input__wrapper {
-                background: #2E2E48;
-            }
+.ztzf-dialog-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;
+    }
 
-            &.is-disabled {
-                .el-input__wrapper {
-                    background-color: #2E2E48;
-                }
-            }
-        }
-
-        .ztzf-data-cockpit-date-picker {
+    .ztzf-data-cockpit-search-input {
+        .el-input__wrapper {
             background: #2E2E48;
         }
 
-        .ztzf-data-cockpit-date-picker-popper {
-            background: #2E2E48 !important;
+        &.is-disabled {
+            .el-input__wrapper {
+                background-color: #2E2E48;
+            }
+        }
+    }
 
-            .el-picker-panel {
-                .el-picker-panel__body-wrapper {
-                    .el-picker-panel__body {
-                        background: #2E2E48 !important;
+    .ztzf-data-cockpit-date-picker {
+        background: #2E2E48;
+    }
 
-                        .el-date-picker__time-header {
+    .ztzf-data-cockpit-date-picker-popper {
+        background: #2E2E48 !important;
 
-                            .el-date-picker__editor-wrap {
-                                .el-time-panel {
+        .el-picker-panel {
+            .el-picker-panel__body-wrapper {
+                .el-picker-panel__body {
+                    background: #2E2E48 !important;
+
+                    .el-date-picker__time-header {
+
+                        .el-date-picker__editor-wrap {
+                            .el-time-panel {
+                                background: #2E2E48 !important;
+
+                                // 将 time-picker-popper 的样式移到这里
+                                .el-time-panel__header {
                                     background: #2E2E48 !important;
-
-                                    // 将 time-picker-popper 的样式移到这里
-                                    .el-time-panel__header {
-                                        background: #2E2E48 !important;
-                                    }
                                 }
                             }
                         }
                     }
                 }
             }
-
-            .el-popper__arrow {
-                &::before {
-                    background: #2E2E48 !important;
-                    border: 1px solid #2E2E48 !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;
-                }
+        .el-popper__arrow {
+            &::before {
+                background: #2E2E48 !important;
+                border: 1px solid #2E2E48 !important;
+                box-sizing: border-box;
             }
         }
     }
 
-    .el-dialog__body {
+    .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;
+            }
+        }
+    }
+}
+
+.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;
+
+    .ztzf-table-content {
         height: 0;
         flex: 1;
         display: flex;
         flex-direction: column;
 
-        .table-container {
+        .ztzf-data-cockpit-table {
             height: 0;
             flex: 1;
-            display: flex;
-            flex-direction: column;
+            background: transparent !important;
 
-            .table-content {
+            .el-table--border .el-table__inner-wrapper:after,
+            .el-table--border:after,
+            .el-table--border:before,
+            .el-table__inner-wrapper:before {
                 height: 0;
-                flex: 1;
-                display: flex;
-                flex-direction: column;
-
-                .ztzf-data-cockpit-table {
-                    height: 0;
-                    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 {
-						height: 0;
-					}
-
-                    tr {
-                        background: transparent !important;
-                    }
-
-                    th.el-table__cell {
-						border-bottom: 1px solid #323241;
-                        background: transparent !important;
-
-                        .cell {
-                            font-family: Source Han Sans CN, Source Han Sans CN;
-                            font-weight: 500;
-                            font-size: 14px;
-                            color: #FFFFFF;
-                            line-height: 22px;
-                            font-style: normal;
-                            text-transform: none;
-                        }
-                    }
-
-                    td.el-table__cell {
-						border-bottom: 1px solid #323241;
-                        background: transparent !important;
-
-                        .cell {
-                            font-family: Source Han Sans CN, Source Han Sans CN;
-                            font-weight: 400;
-                            font-size: 14px;
-                            color: #9E9EBA;
-                            line-height: 18px;
-                            font-style: normal;
-                            text-transform: none;
-                        }
-                    }
-                }
             }
 
-            .table-pagination {
-                padding-top: 30px;
-                padding-bottom: 10px;
-                display: flex;
-                justify-content: flex-end;
+            tr {
+                background: transparent !important;
+            }
 
-                .el-pagination__total {
+            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: 400;
+                    font-weight: 500;
                     font-size: 14px;
-                    color: #9E9EBA;
+                    color: #FFFFFF;
+                    line-height: 22px;
                     font-style: normal;
                     text-transform: none;
                 }
+            }
 
-                .btn-prev,
-                .btn-next {
-                    background: transparent !important;
+            td.el-table__cell {
+                padding: 9px 0;
+                height: 56px;
+                border-bottom: 1px solid #323241;
+                background: transparent !important;
 
-                    .el-icon {
-                        color: #C9CDD4;
-                    }
+                .cell {
+                    padding: 0;
+                    padding-left: 16px;
+                    font-family: Source Han Sans CN, Source Han Sans CN;
+                    font-weight: 400;
+                    font-size: 14px;
+                    color: #D2D2E7;
+                    line-height: 18px;
+                    font-style: normal;
+                    text-transform: none;
                 }
+            }
 
-                .el-pager {
-                    li {
-                        margin-left: 8px;
-                        font-family: Nunito Sans, Nunito Sans;
-                        font-weight: 600;
-                        font-size: 14px;
-                        color: #9E9EBA;
-                        font-style: normal;
-                        text-transform: none;
-                        background: transparent;
+            td.operation-btns .cell {
+                display: flex;
+                flex-wrap: nowrap;
+                gap: 12px;
+                /* 按钮间距(推荐) */
+                white-space: nowrap;
+                /* 双保险 */
 
-                        &:first-child {
-                            margin-left: 0;
-                        }
+                a {
+                    min-width: 28px;
+                    color: #6A89FF;
 
-                        &.is-active {
-                            font-family: Nunito Sans, Nunito Sans;
-                            font-weight: 600;
-                            font-size: 14px;
-                            color: #477EFF;
-                            font-style: normal;
-                            text-transform: none;
-                            background: rgba(71, 126, 255, 0.16);
-                        }
-                    }
-                }
-
-                .el-select {
-                    .el-select__wrapper {
-						.el-select__placeholder {
-							font-family: Source Han Sans CN, Source Han Sans CN;
-							font-weight: 400;
-							font-size: 14px;
-							color: #9E9EBA;
-							font-style: normal;
-							text-transform: none;
-						}
-
-                        background: #1C1C31;
-                        border: none;
-                        box-shadow: none;
+                    &:last-child {
+                        margin-right: 0;
                     }
                 }
             }
         }
     }
+
+    .ztzf-table-content-bg {
+        background: #1A1A2A;
+    }
+}
+
+.ztzf-table-pagination {
+    padding-top: 30px;
+    padding-bottom: 10px;
+    display: flex;
+    justify-content: flex-end;
+
+    .el-pagination__total {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 14px;
+        color: #9E9EBA;
+        font-style: normal;
+        text-transform: none;
+    }
+
+    .btn-prev,
+    .btn-next {
+        background: transparent !important;
+
+        .el-icon {
+            color: #C9CDD4;
+        }
+    }
+
+    .el-pager {
+        li {
+            margin-left: 8px;
+            font-family: Nunito Sans, Nunito Sans;
+            font-weight: 600;
+            font-size: 14px;
+            color: #9E9EBA;
+            font-style: normal;
+            text-transform: none;
+            background: transparent;
+
+            &:first-child {
+                margin-left: 0;
+            }
+
+            &.is-active {
+                font-family: Nunito Sans, Nunito Sans;
+                font-weight: 600;
+                font-size: 14px;
+                color: #477EFF;
+                font-style: normal;
+                text-transform: none;
+                background: rgba(71, 126, 255, 0.16);
+            }
+        }
+    }
+
+    .el-select {
+        .el-select__wrapper {
+            .el-select__placeholder {
+                font-family: Source Han Sans CN, Source Han Sans CN;
+                font-weight: 400;
+                font-size: 14px;
+                color: #9E9EBA;
+                font-style: normal;
+                text-transform: none;
+            }
+
+            background: #1C1C31;
+            border: none;
+            box-shadow: none;
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3