From cb897aaeed0f3a24f91dc4265b8ff0d2b31284c6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期日, 23 四月 2023 17:35:00 +0800 Subject: [PATCH] Merge pull request #829 from kairlec/wvp-28181-2.0 --- web_src/src/components/map.vue | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web_src/src/components/map.vue b/web_src/src/components/map.vue index d4a36cf..2aa17f6 100644 --- a/web_src/src/components/map.vue +++ b/web_src/src/components/map.vue @@ -186,6 +186,14 @@ this.deviceService.getAllSubChannel(false, data.deviceId, data.channelId, this.channelsHandler) } } + }, + { + label: "鏌ヨ杞ㄨ抗", + icon: "el-icon-map-location", + disabled: false, + onClick: () => { + this.getTrace(data) + } } ], event, // 榧犳爣浜嬩欢淇℃伅 @@ -294,7 +302,6 @@ }).then(function (res) { that.isLoging = false; if (res.data.code === 0) { - that.$refs.devicePlayer.openDialog("media", deviceId, channelId, { streamInfo: res.data.data, hasAudio: channel.hasAudio @@ -320,8 +327,8 @@ } else { let positions = []; for (let i = 0; i < channelPositions.length; i++) { - if (channelPositions[i].cnLng * channelPositions[i].cnLat > 0) { - positions.push([channelPositions[i].cnLng, channelPositions[i].cnLat]) + if (channelPositions[i][this.longitudeStr] * channelPositions[i][this.latitudeStr] > 0) { + positions.push([channelPositions[i][this.longitudeStr], channelPositions[i][this.latitudeStr]]) } } -- Gitblit v1.8.0