From d348e995a47c66d8a95096851ea8d3898e58e3b9 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 28 Mar 2025 13:58:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/Header.vue | 19 ++++++++++++++++++-
src/views/Home/components/HomeLeft/HomeLeft.vue | 19 ++++++++++++++++++-
src/views/Home/components/HomeLeft/InspectionRaskDetails.vue | 2 +-
3 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/layout/Header.vue b/src/layout/Header.vue
index 5b2bff2..7a49c54 100644
--- a/src/layout/Header.vue
+++ b/src/layout/Header.vue
@@ -6,6 +6,7 @@
<div class="left-item" @click="router.push('/taskManage')">任务管理</div>
<div class="left-item">航线规划</div>
</div>
+ <div class="big-title">江西省指挥调度平台</div>
<div class="h-right">
<div class="right-item">AI识别分析</div>
<div class="right-item">综合分析</div>
@@ -26,6 +27,7 @@
padding-top: 38px;
display: flex;
justify-content: space-between;
+ // position: relative;
.h-left {
display: flex;
@@ -53,7 +55,22 @@
background-size: 100% 100%;
}
}
-
+ .big-title {
+ position: relative;
+ top: -12px;
+ width: 500px;
+ height: 58px;
+ font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+ font-weight: 400;
+ font-size: 45px;
+ color: #FFFFFF;
+ line-height: 53px;
+ letter-spacing: 11px;
+ text-shadow: 0px 4px 1px rgba(19,80,143,0.66), 0px 0px 18px rgba(130,165,255,0.4), inset 0px 0px 2px rgba(255,255,255,0.8);
+ text-align: center;
+ font-style: normal;
+ text-transform: none;
+ }
.h-right {
display: flex;
justify-content: space-between;
diff --git a/src/views/Home/components/HomeLeft/HomeLeft.vue b/src/views/Home/components/HomeLeft/HomeLeft.vue
index 764ad27..9235761 100644
--- a/src/views/Home/components/HomeLeft/HomeLeft.vue
+++ b/src/views/Home/components/HomeLeft/HomeLeft.vue
@@ -2,7 +2,7 @@
<div class="home-left">
<!--时间 天气-->
<div class="time-weather">
- <div class="time">2025.03.04 15:30:00</div>
+ <div class="time">{{ time }}</div>
<div class="line"></div>
<div class="weather">
<img src="@/assets/images/tq.png" alt="" />
@@ -20,6 +20,23 @@
<script setup>
import OverviewNext from './OverviewNext.vue';
import InspectionRaskDetails from './InspectionRaskDetails.vue';
+import dayjs from 'dayjs';
+
+
+const time = ref('');
+const updateTime = () => {
+ time.value = dayjs().format('YYYY.MM.DD HH:mm:ss');
+};
+onMounted(() => {
+ updateTime(); // 立即执行一次
+ time.value = setInterval(updateTime, 1000);
+});
+onUnmounted(() => {
+ if (time.value) {
+ clearInterval(time.value);
+ time.value = null;
+ }
+});
</script>
<style scoped lang="scss">
diff --git a/src/views/Home/components/HomeLeft/InspectionRaskDetails.vue b/src/views/Home/components/HomeLeft/InspectionRaskDetails.vue
index 00eafb0..860a5b2 100644
--- a/src/views/Home/components/HomeLeft/InspectionRaskDetails.vue
+++ b/src/views/Home/components/HomeLeft/InspectionRaskDetails.vue
@@ -19,7 +19,7 @@
</div>
</div>
</div>
- <CommonDateTime></CommonDateTime>
+ <CommonDateTime :style="{ top: pxToRem(19) }"></CommonDateTime>
<div class="chart-container" ref="chartRef"></div>
</div>
</template>
--
Gitblit v1.9.3