From ee29cf3cb78586a41ada809f90f6483404cc3aa4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 21 May 2021 17:25:06 +0800
Subject: [PATCH] 地图模式问题修复，海康视频问题修复
---
public/realVideo/realtime-view-video.js | 21 ++++++++++++++++++---
src/views/Video/video.vue | 8 +++++++-
public/map/index.html | 6 ++++--
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/public/map/index.html b/public/map/index.html
index 2d2dd89..8228655 100644
--- a/public/map/index.html
+++ b/public/map/index.html
@@ -51,9 +51,11 @@
_framework.onSiderContainerShow();
_framework.resize();
_AppEvent = AppEvent;
- //获取设备id
- window.clientID = locationObj.clientID;
+ if (locationObj != null){
+ //获取设备id
+ window.clientID = locationObj.clientID;
+ }
_AppEvent.addAppEventListener("mapLoad", function(map){
if (locationObj && locationObj != null) {
map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 16);
diff --git a/public/realVideo/realtime-view-video.js b/public/realVideo/realtime-view-video.js
index 3a52acf..0bde041 100644
--- a/public/realVideo/realtime-view-video.js
+++ b/public/realVideo/realtime-view-video.js
@@ -14,14 +14,29 @@
// 获取设备号，序列号
var channelNumber = getQueryStringByKey('channelNumber');
var serialNumber = getQueryStringByKey('serialNumber');
- $.ajax({
+ var manufacturer = getQueryStringByKey('manufacturer');
+ var deviceNumber = getQueryStringByKey('deviceNumber');
+
+ if (manufacturer == "HK"){
+ $.ajax({
+ type: 'GET',
+ dataType: 'JSON',
+ url: "/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?number=" + deviceNumber + "&bmp=" + "m3u8" + "&manufacturer=" + manufacturer,
+ success: function (data) {
+ realStartVideo($('.realtime-view-video-box video')[0], data.data.address)
+ }
+ })
+ }else {
+ $.ajax({
type: 'GET',
dataType: 'JSON',
url: "https://web.byisf.com:18000/GetPlayUrl?deviceCode=" + serialNumber + "&chl=" + channelNumber,
success: function (data) {
- realStartVideo($('.realtime-view-video-box video')[0], data.data.m3u8)
+ realStartVideo($('.realtime-view-video-box video')[0], data.data.m3u8)
}
- })
+ })
+ }
+
diff --git a/src/views/Video/video.vue b/src/views/Video/video.vue
index ac6e389..921ceb3 100644
--- a/src/views/Video/video.vue
+++ b/src/views/Video/video.vue
@@ -20,6 +20,8 @@
reportUrl: "",
channelNumber: null,
serialNumber: null,
+ manufacturers: null,
+ deviceNumber: null,
};
},
methods: {
@@ -28,7 +30,11 @@
"./realVideo/realtime-view-videos.html?channelNumber=" +
this.$route.query.channelNumber +
"&serialNumber=" +
- this.$route.query.serialNumber;
+ this.$route.query.serialNumber +
+ "&manufacturer=" +
+ this.$route.query.manufacturers +
+ "&deviceNumber=" +
+ this.$route.query.deviceNumber;
},
},
};
--
Gitblit v1.9.3