~admin/srs-police-affairs.git

			@@ -2,7 +2,7 @@
			* @Author: shuishen 1109946754@qq.com
			* @Date: 2023-03-02 09:39:32
			* @LastEditors: shuishen 1109946754@qq.com
			* @LastEditTime: 2023-04-09 03:41:13
			* @LastEditTime: 2023-04-09 15:19:43
			* @FilePath: \srs-police-affairs\src\components\map\components\activityPolicePopup.vue
			* @Description:
			*
			@@ -14,6 +14,7 @@
			<div style="transform: translate(-50%, 0);">
			<!-- 样式自己修改 -->
			<div class="content" :class="{ 'scale-dom': scaleDomFlag }">

			<div class="data-box"
			v-if="activityPolicePopupData.label != 'none' && activityPolicePopupData.billboard == false">
			<div class="line">
			@@ -42,7 +43,8 @@
			</div>
			<div class="line">
			<div class="name">描述：</div>
			<div class="value"> {{ activityPolicePopupData.Data.data.remark }}</div>
			<div class="value"> {{ activityPolicePopupData.Data.data.remark.trim() == '' ? '暂无描述' :
			activityPolicePopupData.Data.data.remark }}</div>
			</div>
			</div>

			@@ -74,14 +76,16 @@
			</div>
			<div class="line">
			<div class="name">描述：</div>
			<div class="value"> {{ activityPolicePopupData.Data.data.remark }}</div>
			<div class="value"> {{ activityPolicePopupData.Data.data.remark.trim() == '' ? '暂无描述' :
			activityPolicePopupData.Data.data.remark }}</div>
			</div>
			</div>

			<div class="data-box" v-if="activityPolicePopupData.billboard == true">
			<div class="line">
			<div class="name">描述：</div>
			<div class="value"> {{ activityPolicePopupData.Data.item.remark }}</div>
			<div class="value"> {{ activityPolicePopupData.Data.item.remark.trim() == '' ? '暂无描述' :
			activityPolicePopupData.Data.item.remark }}</div>
			</div>
			</div>
			</div>

			@@ -548,11 +548,15 @@
			// 鼠标移入图标事件
			pointMouseOver (e) {
			this.$store.commit('SET_ACTIVITYPOLICEPOPUP', true)
			let hoverData = {}
			let hoverData = {
			}

			hoverData.billboard = false

			if (e.overlay.attrParams.item.type == 6 \|\| e.overlay.attrParams.item.type == 7 \|\| e.overlay.attrParams.item.type == 8 \|\| e.overlay.attrParams.item.type == 11) {
			if (
			e.overlay.attrParams.item && e.overlay.attrParams.item.type &&
			(e.overlay.attrParams.item.type == 6 \|\|
			e.overlay.attrParams.item.type == 7 \|\|
			e.overlay.attrParams.item.type == 8 \|\|
			e.overlay.attrParams.item.type == 11)) {
			hoverData.billboard = true
			} else {
			if ('carId' in e.overlay.attrParams.data) {
			@@ -566,6 +570,8 @@
			hoverData.carType = 'none'
			hoverData.label = 'none'
			}

			hoverData.billboard = false
			}

			hoverData.Data = e.overlay.attrParams

			@@ -2,7 +2,7 @@
			* @Author: shuishen 1109946754@qq.com
			* @Date: 2022-09-07 09:37:07
			* @LastEditors: shuishen 1109946754@qq.com
			* @LastEditTime: 2023-04-06 09:48:46
			* @LastEditTime: 2023-04-09 15:06:57
			* @FilePath: \srs-police-affairs\vue.config.js
			* @Description:
			*
			@@ -161,8 +161,8 @@
			proxy: {
			"/api": {
			// target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
			// target: "http://localhost:82",
			target: "http://192.168.0.100:82",
			target: "http://localhost:82",
			// target: "http://192.168.0.100:82",
			// target: "http://17.20.10.3:82",
			// target: "http://10.141.11.11:8081/api",
			// ws: true, //启用webSocket6566

	src/components/map/components/activityPolicePopup.vue	12 ●●●●● patch \| view \| raw \| blame \| history
	src/views/activity/components/publicIndex.vue	14 ●●●●● patch \| view \| raw \| blame \| history
	vue.config.js	6 ●●●●● patch \| view \| raw \| blame \| history