From 0462839304fe548e27768614dda3a625b68489aa Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 04 Feb 2026 15:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/lang/en.js | 2
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 2
applications/drone-command/src/lang/zh.js | 2
applications/drone-command/src/page/index/logo.vue | 2
applications/task-work-order/src/lang/zh.js | 2
applications/task-work-order/src/permission.js | 4
applications/drone-command/index.html | 82 ++++++++--------
applications/drone-command/src/permission.js | 2
applications/task-work-order/src/styles/login.scss | 147 ++++++----------------------
applications/task-work-order/src/page/login/index.vue | 4
applications/drone-command/src/lang/en.js | 2
applications/task-work-order/index.html | 12 +-
applications/drone-command/src/views/system/menu.vue | 4
applications/task-work-order/src/styles/common/cockpit.scss | 2
14 files changed, 94 insertions(+), 175 deletions(-)
diff --git a/applications/drone-command/index.html b/applications/drone-command/index.html
index c86c6d6..eb1eee0 100644
--- a/applications/drone-command/index.html
+++ b/applications/drone-command/index.html
@@ -2,51 +2,49 @@
<html lang="zh-CN">
<head>
- <meta charset="UTF-8" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <meta http-equiv="X-UA-Compatible" content="chrome=1" />
- <meta name="renderer" content="webkit" />
- <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
- <meta name="mobile-web-app-capable" content="yes" />
- <meta name="apple-mobile-web-app-status-bar-style" content="black" />
- <meta name="format-detection" content="telephone=no" />
- <link rel="icon" href="/img/bg/index_logo2.png" />
- <link rel="stylesheet" href="/fonts/font.css" />
- <link rel="stylesheet" href="/iconfont/index.css" />
- <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
- <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
- <link rel="stylesheet" href="/css/loading.css" />
- <link rel="stylesheet" href="/css/saber.css" />
- <!-- <script src="https://unpkg.com/axios/dist/axios.min.js"></script> -->
- <!-- 导入需要的包 （一定要放到index.html中的head标签里） -->
- <!-- 高德地图api更新必须配合安全密钥使用 -->
- <script>
- window._AMapSecurityConfig = {
- securityJsCode: '1cd61831ddce188f3129b761f57024fc',
- }
- </script>
- <script type="text/javascript"
- src='https://webapi.amap.com/maps?v=2.0&key=eb0654440644f710110547d2132b2fbe&plugin=AMap.PlaceSearch,AMap.Geocoder'></script>
- <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.0.11"></script>
- <title>反制平台</title>
+ <meta charset="UTF-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+ <meta name="renderer" content="webkit" />
+ <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
+ <meta name="mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+ <meta name="format-detection" content="telephone=no" />
+ <link rel="icon" href="/img/bg/index_logo2.png" />
+ <link rel="stylesheet" href="/fonts/font.css" />
+ <link rel="stylesheet" href="/iconfont/index.css" />
+ <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
+ <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
+ <link rel="stylesheet" href="/css/loading.css" />
+ <link rel="stylesheet" href="/css/saber.css" />
+ <!-- <script src="https://unpkg.com/axios/dist/axios.min.js"></script> -->
+ <!-- 导入需要的包 （一定要放到index.html中的head标签里） -->
+ <!-- 高德地图api更新必须配合安全密钥使用 -->
+ <script>
+ window._AMapSecurityConfig = {
+ securityJsCode: '1cd61831ddce188f3129b761f57024fc',
+ }
+ </script>
+ <script type="text/javascript"
+ src='https://webapi.amap.com/maps?v=2.0&key=eb0654440644f710110547d2132b2fbe&plugin=AMap.PlaceSearch,AMap.Geocoder'></script>
+ <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.0.11"></script>
+ <title>吉安市低空经济服务一体化平台</title>
</head>
<body class="theme-white">
- <div id="app">
- <div id="loader-wrapper">
- <div class='loader-box'>
- <span>综</span>
- <span>合</span>
- <span>管</span>
- <span>理</span>
- <span>平</span>
- <span>台</span>
- </div>
- <div class="loader-title">系统加载中</div>
- </div>
- </div>
- <script type="module" src="/src/main.js"></script>
+<div id="app">
+ <div id="loader-wrapper">
+ <div class='loader-box'>
+ <span>反</span>
+ <span>制</span>
+ <span>平</span>
+ <span>台</span>
+ </div>
+ <div class="loader-title">系统加载中</div>
+ </div>
+</div>
+<script type="module" src="/src/main.js"></script>
</body>
<!-- <script>
diff --git a/applications/drone-command/src/lang/en.js b/applications/drone-command/src/lang/en.js
index 12ff976..7655d03 100644
--- a/applications/drone-command/src/lang/en.js
+++ b/applications/drone-command/src/lang/en.js
@@ -1,5 +1,5 @@
export default {
- title: '反制平台',
+ title: '吉安市低空经济服务一体化平台',
logoutTip: 'Exit the system, do you want to continue?',
submitText: 'submit',
cancelText: 'cancel',
diff --git a/applications/drone-command/src/lang/zh.js b/applications/drone-command/src/lang/zh.js
index 52aa717..82e54e7 100644
--- a/applications/drone-command/src/lang/zh.js
+++ b/applications/drone-command/src/lang/zh.js
@@ -1,5 +1,5 @@
export default {
- title: '反制平台',
+ title: '吉安市低空经济服务一体化平台',
logoutTip: '退出系统, 是否继续?',
submitText: '确定',
cancelText: '取消',
diff --git a/applications/drone-command/src/page/index/logo.vue b/applications/drone-command/src/page/index/logo.vue
index 0d344ab..96bcbe0 100644
--- a/applications/drone-command/src/page/index/logo.vue
+++ b/applications/drone-command/src/page/index/logo.vue
@@ -10,7 +10,7 @@
<template v-if="getScreen(!isCollapse)">
<div class="fadeStyle">
<img v-if="!hideMenuTopLogo" class="logoImg" src="/img/bg/mainLogo.png" alt=""/>
- <div class="titleName">综合管理平台</div>
+ <div class="titleName">反制平台</div>
<!-- <span style="font-size: 20px;" key="1">
{{ this.parentDeptInfo.sysName }}
</span> -->
diff --git a/applications/drone-command/src/permission.js b/applications/drone-command/src/permission.js
index 2e3d72f..d6471a8 100644
--- a/applications/drone-command/src/permission.js
+++ b/applications/drone-command/src/permission.js
@@ -133,7 +133,7 @@
NProgress.done()
const isLoginPage = to.path === '/login'
// 根据是否登录页设置标题
- const pageTitle = isLoginPage ? '反制平台' : '反制平台'
+ const pageTitle = isLoginPage ? '吉安市低空经济服务一体化平台' : '吉安市低空经济服务一体化平台'
document.title = pageTitle
store.commit('SET_IS_SEARCH', false)
})
diff --git a/applications/drone-command/src/views/system/menu.vue b/applications/drone-command/src/views/system/menu.vue
index 3bffef7..df34ec5 100644
--- a/applications/drone-command/src/views/system/menu.vue
+++ b/applications/drone-command/src/views/system/menu.vue
@@ -210,6 +210,10 @@
label: '任务工单',
value: 6,
},
+ {
+ label: '系统',
+ value: 7,
+ },
],
hide: true,
rules: [
diff --git a/applications/task-work-order/index.html b/applications/task-work-order/index.html
index c5c341d..64acf81 100644
--- a/applications/task-work-order/index.html
+++ b/applications/task-work-order/index.html
@@ -29,19 +29,17 @@
<script type="text/javascript"
src='https://webapi.amap.com/maps?v=2.0&key=eb0654440644f710110547d2132b2fbe&plugin=AMap.PlaceSearch,AMap.Geocoder'></script>
<script src="https://webapi.amap.com/ui/1.1/main.js?v=1.0.11"></script>
- <title>任务工单平台</title>
+ <title>吉安市低空经济服务一体化平台</title>
</head>
<body class="theme-white">
<div id="app">
<div id="loader-wrapper">
<div class='loader-box'>
- <span>综</span>
- <span>合</span>
- <span>管</span>
- <span>理</span>
- <span>平</span>
- <span>台</span>
+ <span>任</span>
+ <span>务</span>
+ <span>工</span>
+ <span>单</span>
</div>
<div class="loader-title">系统加载中</div>
</div>
diff --git a/applications/task-work-order/src/lang/en.js b/applications/task-work-order/src/lang/en.js
index 54d6e93..7655d03 100644
--- a/applications/task-work-order/src/lang/en.js
+++ b/applications/task-work-order/src/lang/en.js
@@ -1,5 +1,5 @@
export default {
- title: '任务工单平台',
+ title: '吉安市低空经济服务一体化平台',
logoutTip: 'Exit the system, do you want to continue?',
submitText: 'submit',
cancelText: 'cancel',
diff --git a/applications/task-work-order/src/lang/zh.js b/applications/task-work-order/src/lang/zh.js
index 9890ad6..82e54e7 100644
--- a/applications/task-work-order/src/lang/zh.js
+++ b/applications/task-work-order/src/lang/zh.js
@@ -1,5 +1,5 @@
export default {
- title: '任务工单平台',
+ title: '吉安市低空经济服务一体化平台',
logoutTip: '退出系统, 是否继续?',
submitText: '确定',
cancelText: '取消',
diff --git a/applications/task-work-order/src/page/login/index.vue b/applications/task-work-order/src/page/login/index.vue
index c806bbe..b2ea824 100644
--- a/applications/task-work-order/src/page/login/index.vue
+++ b/applications/task-work-order/src/page/login/index.vue
@@ -5,9 +5,7 @@
<div class="login-time">
{{ time }}
</div>
- <div class="login-brand">
- <p class="title">{{ login.info }}</p>
- </div>
+ <p class="title">{{ login.info }}</p>
</div>
<div class="login-border">
<div class="login-main">
diff --git a/applications/task-work-order/src/permission.js b/applications/task-work-order/src/permission.js
index 01156ea..2b61a5e 100644
--- a/applications/task-work-order/src/permission.js
+++ b/applications/task-work-order/src/permission.js
@@ -136,7 +136,7 @@
NProgress.done()
const isLoginPage = to.path === '/login'
// 根据是否登录页设置标题
- const pageTitle = isLoginPage ? '任务工单平台' : '综合管理平台'
- document.title = pageTitle
+
+ document.title = isLoginPage ? '吉安市低空经济服务一体化平台' : '吉安市低空经济服务一体化平台'
store.commit('SET_IS_SEARCH', false)
})
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index b6af6e4..4264ea0 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -522,7 +522,7 @@
.label {
display: inline-block;
- width: 88px;
+ min-width: 88px;
flex-shrink: 0;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
diff --git a/applications/task-work-order/src/styles/login.scss b/applications/task-work-order/src/styles/login.scss
index d68c13a..98100e4 100644
--- a/applications/task-work-order/src/styles/login.scss
+++ b/applications/task-work-order/src/styles/login.scss
@@ -5,41 +5,15 @@
width: 100%;
height: 100%;
margin: 0 auto;
- background-color: #0b1220;
- overflow: hidden;
+ background-color: #469BC0;
+ // background-image: url("/img/bg/bg.jpg");
background-size: 100% 100%;
-}
-
-.login-container::before,
-.login-container::after {
- content: "";
- position: absolute;
- inset: -20%;
- z-index: 0;
- background: radial-gradient(60% 60% at 20% 30%, rgba(88, 176, 255, 0.35), transparent 60%),
- radial-gradient(50% 50% at 80% 20%, rgba(124, 92, 255, 0.35), transparent 65%),
- radial-gradient(50% 50% at 70% 80%, rgba(0, 212, 255, 0.35), transparent 65%),
- linear-gradient(135deg, rgba(10, 21, 38, 0.95), rgba(13, 24, 43, 0.92));
- filter: blur(10px);
- animation: float-sheen 16s ease-in-out infinite;
-}
-
-.login-container::after {
- inset: -30%;
- opacity: 0.5;
- background: conic-gradient(from 120deg, rgba(95, 228, 255, 0.25), rgba(128, 120, 255, 0.15), transparent 50%);
- animation: float-sheen 24s ease-in-out infinite reverse;
}
.login-weaper {
margin: 0 auto;
width: 1000px;
- position: relative;
- z-index: 1;
- border-radius: 16px;
- box-shadow: 0 30px 60px rgba(6, 12, 24, 0.55);
- backdrop-filter: blur(10px);
- animation: pop-in 0.7s ease-out;
+ box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
.el-input-group__append {
border: none;
@@ -55,12 +29,11 @@
}
.login-left {
- border-top-left-radius: 16px;
- border-bottom-left-radius: 16px;
+ border-top-left-radius: 5px;
+ border-bottom-left-radius: 5px;
justify-content: center;
flex-direction: column;
- background: linear-gradient(160deg, rgba(80, 160, 255, 0.95), rgba(73, 96, 255, 0.92)) !important;
- box-shadow: inset -1px 0 0 rgba(255, 255, 255, 0.12);
+ background-color: #5A9CF8 !important;
color: #fff;
float: left;
width: 50%;
@@ -69,7 +42,6 @@
.login-left .img {
width: 140px;
- filter: drop-shadow(0 8px 18px rgba(10, 22, 38, 0.35));
}
.login-time {
@@ -80,37 +52,33 @@
color: #fff;
font-weight: 200;
opacity: 0.9;
- font-size: 16px;
+ font-size: 18px;
overflow: hidden;
- letter-spacing: 1px;
}
.login-left .title {
text-align: center;
color: #fff;
font-weight: bold;
- font-size: 32px;
- letter-spacing: 3px;
- text-shadow: 0 8px 20px rgba(0, 0, 0, 0.35);
+ font-size: 30px;
+ letter-spacing: 2px;
}
.login-border {
border-left: none;
- border-top-right-radius: 16px;
- border-bottom-right-radius: 16px;
+ border-top-right-radius: 5px;
+ border-bottom-right-radius: 5px;
color: #fff;
- background: rgba(255, 255, 255, 0.92);
+ background-color: #fff;
width: 50%;
float: left;
box-sizing: border-box;
- box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.4);
}
.login-main {
margin: 0 auto;
width: 65%;
box-sizing: border-box;
- padding: 40px 0;
}
.login-main > h3 {
@@ -122,13 +90,12 @@
}
.login-title {
- color: #1a1f2b;
- margin-bottom: 36px;
- font-weight: 600;
- font-size: 24px;
+ color: #333;
+ margin-bottom: 40px;
+ font-weight: 500;
+ font-size: 22px;
text-align: center;
- letter-spacing: 6px;
- text-transform: uppercase;
+ letter-spacing: 4px;
}
.login-menu {
@@ -146,49 +113,46 @@
.btn-submit {
width: 100%;
height: 45px;
- border: 1px solid rgba(78, 155, 255, 0.7);
- background: linear-gradient(120deg, rgba(78, 155, 255, 0.15), rgba(95, 228, 255, 0.25));
+ border: 1px solid var(--el-color-primary);
+ background: none;
font-size: 18px;
letter-spacing: 2px;
font-weight: 300;
- color: #1a3f6e;
+ color: var(--el-color-primary);
cursor: pointer;
margin-top: 30px;
font-family: "neo";
transition: 0.25s;
- box-shadow: 0 12px 24px rgba(35, 93, 204, 0.2);
}
.login-submit {
width: 60%;
height: 45px;
- border: 1px solid rgba(78, 155, 255, 0.7);
- background: linear-gradient(120deg, rgba(78, 155, 255, 0.15), rgba(95, 228, 255, 0.25));
+ border: 1px solid var(--el-color-primary);
+ background: none;
font-size: 18px;
letter-spacing: 2px;
font-weight: 300;
- color: #1a3f6e;
+ color: var(--el-color-primary);
cursor: pointer;
margin-top: 30px;
font-family: "neo";
transition: 0.25s;
- box-shadow: 0 12px 24px rgba(35, 93, 204, 0.2);
}
.register-submit {
width: 36%;
height: 45px;
- border: 1px solid rgba(239, 47, 99, 0.7);
- background: linear-gradient(120deg, rgba(239, 47, 99, 0.15), rgba(255, 120, 160, 0.25));
+ border: 1px solid #EF2F63FF;
+ background: none;
font-size: 18px;
letter-spacing: 2px;
font-weight: 300;
- color: #b31e4b;
+ color: #EF2F63FF;
cursor: pointer;
margin-top: 30px;
font-family: "neo";
transition: 0.25s;
- box-shadow: 0 12px 24px rgba(239, 47, 99, 0.2);
}
.login-form {
@@ -213,9 +177,8 @@
background: transparent;
box-shadow: none;
border-radius: 0;
- color: #1a1f2b;
- border-bottom: 1px solid rgba(78, 155, 255, 0.4);
- transition: border-color 0.2s ease;
+ color: #333;
+ border-bottom: 1px solid rgb(235, 237, 242);
}
.el-input__prefix {
@@ -238,9 +201,9 @@
margin-top: 2px;
width: 100px;
height: 38px;
- background-color: rgba(255, 255, 255, 0.85);
- border: 1px solid rgba(78, 155, 255, 0.3);
- color: #1a1f2b;
+ background-color: #fdfdfd;
+ border: 1px solid #f0f0f0;
+ color: #333;
font-size: 14px;
font-weight: bold;
letter-spacing: 5px;
@@ -254,55 +217,13 @@
margin-top: 2px;
width: 100px;
height: 38px;
- background-color: rgba(255, 255, 255, 0.85);
- border: 1px solid rgba(78, 155, 255, 0.3);
- color: #4b5563;
+ background-color: #fdfdfd;
+ border: 1px solid #f0f0f0;
+ color: #7c7979;
font-size: 12px;
letter-spacing: 1px;
line-height: 38px;
text-indent: 5px;
text-align: center;
cursor: pointer !important;
-}
-
-.btn-submit:hover,
-.login-submit:hover {
- border-color: rgba(78, 155, 255, 0.9);
- background: linear-gradient(120deg, rgba(78, 155, 255, 0.35), rgba(95, 228, 255, 0.45));
- color: #0e2d56;
- transform: translateY(-1px);
-}
-
-.register-submit:hover {
- border-color: rgba(239, 47, 99, 0.9);
- background: linear-gradient(120deg, rgba(239, 47, 99, 0.3), rgba(255, 120, 160, 0.45));
- color: #8f173a;
- transform: translateY(-1px);
-}
-
-.el-input__wrapper.is-focus {
- border-bottom-color: rgba(78, 155, 255, 0.9);
-}
-
-@keyframes float-sheen {
- 0% {
- transform: translate3d(0, 0, 0) scale(1);
- }
- 50% {
- transform: translate3d(2%, -2%, 0) scale(1.02);
- }
- 100% {
- transform: translate3d(0, 0, 0) scale(1);
- }
-}
-
-@keyframes pop-in {
- 0% {
- opacity: 0;
- transform: translateY(20px) scale(0.98);
- }
- 100% {
- opacity: 1;
- transform: translateY(0) scale(1);
- }
}
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
index 1f1580c..436cf6d 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -17,7 +17,7 @@
<div class="val">{{ formData.flyerPhone }}</div>
</el-col>
<el-col :span="12">
- <div class="label">飞行时长</div>
+ <div class="label">飞行时长(小时)</div>
<div class="val">{{ formData.flightHours }}</div>
</el-col>
<el-col :span="12">
--
Gitblit v1.9.3