From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue | 296 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 248 insertions(+), 48 deletions(-)
diff --git a/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue b/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
index edfc854..fd49c26 100644
--- a/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
+++ b/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
@@ -1,11 +1,18 @@
<template>
<div class="event-overviewdetail-right" :class="{ isMore }">
- <CommonTitle title="工单列表" />
+ <CommonTitle title="事件概况" :style="{ width: isMore ? pxToRem(820) : pxToRem(404) }" />
<div class="content">
- <img class="leftArrow" :src="isMore ? rightArrowImg : leftArrowImg" @click="leftArrowFun" alt="" />
+ <img
+ class="leftArrow"
+ :class="isMore ? 'rightArrow' : ''"
+ :src="isMore ? rightArrowImg : leftArrowImg"
+ @click="leftArrowFun"
+ alt=""
+ />
<el-date-picker
+ popper-class="custom-date-picker"
class="ztzf-date-picker"
v-model="timeArr"
type="daterange"
@@ -17,6 +24,7 @@
/>
<el-select
+ :teleported="false"
class="ztzf-select"
:style="{ width: pxToRem(174) }"
v-model="params.device_sn"
@@ -29,6 +37,7 @@
</el-select>
<el-select
+ :teleported="false"
class="ztzf-select"
:style="{ width: pxToRem(174) }"
v-model="params.word_order_type"
@@ -50,12 +59,12 @@
<img class="statusItemImg" :src="item.img" alt="" />
<div class="statusItemInfo">
<div class="statusItemName">{{ item.name }}</div>
- <div class="statusItemNum">{{ item.num || 0 }}</div>
+ <div class="statusItemNum" :style="{ color: item.color }">{{ item.num || 0 }}</div>
</div>
</div>
</div>
- <el-checkbox-group v-model="params.event_keys" @change="getList">
+ <el-checkbox-group v-show="isMore" v-model="params.event_keys" @change="getList">
<el-checkbox v-for="item in eventList" :value="item.status" :key="item.dictKey">
<template #default>
<span class="eventListItemCheckboxName">{{ item.name }}</span>
@@ -66,18 +75,14 @@
<div class="eventList">
<div class="eventListItem" v-for="item in list">
- <img
- class="eventListItemImg"
- :src="getSmallImg(item.photo_url)"
- alt=""
- />
+ <img class="eventListItemImg" :src="getSmallImg(item.photo_url)" alt="" @click="getFindImgHistory(item)" />
<div class="eventListItemPosition" :title="item.address" @click="positioning(item)">
<img :src="positioningImg" alt="" title="点击定位" />
- <div class="address">{{ item.address }}</div>
+ <!-- <div class="address">{{ item.address }}</div> -->
</div>
<div class="eventListItemText">
<div class="eventListItemName">{{ item.event_name }}</div>
- <div class="eventListItemTime">{{ item.create_time }}</div>
+ <div class="eventListItemTime">{{ dayjs(item.create_time).format('MM/DD HH:mm') }}</div>
</div>
</div>
</div>
@@ -92,6 +97,34 @@
:total="total"
@change="pageChange"
/>
+ </div>
+ </div>
+ </div>
+ <div class="image-list" v-if="isShowBigImg" :style="{ right: isMore ? pxToRem(838) : pxToRem(460) }">
+ <div class="title">
+ <img @click="isShowBigImg = false" src="@/assets/images/home/useEventOperate/close.png" alt="" />
+ </div>
+ <div class="content">
+ <img :src="clickImgSrc" alt="" />
+ </div>
+ <div class="card">
+ <div class="card-content">
+ <div v-for="(item, index) in imageList">
+ <div class="time-top" :class="index === selectedImgIndex ? 'active' : ''" @click="clickWeekTime(item, index)">
+ {{ item.create_time_str }}
+ </div>
+ <div class="time-point">
+ <img
+ class="active"
+ v-if="index === selectedImgIndex"
+ src="@/assets/images/home/useEventOperate/point-active.png"
+ alt=""
+ />
+ <img v-else src="@/assets/images/home/useEventOperate/point.png" alt="" />
+ </div>
+ <div class="time-bottom">{{ item.create_time }}</div>
+ </div>
+ <div class="time-line"></div>
</div>
</div>
</div>
@@ -110,7 +143,7 @@
import dayjs from 'dayjs'
import { selectDevicePage } from '@/api/home/machineNest'
import { getMultipleDictionary } from '@/api/system/dictbiz'
-import { getEvenNum, getEventPage, getEventStatusNum } from '@/api/home/event'
+import { getEvenNum, getEventPage, getEventStatusNum, findImgHistory } from '@/api/home/event'
import cesiumOperation from '@/utils/cesium-tsa'
import CommonTitle from '@/components/CommonTitle.vue'
import { pxToRem } from '@/utils/rem'
@@ -139,7 +172,7 @@
size: 8,
})
-const getSmallImg = (url) => {
+const getSmallImg = url => {
return url ? url.substring(0, url.lastIndexOf('.')) + '_small' + url.substring(url.lastIndexOf('.')) : ''
}
@@ -148,6 +181,8 @@
isMore.value = !isMore.value
params.value.size = isMore.value ? 16 : 8
params.value.current = 1
+ // 下半部分隐藏 右侧隐藏
+ store.commit('setHideBottomIcon', !isMore.value)
getList()
}
@@ -173,20 +208,21 @@
})
}
const { flyTo } = cesiumOperation()
+const longitudeOffset = ref(0)
const positioning = row => {
const longitude = Number(row.longitude)
const latitude = Number(row.latitude)
- flyTo({ longitude, latitude }, 1, 1000)
+ flyTo({ longitude: longitude, latitude: latitude + 0.0008 }, 1, 1000)
}
// 事件状态+数量
const statusList = ref([
- { name: '全部状态', img: status0Img, id: undefined,few: true },
- { name: '待审核', img: status1Img, id: 2 },
- { name: '待处理', img: status2Img, id: 0, few: true },
- { name: '处理中', img: status3Img, id: 3, few: true },
- { name: '已完成', img: status4Img, id: 4, few: true },
- { name: '待分拨', img: status5Img, id: 1 },
+ { name: '全部状态', img: status0Img, id: undefined, few: true, color: '#FFD509' },
+ { name: '待审核', img: status1Img, id: 2, color: '#8CFEA7' },
+ { name: '待处理', img: status2Img, id: 0, few: true, color: '#FF7411' },
+ { name: '处理中', img: status3Img, id: 3, few: true, color: '#FFC398' },
+ { name: '已完成', img: status4Img, id: 4, few: true, color: '#AFD9FB' },
+ { name: '待分拨', img: status5Img, id: 1, color: '#11C4FF' },
])
const getEventStatusNumFun = () => {
@@ -218,7 +254,7 @@
params.value.start_date = start_date
params.value.end_date = end_date
// 提交数据，更新聚合
- store.commit('setEventTimeRang', timeArr.value);
+ store.commit('setEventTimeRang', timeArr.value)
// 重置
getEventStatusNumFun()
getEventList()
@@ -240,28 +276,53 @@
}
getEventPage(params.value, pageParams).then(res => {
const resData = res.data.data
- list.value = (resData?.records || [])
+ list.value = resData?.records || []
total.value = resData.total
})
}
+const isShowBigImg = ref(false)
+const imageList = ref([])
+const clickImgSrc = ref('')
+const selectedImgIndex = ref(0)
+// 点击图片放大 显示详细信息
+const getFindImgHistory = item => {
+ // 下半部分隐藏 右侧隐藏
+ isShowBigImg.value = true
+ store.commit('setHideBottomIcon', false)
+ findImgHistory(item.id).then(res => {
+ if (res.data.code !== 0) return
+ imageList.value = res.data.data
+ clickImgSrc.value = res.data.data[0]?.url
+ })
+ positioning(item)
+}
+// 点击周期
+const clickWeekTime = (item, index) => {
+ clickImgSrc.value = item.url
+ selectedImgIndex.value = index
+}
const getDateRange = unit => {
- if (unit === 'today') {
- return [dayjs().format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')];
- }
- return [dayjs().startOf(unit).format('YYYY-MM-DD HH:mm:ss'), dayjs().endOf(unit).format('YYYY-MM-DD HH:mm:ss')];
-};
+ if (unit === 'today') {
+ return [dayjs().format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+ }
+ return [dayjs().startOf(unit).format('YYYY-MM-DD HH:mm:ss'), dayjs().endOf(unit).format('YYYY-MM-DD HH:mm:ss')]
+}
// 监听事件时间范围变化
-watch(() => store.state.home.eventTimeType, (newVal) => {
- timeArr.value = getDateRange(newVal);
- const [start_date, end_date] = getDateRange(newVal);
- params.value.start_date = start_date
- params.value.end_date = end_date
- getEventStatusNumFun()
- getEventList()
- getList()
-}, { immediate: false,deep: true })
+watch(
+ () => store.state.home.eventTimeType,
+ newVal => {
+ timeArr.value = getDateRange(newVal)
+ const [start_date, end_date] = getDateRange(newVal)
+ params.value.start_date = start_date
+ params.value.end_date = end_date
+ getEventStatusNumFun()
+ getEventList()
+ getList()
+ },
+ { immediate: false, deep: true }
+)
onMounted(() => {
getDeviceList()
@@ -282,25 +343,27 @@
height: 922px;
width: 405px;
font-size: 18px;
+ z-index: 10;
&.isMore {
- width: 807px;
+ width: 808px;
.content {
width: 792px;
+ padding-left: 44px;
}
}
.content {
width: 390px;
height: 877px;
- background: linear-gradient(270deg, #1f3e7a 0%, rgba(31, 62, 122, 0.35) 79%, rgba(31, 62, 122, 0) 100%);
+ background: linear-gradient(270deg, rgba(31, 62, 122, 0) 0%, rgba(31, 62, 122, 0.35) 21%, #1f3e7a 100%);
display: flex;
justify-content: space-between;
align-content: start;
flex-wrap: wrap;
- padding: 7px 15px 0 11px;
- gap: 10px;
+ padding: 7px 13px 0 11px;
+ gap: 16px;
.leftArrow {
position: absolute;
@@ -310,38 +373,49 @@
cursor: pointer;
}
+ .rightArrow {
+ position: absolute;
+ top: 50%;
+ left: 30px;
+ transform: translateY(-50%);
+ cursor: pointer;
+ }
+
.statusList {
width: 100%;
display: flex;
+ justify-content: space-between;
.statusItem {
- width: 95px;
+ // width: 95px;
height: 44px;
display: flex;
flex: 1;
justify-content: center;
position: relative;
cursor: pointer;
+ // margin-right: 4px;
&.active {
background: linear-gradient(
180deg,
rgba(19, 80, 141, 0) 0%,
rgba(22, 56, 91, 0.48) 48%,
- #053462 91%,
- #259dff 91%,
+ #053462 98%,
+ #259dff 98%,
#259dff 98%
);
}
.statusItemImg {
- width: 35px;
- height: 35px;
+ width: 34px;
+ height: 34px;
+ margin-right: 1px;
}
.statusItemInfo {
.statusItemName {
- width: 59px;
+ // width: 59px;
height: 17px;
font-family: Segoe UI, Segoe UI;
font-weight: 400;
@@ -351,6 +425,7 @@
text-align: left;
font-style: normal;
text-transform: none;
+ margin-bottom: 4px;
}
.statusItemNum {
@@ -401,13 +476,14 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- justify-content: space-between;
- gap: 20px 0;
+ // justify-content: space-between;
+ gap: 20px 10px;
.eventListItem {
width: 175px;
height: 140px;
position: relative;
+ cursor: pointer;
.eventListItemImg {
width: 174px;
@@ -475,4 +551,128 @@
display: flex;
justify-content: center;
}
+
+.image-list {
+ position: absolute;
+ top: 148px;
+
+ right: 460px;
+
+ width: 632px;
+ height: 476px;
+ border: solid;
+ background: #0f1929;
+ z-index: 1;
+
+ border: solid 2px transparent;
+ border-radius: 20px;
+ background-image: linear-gradient(#fff, #fff), linear-gradient(180deg, rgba(81, 168, 255, 1), rgba(189, 228, 255, 1));
+ background-origin: border-box;
+ background-clip: content-box, border-box;
+
+ overflow: hidden;
+ .title {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ text-align: right;
+ top: 0;
+ right: 0;
+ width: 45px;
+ height: 44px;
+ background: rgba(0, 0, 0, 0.5);
+ border-radius: 0px 20px 0px 8px;
+
+ img {
+ width: 10.55px;
+ height: 10.55px;
+ cursor: pointer;
+ }
+ }
+
+ .content {
+ img {
+ width: 100%;
+ height: 100%;
+ border-radius: 10px 10px 10px 10px;
+ }
+ }
+
+ .card {
+ position: absolute;
+ bottom: 0px;
+ width: 100%;
+ height: 67px;
+ background: rgba(0, 0, 0, 0.42);
+ border-radius: 0px 0px 20px 20px;
+ padding: 0px 6px 0px 29px;
+
+ color: #d5d5d5;
+ font-size: 14px;
+
+ .card-content {
+ display: flex;
+ justify-content: space-between;
+
+ position: absolute;
+ left: 29px;
+ width: calc(100% - 29px - 6px);
+ height: 100%;
+
+ & > div {
+ position: relative;
+ }
+
+ .time-top {
+ margin-top: 10px;
+ line-height: 1;
+ text-align: center;
+ cursor: pointer;
+ }
+
+ .active {
+ font-weight: 400;
+ color: #ffffff;
+ }
+
+ .time-point {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ top: 28px;
+ left: 50%;
+ width: 18px;
+ height: 18px;
+ z-index: 1;
+ transform: translate(-50%, 0);
+
+ img {
+ width: 11.2px;
+ height: 11.2px;
+ }
+
+ img.active {
+ width: 16.89px;
+ height: 16.89px;
+ }
+ }
+
+ .time-bottom {
+ margin-top: 20px;
+ }
+
+ .time-line {
+ position: absolute;
+ top: 35px;
+ width: 100%;
+ width: 595px;
+ border-radius: 0px 0px 0px 0px;
+ border: 1px solid rgba(237, 237, 237, 0.6);
+ z-index: 0;
+ }
+ }
+ }
+}
</style>
--
Gitblit v1.9.3