From 40d264bd0cf00505bfc54a3a8633bd32cf4280b6 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 31 Jan 2026 15:33:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 37 +++++++++++++++++++++++++------------
applications/drone-command/env/.env.development | 12 +++++++++++-
2 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/applications/drone-command/env/.env.development b/applications/drone-command/env/.env.development
index 39b17e8..c8f07e9 100644
--- a/applications/drone-command/env/.env.development
+++ b/applications/drone-command/env/.env.development
@@ -1,3 +1,13 @@
+###
+ # @Author : yuan
+ # @Date : 2026-01-31 14:34:31
+ # @LastEditors : yuan
+ # @LastEditTime : 2026-01-31 14:49:37
+ # @FilePath : \applications\drone-command\env\.env.development
+ # @Description :
+ # Copyright 2026 OBKoro1, All Rights Reserved.
+ # 2026-01-31 14:34:31
+###
NODE_ENV='development'
#开发环境配置
@@ -6,7 +16,7 @@
#开发环境代理地址（推荐本地新建文件 .env.development.local 来进行覆盖）
# VITE_APP_URL=https://wrj.shuixiongit.com/api
-VITE_APP_URL=http://192.168.1.168
+VITE_APP_URL=http://192.168.1.204
#新大屏地址
VITE_APP_DASHBOARD_URL='https://wrj.shuixiongit.com/command-center-dashboard/'
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 74e128f..1cafd18 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -98,14 +98,27 @@
color: #ffffff;
}
- .el-checkbox__input.is-checked .el-checkbox__inner {
- background-color: #023aff;
- border-color: #023aff;
- }
+ .el-checkbox__input {
+ .el-checkbox__inner {
+ width: 16px;
+ height: 16px;
+ background: transparent !important;
+ border-radius: 2px 2px 2px 2px;
+ border: 2px solid #A1A3D4 !important;
+ box-shadow: none;
+ box-sizing: border-box;
+ }
- .el-checkbox__inner {
- background-color: transparent;
- border-color: #a1a3d4;
+ &.is-checked {
+ .el-checkbox__inner {
+ border: none !important;
+ background: url("@/assets/images/common/checkbox.png") no-repeat center / 100% 100% !important;
+
+ &::after {
+ content: none !important;
+ }
+ }
+ }
}
}
@@ -1511,7 +1524,7 @@
.el-tabs__item {
position: relative;
margin-left: 26px;
-
+
font-family: Source Code Pro, Source Code Pro;
font-weight: 400;
font-size: 14px;
@@ -1520,16 +1533,16 @@
font-style: normal;
text-transform: none;
cursor: pointer;
-
+
&:first-child {
margin-left: 0;
}
-
+
&.is-active {
font-weight: normal;
color: #FFFFFF;
}
-
+
&::after {
content: '';
position: absolute;
@@ -1538,7 +1551,7 @@
width: 100%;
height: 0;
}
-
+
&.is-active::after {
height: 3px;
background: #284FE3;
--
Gitblit v1.9.3