From a7e6761ba0cfccdf33ed552eb2d3b783c8e4ab4a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 20:49:12 +0800
Subject: [PATCH] feat:事件弹窗显示调整
---
src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue b/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
index 821a67e..a2374d1 100644
--- a/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
+++ b/src/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventOverviewDetailLeft.vue
@@ -1,7 +1,10 @@
<template>
- <div class="left">
+ <!--时间 天气-->
+ <common-weather></common-weather>
+ <div class="event-overview-detail-left">
+ <!--返回-->
<div class="do-return" @click="goBack">
- <img src="@/assets/images/signMachineNest/return.png" alt="" />
+ <img src="@/assets/images/return.png" alt="" />
</div>
<common-title title="事件数据分析" />
<CommonDateTime class="dateTime" v-model="timeArr" @change="timeChange" />
@@ -11,6 +14,7 @@
</div>
</template>
<script setup>
+import CommonWeather from '@/components/CommonWeather.vue';
import EventDataAnalysis from './EventDataAnalysis.vue'
import CommonTitle from '@/components/CommonTitle.vue'
import CommonDateTime from '@/components/CommonDateTime.vue'
@@ -19,51 +23,68 @@
import EventTrendAnalysis from '@/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventTrendAnalysis.vue'
import EventTop5 from '@/views/Home/EventOverviewDetail/EventOverviewDetailLeft/EventTop5.vue'
-const today = dayjs().format('YYYY-MM-DD')
-const timeArr = ref([today, today])
+// 选中机巢默认日
+// const today = dayjs().format('YYYY-MM-DD')
+// const timeArr = ref([today, today])
+// 选中事件默认为周
+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 store = useStore()
const params = ref({
- date_enum: 'TODAY',
+ date_enum: 'CURRENT_WEEK',
end_date: undefined,
start_date: undefined,
})
provide('eventOverviewParams', params)
// 时间变化
-const timeChange = (value, date_enum) => {
+const timeChange = (value, date_enum, type) => {
params.value = {
...params.value,
date_enum,
}
+ store.commit('setEventTimeType', [type, date_enum]);
}
const goBack = () => {
store.commit('setIsEventOverviewDetail', false)
}
</script>
<style scoped lang="scss">
-.left {
+.event-overview-detail-left {
position: absolute;
- top: 88px;
+ width: 390px;
+ height: 920px;
+ top: 120px;
+ margin-left: 29px;
+ background: linear-gradient(
+ 270deg,
+ rgba(31, 62, 122, 0) 0%,
+ rgba(31, 62, 122, 0.35) 21%,
+ #1f3e7a 100%
+ );
+ border-radius: 0px 0px 0px 0px;
color: #e7f5ff;
display: flex;
flex-direction: column;
align-items: center;
.dateTime {
- width: 356px;
+ width: 400px;
margin: 0 0 8px 0;
}
.do-return {
position: absolute;
- top: 50px;
+
right: -50px;
cursor: pointer;
img {
- width: 40px;
- height: 40px;
+ width: 60px;
+ height: 33px;
}
}
}
--
Gitblit v1.9.3