From 81da03d981d0f08a2e8b46d7a2a9874eef02f671 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 14:47:07 +0800
Subject: [PATCH] Merge pull request #743 from zhulangren/patch-1
---
web_src/src/components/map.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/map.vue b/web_src/src/components/map.vue
index d4a36cf..20adff0 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, // 榧犳爣浜嬩欢淇℃伅
@@ -290,11 +298,10 @@
let that = this;
this.$axios({
method: 'get',
- url: '/api/play/start/' + deviceId + '/' + channelId
+ url: './api/play/start/' + deviceId + '/' + channelId
}).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