From da721d6d734532a70020a3cdf0de2eaf36ba3ac3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 21 Jan 2026 12:25:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 148 +++++++++++++++++++++++++------------
applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue | 2
applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/FormDiaLog.vue | 4
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 6
applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue | 29 +++---
5 files changed, 121 insertions(+), 68 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 9b8ef08..28cb142 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -139,7 +139,7 @@
}
.command-date-picker-popper {
- background: #161B2C !important;
+ background: #2E2E48 !important;
border: none !important;
border-radius: 0px 0px 8px 8px;
@@ -157,7 +157,7 @@
.el-picker-panel {
.el-picker-panel__body-wrapper {
.el-picker-panel__body {
- background: #161B2C !important;
+ background: #2E2E48 !important;
color: #fff !important;
.el-date-range-picker__time-header {
@@ -220,6 +220,12 @@
}
}
}
+
+ .el-input__wrapper {
+ height: 28px;
+ background: #1A1A2A;
+ box-shadow: none;
+ }
}
}
@@ -269,11 +275,17 @@
background-color: #161B2C !important;
}
+ td.current:not(.disabled) {
+ .el-date-table-cell__text {
+ background-color: #284FE3;
+ }
+ }
+
td.in-range div,
td.in-range div:hover,
&.is-week-mode .el-date-table__row.current div,
&.is-week-mode .el-date-table__row:hover div {
- background-color: rgba(60, 121, 202) !important;
+ background-color: #284FE3 !important;
}
}
}
@@ -283,8 +295,8 @@
.el-popper__arrow {
&::before {
- background: #161B2C !important;
- border: 1px solid #161B2C !important;
+ background: #2E2E48 !important;
+ border: 1px solid #2E2E48 !important;
box-sizing: border-box;
}
}
@@ -326,21 +338,53 @@
}
.el-picker-panel__footer {
- background: #161B2C;
+ background: #2E2E48;
color: #fff;
border-top: none;
.el-button--small {
- box-shadow: 0 0 0 0.1rem#409eff;
- background-color: #161B2C;
color: #fff;
- border: none;
+ border: 1px solid rgba(255, 255, 255, 0.3);
+ box-shadow: none;
+ background-color: transparent !important;
&:hover {
- background-color: #161B2C;
color: #fff;
- border-color: #409eff;
+ border-color: none;
+ background-color: transparent !important;
}
+ }
+
+ .el-button--small:last-child {
+ border: none;
+ background-color: #284FE3 !important;
+
+ &:hover {
+ border: none;
+ background-color: #284FE3 !important;
+ }
+ }
+ }
+
+ .el-time-panel__content {
+ .el-time-spinner__item {
+ &.is-active {
+ color: #fff;
+ }
+
+ &:hover {
+ background: transparent !important;
+ }
+ }
+ }
+
+ .el-time-panel__footer {
+ .el-time-panel__btn {
+ color: #fff;
+ }
+
+ .el-time-panel__btn:first-child {
+ color: #86909C;
}
}
}
@@ -508,6 +552,11 @@
.el-tree-node.is-current>.el-tree-node__content {
color: #479dff !important;
+ }
+
+ .el-tree-node__content {
+ height: 34px;
+ line-height: 34px;
}
}
@@ -875,40 +924,6 @@
flex: 1;
display: flex;
flex-direction: column;
-
- .el-checkbox {
- width: 16px;
- height: 16px;
-
- .el-checkbox__input {
- width: 16px;
- height: 16px;
-
- .el-checkbox__inner {
- width: 16px;
- height: 16px;
-
- background: transparent !important;
- border-radius: 2px 2px 2px 2px;
- border: 2px solid #A1A3D4;
- box-shadow: none;
- box-sizing: border-box;
- }
- }
-
- &.is-checked {
- .el-checkbox__input {
- .el-checkbox__inner {
- border: none;
- background: url("@/assets/images/common/checkbox.png") no-repeat center / 100% 100% !important;
-
- &::after {
- content: none;
- }
- }
- }
- }
- }
}
.command-table-content-bg {
@@ -933,17 +948,17 @@
}
th.el-table__cell {
- height: 40px;
border-bottom: 1px solid #323241 !important;
.cell {
+ display: flex;
+ align-items: center;
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: 40px;
font-style: normal;
text-transform: none;
}
@@ -961,7 +976,6 @@
font-weight: 400;
font-size: 14px;
color: #D2D2E7;
- line-height: 18px;
font-style: normal;
text-transform: none;
}
@@ -990,6 +1004,44 @@
background: transparent !important;
}
+ .el-table__empty-text {
+ color: #fff;
+ }
+
+ .el-checkbox {
+ width: 16px;
+ height: 16px;
+
+ .el-checkbox__input {
+ width: 16px;
+ height: 16px;
+
+ .el-checkbox__inner {
+ width: 16px;
+ height: 16px;
+
+ background: transparent !important;
+ border-radius: 2px 2px 2px 2px;
+ border: 2px solid #A1A3D4;
+ box-shadow: none;
+ box-sizing: border-box;
+ }
+ }
+
+ &.is-checked {
+ .el-checkbox__input {
+ .el-checkbox__inner {
+ border: none;
+ background: url("@/assets/images/common/checkbox.png") no-repeat center / 100% 100% !important;
+
+ &::after {
+ content: none;
+ }
+ }
+ }
+ }
+ }
+
.fixed-column {
background-color: #1A1A2A !important;
}
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index e883151..98731b6 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -116,9 +116,9 @@
<el-table class="command-table" ref="areaTableRef"
:data="areaList.filter(item => item.areaName.includes(searchName))" row-key="id"
@selection-change="handleAreaSelectionChange">
- <el-table-column type="selection" width="55" :reserve-selection="true" />
- <el-table-column prop="areaName" label="区域名称" />
- <el-table-column prop="areaType" label="区域类型">
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="areaName" show-overflow-tooltip label="区域名称" />
+ <el-table-column prop="areaType" show-overflow-tooltip label="区域类型">
<template v-slot="{ row }">
{{ getDictLabel(row.areaType, dictObj.areaType) }}
</template>
diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
index b1eead9..cfbb742 100644
--- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
@@ -3,25 +3,26 @@
:close-on-click-modal="false" :destroy-on-close="true">
<el-form ref="queryParamsRef" :model="searchParams" class="command-dialog-history-search">
<el-form-item label="关键字" prop="keyword">
- <el-input class="command-input" v-model="searchParams.keyword" placeholder="名称/序列号"
- clearable @clear="handleSearch" />
+ <el-input class="command-input" v-model="searchParams.keyword" placeholder="名称/序列号" clearable
+ @clear="handleSearch" />
</el-form-item>
<el-form-item prop="dateRange">
- <el-date-picker class="command-date-picker"
- popper-class="command-date-picker-popper" v-model="searchParams.dateRange"
- type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
- value-format="YYYY/MM/DD" @change="handleSearch" />
+ <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
+ v-model="searchParams.dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+ end-placeholder="结束日期" value-format="YYYY/MM/DD" @change="handleSearch" />
</el-form-item>
<el-form-item label="区域" prop="area">
<el-tree-select class="command-select" popper-class="command-tree-select-popper"
- v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly filterable :filter-node-method="filterAreaNode" clearable placeholder="请选择" @change="handleSearch" />
+ v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly
+ filterable :filter-node-method="filterAreaNode" clearable placeholder="请选择"
+ @change="handleSearch" />
</el-form-item>
<el-form-item label="无人机类型" prop="droneType">
- <el-select class="command-select" popper-class="command-select-popper"
- v-model="searchParams.droneType" placeholder="请选择" clearable @change="handleSearch">
+ <el-select class="command-select" popper-class="command-select-popper" v-model="searchParams.droneType"
+ placeholder="请选择" clearable @change="handleSearch">
<el-option v-for="item in dictObj.droneType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
@@ -44,8 +45,8 @@
{{ getDroneTypeText(row.droneType) }}
</template>
</el-table-column>
- <el-table-column prop="areaName" label="区域" min-width="90" />
- <el-table-column prop="deviceName" label="数据来源" min-width="110" />
+ <el-table-column prop="areaName" show-overflow-tooltip label="区域" min-width="90" />
+ <el-table-column prop="deviceName" show-overflow-tooltip label="数据来源" min-width="110" />
<el-table-column label="信号频段" min-width="100">
<template #default="{ row }">
{{ formatFrequency(row.signalFreqMhz) }}
@@ -62,9 +63,9 @@
</div>
<div class="command-table-pagination">
- <el-pagination popper-class="command-select-popper"
- v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
- layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
+ <el-pagination popper-class="command-select-popper" v-model:current-page="searchParams.current"
+ v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
+ @change="getList" />
</div>
</div>
</el-dialog>
diff --git a/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/FormDiaLog.vue b/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/FormDiaLog.vue
index ac5b747..28dafb2 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/FormDiaLog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/FormDiaLog.vue
@@ -17,7 +17,7 @@
<div class="val">{{ formData.droneType || '-' }}</div>
</el-col>
<el-col :span="12">
- <div class="label">无人机设备编码</div>
+ <div class="label">设备编码</div>
<div class="val">{{ formData.droneDeviceCode || '-' }}</div>
</el-col>
<el-col :span="12">
@@ -81,7 +81,7 @@
const initForm = () => ({
droneName: '', // 无人机名称
droneType: '', // 无人机类型
- droneDeviceCode: '', // 无人机设备编码
+ droneDeviceCode: '', // 设备编码
findTime: '', // 发现时间
counterEffect: '', // 反制效果
counterWay: '', // 反制方式
diff --git a/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue b/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
index f6cbb05..110effc 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
@@ -59,7 +59,7 @@
<el-table-column type="index" width="64" show-overflow-tooltip label="序号" />
<el-table-column prop="droneName" show-overflow-tooltip width="130" label="无人机名称" />
<el-table-column prop="droneType" show-overflow-tooltip width="130" label="无人机类型" />
- <el-table-column prop="droneDeviceCode" show-overflow-tooltip width="140" label="无人机设备编码" />
+ <el-table-column prop="droneDeviceCode" show-overflow-tooltip width="140" label="设备编码" />
<el-table-column prop="findTime" show-overflow-tooltip width="140" label="发现时间" />
<el-table-column prop="counterEffect" show-overflow-tooltip width="120" label="反制效果">
<template v-slot="{ row }">
--
Gitblit v1.9.3