From d87d4f1aacc30ce4552ceee287c3e712ece7be0a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 02 Mar 2023 10:20:04 +0800
Subject: [PATCH] Merge branch 'ybranch'
---
src/views/activity/index.vue | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 53acd07..366d2eb 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 16:18:17
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-03-01 15:31:43
+ * @LastEditTime: 2023-03-02 10:06:06
* @FilePath: \srs-police-affairs\src\views\activity\index.vue
* @Description: 安保活动
*
@@ -22,11 +22,11 @@
v-model="activityType"
placeholder="请选择"
@change="activityTypeChange"
- >
- <el-option
- v-for="item in activityOptions"
- :key="item.dictKey"
- :label="item.dictValue"
+ >
+ <el-option
+ v-for="item in activityOptions"
+ :key="item.dictKey"
+ :label="item.dictValue"
:value="item.dictKey"
class="activity-option"
></el-option>
@@ -38,12 +38,12 @@
<div class="category">选择时间：</div>
<div class="category-value">
<!-- <el-date-picker
- size="small"
- v-model="selectTime"
- type="date"
- placeholder="选择日期"
- style="width:268px"
- ></el-date-picker>-->
+ size="small"
+ v-model="selectTime"
+ type="date"
+ placeholder="选择日期"
+ style="width:268px"
+ ></el-date-picker>-->
<el-date-picker v-model="selectTime" type="daterange" align="right" unlink-panels
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
@@ -141,10 +141,10 @@
<ul>
<li>
<!-- <el-button
- title="路线绘制"
- @click="draw('billboard', 'policeman')"
- icon="el-icon-my-route"
- ></el-button>-->
+ title="路线绘制"
+ @click="draw('billboard', 'policeman')"
+ icon="el-icon-my-route"
+ ></el-button>-->
<button @click="draw('polyline', 'policecar')" title="巡逻路线">
<img src="../../../public/img/icon/route1.png" style="height:100%" />
</button>
@@ -1113,7 +1113,8 @@
type: 'billboard',
params: positionObj,
incident: this.overlayTypeClick,
- mouseOverIcident: this.pointMouseOver
+ mouseOverIncident: this.pointMouseOver,
+ mouseOutIncident: this.pointMouseOut
})
}
@@ -2483,10 +2484,32 @@
// 鼠标移入图标事件
pointMouseOver (e) {
- console.log(12345)
- console.log(e)
+ this.$store.commit('SET_ACTIVITYPOLICEPOPUP', true)
+
+ var popup = new global.DC.DivForms(global.viewer, {
+ domId: 'ActivityPoliceDomBox',
+ position: [
+ global.DC.Transform.transformWGS84ToCartesian(
+ new global.DC.Position(
+ Number(e.overlay.attrParams.lng),
+ Number(e.overlay.attrParams.lat),
+ 0
+ )
+ )
+ ]
+ })
},
+ /**
+ * @description: 鼠标移出事件
+ * @param {*} e
+ * @return {*}
+ */
+ pointMouseOut (e) {
+ console.log(6666333)
+ this.$store.commit('SET_ACTIVITYPOLICEPOPUP', false)
+ }
+
},
computed: {
--
Gitblit v1.9.3