From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 537 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 450 insertions(+), 87 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index e8c8651..00b878e 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -53,9 +53,8 @@
.ztzf-data-cockpit-date-picker-popper {
background: #161B2C !important;
- border: 1px solid !important;
+ border: none !important;
border-radius: 0px 0px 8px 8px;
- border-image: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(115, 192, 255, 1)) 1 1 !important;
.el-date-picker__prev-btn,
.el-date-picker__next-btn {
@@ -73,6 +72,13 @@
.el-picker-panel__body {
background: #161B2C !important;
color: #fff !important;
+
+ .el-date-range-picker__time-header {
+ .el-input__wrapper {
+ box-shadow: none;
+ background: #2E2E48 !important;
+ }
+ }
.el-date-picker__time-header {
border: none;
@@ -107,7 +113,7 @@
}
.el-time-panel__footer {
- background: #012350 !important;
+ background: #161B2C !important;
border-top: 1px solid rgba(71, 157, 255, 0.3) !important;
.el-button {
@@ -173,7 +179,7 @@
td.start-date span,
td.start-date span,
td.end-date span {
- background-color: #012350 !important;
+ background-color: #161B2C !important;
}
td.in-range div,
@@ -197,7 +203,7 @@
}
.el-picker-panel__sidebar {
- background: #012350;
+ background: #161B2C;
color: #fff;
.el-picker-panel__shortcut {
@@ -207,7 +213,7 @@
.el-picker-panel__body {
.el-input.is-disabled .el-input__wrapper {
- background: #012350;
+ background: #161B2C;
box-shadow: 0 0 0 0.1rem#409eff;
color: #fff;
@@ -218,11 +224,11 @@
.el-button.is-disabled,
.el-button.is-disabled:hover {
- background: #012350;
+ background: #161B2C;
}
.el-input__wrapper {
- background: #012350;
+ background: #161B2C;
box-shadow: 0 0 0 0.1rem#409eff;
color: #fff;
@@ -233,18 +239,18 @@
}
.el-picker-panel__footer {
- background: #012350;
+ background: #161B2C;
color: #fff;
border-top: none;
.el-button--small {
box-shadow: 0 0 0 0.1rem#409eff;
- background-color: #012350;
+ background-color: #161B2C;
color: #fff;
border: none;
&:hover {
- background-color: #012350;
+ background-color: #161B2C;
color: #fff;
border-color: #409eff;
}
@@ -258,6 +264,7 @@
}
.el-select__wrapper {
+ padding: 0 8px;
background: #2E2E48;
box-shadow: none !important;
border: none;
@@ -283,11 +290,11 @@
}
.el-select .el-input__wrapper {
- background-color: #012350 !important;
+ background-color: #161B2C !important;
}
.el-input__wrapper {
- --el-input-text-color: #012350 !important;
+ --el-input-text-color: #161B2C !important;
}
}
@@ -698,6 +705,11 @@
.el-button {
min-width: 88px;
}
+
+ .el-button.is-disabled, .el-button.is-disabled:hover {
+ background: #1A2652;
+ border: none;
+ }
}
.ztzf-table-container {
@@ -713,82 +725,82 @@
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 {
- 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;
- color: #FFFFFF;
- line-height: 22px;
- font-style: normal;
- text-transform: none;
- }
- }
-
- 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: #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;
- }
- }
- }
- }
}
.ztzf-table-content-bg {
background: #1A1A2A;
+ }
+}
+
+.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 {
+ 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;
+ color: #FFFFFF;
+ line-height: 22px;
+ font-style: normal;
+ text-transform: none;
+ }
+ }
+
+ 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: #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;
+ }
+ }
}
}
@@ -862,6 +874,7 @@
}
.ztzf-page-view-dialog {
+ padding: 30px;
display: flex;
flex-direction: column;
width: 770px;
@@ -947,7 +960,6 @@
}
.dialog-form {
-
.el-form-item {
display: flex;
align-items: center;
@@ -968,7 +980,7 @@
.el-form-item__content {
display: flex;
align-items: center;
-
+
.el-input {
width: 0;
flex: 1;
@@ -989,6 +1001,44 @@
background: #2E2E48 !important;
border: none;
box-shadow: none;
+ }
+
+ .ztzf-data-cockpit-date-picker {
+ background: #2E2E48;
+ }
+
+ .ztzf-data-cockpit-date-picker-popper {
+ background: #2E2E48 !important;
+
+ .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;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .el-popper__arrow {
+ &::before {
+ background: #2E2E48 !important;
+ border: 1px solid #2E2E48 !important;
+ box-sizing: border-box;
+ }
+ }
}
}
@@ -1069,3 +1119,316 @@
border-color: #2B2B4C !important;
color: #FFFFFF !important;
}
+
+.ztzf-page-map-view-dialog {
+ padding: 30px;
+ display: flex;
+ flex-direction: column;
+ width: 80%;
+ height: 812px;
+ background: #1A1A2A;
+ border-radius: 6px 6px 6px 6px;
+ border: 1px solid #2E2E46;
+
+ .el-dialog__header,
+ .el-dialog__footer {
+ margin: 0;
+ padding: 0;
+ }
+
+ .el-dialog__footer {
+ .el-button {
+ margin-top: 30px;
+ }
+ }
+
+ .el-dialog__body {
+ display: flex;
+ flex-direction: column;
+ height: 0;
+ flex: 1;
+
+ .dialog-container {
+ display: flex;
+ height: 0;
+ flex: 1;
+
+ .left-container {
+ width: 0;
+ flex: 1;
+ height: 100%;
+
+ .leftMap {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .right-container {
+ display: flex;
+ flex-direction: column;
+ width: 344px;
+ height: 100%;
+
+ .header {
+ padding: 0 16px;
+ padding-bottom: 16px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 18px;
+ color: #FFFFFF;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+
+ .dialog-container {
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .detail-title {
+ margin-bottom: 30px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 18px;
+ color: #FFFFFF;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+
+ .el-row {
+ .el-col {
+ margin-bottom: 20px;
+ display: flex;
+ align-items: center;
+
+ .label {
+ width: 112px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 14px;
+ color: #D4D5D7;
+ line-height: 22px;
+ text-align: right;
+ font-style: normal;
+ text-transform: none;
+ }
+
+ .val {
+ width: 0;
+ flex: 1;
+ margin-left: 12px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #9E9EBA;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ }
+ }
+ }
+
+
+ .ztzf-table-container {
+ height: 360px;
+
+ .ztzf-table-pagination {
+ justify-content: center;
+ }
+ }
+ }
+
+ .dialog-form {
+ padding-left: 16px;
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .el-form-item {
+ display: flex;
+ align-items: center;
+
+ .el-form-item__label {
+ display: flex;
+ align-items: center;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 14px;
+ color: #D4D5D7;
+ line-height: 22px;
+ text-align: right;
+ font-style: normal;
+ text-transform: none;
+ }
+
+ .el-form-item__content {
+ display: flex;
+ align-items: center;
+
+ .el-input,
+ .el-input-number {
+ width: 0;
+ flex: 1;
+ }
+
+ .el-textarea {
+
+ .el-textarea__inner {
+ color: #fff;
+ background: #2E2E48 !important;
+ border: none;
+ box-shadow: none;
+ }
+ }
+
+ .el-button {
+ color: #fff;
+ background: #2E2E48 !important;
+ border: none;
+ box-shadow: none;
+ }
+
+ >div.val {
+ color: #fff;
+ }
+
+ .ztzf-data-cockpit-date-picker {
+ background: #2E2E48;
+ }
+
+ .ztzf-data-cockpit-date-picker-popper {
+ background: #2E2E48 !important;
+
+ .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;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .el-popper__arrow {
+ &::before {
+ background: #2E2E48 !important;
+ border: 1px solid #2E2E48 !important;
+ box-sizing: border-box;
+ }
+ }
+ }
+ }
+
+ .el-input {
+ .el-input__wrapper {
+ background: #2E2E48 !important;
+
+ .el-input__inner {
+ color: #ffffff;
+ }
+ }
+ }
+ }
+
+ .search-table-container {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .search-box {
+ display: flex;
+ margin-bottom: 18px;
+
+ .label {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+
+ padding-right: 12px;
+ width: 96px;
+
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 14px;
+ color: #D4D5D7;
+ font-style: normal;
+ text-transform: none;
+
+ box-sizing: border-box;
+ }
+
+ .el-input {
+ width: 0;
+ flex: 1;
+
+ .el-input__wrapper {
+ background: #2E2E48 !important;
+
+ .el-input__inner {
+ color: #ffffff;
+ }
+ }
+ }
+ }
+
+ .el-form-item {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .el-form-item__content {
+ width: 100%;
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .el-table {
+ height: 0;
+ flex: 1;
+ }
+ }
+ }
+ }
+ }
+
+ .footer {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .el-button {
+ margin-left: 16px;
+ width: 96px;
+ height: 36px;
+
+ &:first-child {
+ margin-left: 0;
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3