From 115bd56702e2ce09b7a7c1e6bb5e93e2f6174cdf Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 20:50:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue b/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
index a2374d1..90f553c 100644
--- a/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
+++ b/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
@@ -1,12 +1,12 @@
<template>
<!--时间 天气-->
<common-weather></common-weather>
- <div class="event-overview-detail-left">
- <!--返回-->
- <div class="do-return" @click="goBack">
- <img src="@/assets/images/return.png" alt="" />
- </div>
- <common-title title="事件数据分析" />
+ <!--返回-->
+ <div class="do-return" :style="{left:isHideBottomIcon?pxToRem(430):pxToRem(46)}" @click="goBack">
+ <img src="@/assets/images/return.png" alt="" />
+ </div>
+ <common-title v-show="isHideBottomIcon" :style="{left:pxToRem(14)}" title="事件数据分析" />
+ <div v-show="isHideBottomIcon" class="event-overview-detail-left">
<CommonDateTime class="dateTime" v-model="timeArr" @change="timeChange" />
<EventDataAnalysis />
<EventTrendAnalysis />
@@ -22,6 +22,7 @@
import { useStore } from 'vuex'
import EventTrendAnalysis from '@/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventTrendAnalysis.vue'
import EventTop5 from '@/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventTop5.vue'
+import { pxToRem } from '@/utils/rem'
// 选中机巢默认日
// const today = dayjs().format('YYYY-MM-DD')
@@ -30,6 +31,8 @@
const startOfWeek = dayjs().startOf('week').add(1, 'day').format('YYYY-MM-DD')
const endOfWeek = dayjs().endOf('week').add(1, 'day').format('YYYY-MM-DD')
const timeArr = ref([startOfWeek, endOfWeek])
+
+const isHideBottomIcon = computed(() => store.state.common.isHideBottomIcon)
const store = useStore()
@@ -49,6 +52,7 @@
store.commit('setEventTimeType', [type, date_enum]);
}
const goBack = () => {
+ store.commit('setHideBottomIcon', true)
store.commit('setIsEventOverviewDetail', false)
}
</script>
@@ -56,8 +60,8 @@
.event-overview-detail-left {
position: absolute;
width: 390px;
- height: 920px;
- top: 120px;
+ height: 870px;
+ top: 166px;
margin-left: 29px;
background: linear-gradient(
270deg,
@@ -72,20 +76,19 @@
align-items: center;
.dateTime {
- width: 400px;
+ width: 356px;
margin: 0 0 8px 0;
}
+}
+.do-return {
+ position: absolute;
+ top: 136px;
+ left: 430px;
+ cursor: pointer;
- .do-return {
- position: absolute;
-
- right: -50px;
- cursor: pointer;
-
- img {
- width: 60px;
- height: 33px;
- }
+ img {
+ width: 60px;
+ height: 33px;
}
}
</style>
--
Gitblit v1.9.3