From 22a23b05b25e4b5c616f65989ac0ca16324f4c29 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:23:41 +0800
Subject: [PATCH] Merge branch 'dev' into test
---
src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue b/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
index d50555a..07a823c 100644
--- a/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
+++ b/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
@@ -1,6 +1,7 @@
<template>
<div class="event-overviewdetail-right" :class="{ isMore }">
- <CommonTitle title="事件概况" :style="{ width: isMore ? pxToRem(820) : pxToRem(404) }" />
+ <UserOperate/>
+ <CommonTitle title="事件概况详情" :style="{ width: isMore ? pxToRem(820) : pxToRem(404) }" />
<div class="content">
<img
@@ -12,6 +13,7 @@
/>
<el-date-picker
+ popper-class="custom-date-picker"
class="ztzf-date-picker"
v-model="timeArr"
type="daterange"
@@ -23,6 +25,7 @@
/>
<el-select
+ :teleported="false"
class="ztzf-select"
:style="{ width: pxToRem(174) }"
v-model="params.device_sn"
@@ -35,6 +38,7 @@
</el-select>
<el-select
+ :teleported="false"
class="ztzf-select"
:style="{ width: pxToRem(174) }"
v-model="params.word_order_type"
@@ -137,6 +141,7 @@
import leftArrowImg from '@/assets/images/home/eventOverviewDetail/leftArrow.png'
import rightArrowImg from '@/assets/images/home/eventOverviewDetail/rightArrow.png'
+import UserOperate from '@/components/UserOperate.vue';
import dayjs from 'dayjs'
import { selectDevicePage } from '@/api/home/machineNest'
import { getMultipleDictionary } from '@/api/system/dictbiz'
@@ -209,7 +214,7 @@
const positioning = row => {
const longitude = Number(row.longitude)
const latitude = Number(row.latitude)
- flyTo({ longitude: longitude, latitude: latitude + 0.0002 }, 1, 1000)
+ flyTo({ longitude: longitude, latitude: latitude + 0.0008 }, 1, 1000)
}
// 事件状态+数量
--
Gitblit v1.9.3