视频联动

main
zhangqun 2 years ago
parent 2659ff5255
commit ccdfb631d3
  1. 20
      src/api/wirelessintrusion/wirelessintrusion.js
  2. 9
      src/views/alarmcenter/index.vue
  3. 17
      src/views/alarmcenter/sosAlarm/list.vue
  4. 11
      src/views/components/video/video.vue
  5. 19
      src/views/wirelessintrusion/warn/record.vue
  6. 4
      vue.config.js

@ -179,6 +179,18 @@ export const coordinateToWGS84 = (params) => {
params: params
})
}
//查询摄像头设备
export const getDeviceCamera = (params) => {
return request({
url: baseUrl + '/api/safeCare/callBack/getDeviceCamera',
method: 'get',
headers: {
Authorization: token
},
params: params,
authorization: false
})
}
///海康报警视频/////////////////////////////////////////////////////////////////////////////////////////////
//实时报警摄像头
export const queryLivePreview = (params) => {
@ -195,12 +207,4 @@ export const queryLiveBack = (params) => {
method: 'get',
params: params
})
}
//查询摄像头设备
export const getDeviceCamera = (params) => {
return request({
url: '/api/safeCare/callBack/getDeviceCamera',
method: 'get',
params: params
})
}

@ -21,7 +21,7 @@
<div class="video_box">
<el-row :gutter="20">
<el-col :span="6" v-for="item in videoData" :key="item.id">
<VideoPlayer :name="item.name" :id="item.id" :code="item.cameraIndexCode"
<VideoPlayer :name="item.name" :id="item.id" :code="renderCode(item.tags)"
:url="'https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv'"
:playbackUrl="'https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv'" />
</el-col>
@ -210,7 +210,8 @@ export default {
const { releaseTimeRange } = this.query;
let values = {
...params,
...this.query
...this.query,
alarmType: 1
};
if (releaseTimeRange) {
values = {
@ -268,6 +269,10 @@ export default {
});
}
},
renderCode(tags) {
let obj = JSON.parse(tags);
return obj.cameraIndexCode != 'undefined' ? obj.cameraIndexCode : '';
},
//
handleExport() {
let values = {

@ -21,7 +21,7 @@
<div class="video_box">
<el-row :gutter="20">
<el-col :span="6" v-for="item in videoData" :key="item.id">
<VideoPlayer :name="item.name" :id="item.id" :code="item.cameraIndexCode"
<VideoPlayer :name="item.name" :id="item.id" :code="item.sn"
:url="'https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv'"
:playbackUrl="'https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv'" />
</el-col>
@ -33,7 +33,7 @@
<script>
import { getList } from "@/api/alarm/alarm";
import { bizLogin, bizDeviceList } from "@/api/wirelessintrusion/wirelessintrusion";
import { bizLogin, bizDeviceList, getDeviceCamera } from "@/api/wirelessintrusion/wirelessintrusion";
import { exportBlob } from "@/api/common";
import { downloadXls } from "@/util/util";
import { dateNow } from "@/util/date";
@ -210,13 +210,14 @@ export default {
const { releaseTimeRange } = this.query;
let values = {
...params,
...this.query
...this.query,
alarmType: 2
};
if (releaseTimeRange) {
values = {
...values,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
endTime: releaseTimeRange[1]
};
values.releaseTimeRange = null;
}
@ -238,9 +239,9 @@ export default {
if (token == 'undefined' || !token) {
bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
window.sessionStorage.setItem('bizToken', res.data.data.token);
bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => {
getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => {
const data = res2.data;
this.videoData = data.rows;
this.videoData = data;
if(this.videoData.length === 0){
this.$message.warning('未查询到该报警点摄像头');
}
@ -250,14 +251,14 @@ export default {
});
})
} else {
bizDeviceList(token, { 'params[pmac]': row.deviceId }).then(res2 => {
getDeviceCamera(token, { sn: row.hostSerialNumber }).then(res2 => {
if (res2.data.code == 401) {
window.sessionStorage.removeItem('bizToken');
this.linkVideo(row);
}
else if (res2.data.code == 200) {
const data = res2.data;
this.videoData = data.rows;
this.videoData = data;
if(this.videoData.length === 0){
this.$message.warning('未查询到该报警点摄像头');
}

@ -74,9 +74,12 @@ export default {
},
//
queryLive() {
console.log('视频流查询', this.code)
if(this.code) {
queryLivePreview({cameraIndexCode: this.code}).then(res => {
this.createPlayer(res.data.url);
if(res.data.code === 0 || res.data.code == 200) {
this.createPlayer(res.data.url);
}
})
}
},
@ -131,8 +134,10 @@ export default {
playbackStart() {
// this.createPlayer(this.playbackUrl);
if(this.code) {
queryLivePreview({cameraIndexCode: this.code, beginTime: this.dateRange[0], endTime: this.dateRange[1]}).then(res => {
this.createPlayer(res.data.url);
queryLiveBack({cameraIndexCode: this.code, beginTime: this.dateRange[0], endTime: this.dateRange[1]}).then(res => {
if(res.data.code === 0 || res.data.code == 200) {
this.createPlayer(res.data.url);
}
})
}
},

@ -29,7 +29,7 @@
<div class="video_box">
<el-row :gutter="20">
<el-col :span="6" v-for="item in videoData" :key="item.id">
<VideoPlayer :name="item.name" :id="item.id" :code="item.sn"
<VideoPlayer :name="item.name" :id="item.id" :code="renderCode(item.tags)"
:url="'https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv'"
:playbackUrl="'https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv'" />
</el-col>
@ -299,13 +299,14 @@ export default {
const { releaseTimeRange } = this.query;
let values = {
...params,
...this.query
...this.query,
alarmType: 1
};
if (releaseTimeRange) {
values = {
...values,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
endTime: releaseTimeRange[1]
};
values.releaseTimeRange = null;
}
@ -327,9 +328,9 @@ export default {
if (token == 'undefined' || !token) {
bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
window.sessionStorage.setItem('bizToken', res.data.data.token);
getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => {
bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => {
const data = res2.data;
this.videoData = data;
this.videoData = data.rows;
if (this.videoData.length === 0) {
this.$message.warning('未查询到该报警点摄像头');
}
@ -339,14 +340,14 @@ export default {
});
})
} else {
getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => {
bizDeviceList(token, { 'params[pmac]': row.deviceId }).then(res2 => {
if (res2.data.code == 401) {
window.sessionStorage.removeItem('bizToken');
this.linkVideo(row);
}
else if (res2.data.code == 200) {
const data = res2.data;
this.videoData = data;
this.videoData = data.rows;
if (this.videoData.length === 0) {
this.$message.warning('未查询到该报警点摄像头');
}
@ -357,6 +358,10 @@ export default {
});
}
},
renderCode(tags) {
let obj = JSON.parse(tags);
return obj.cameraIndexCode != 'undefined' ? obj.cameraIndexCode : '';
},
//
handleExport() {
let values = {

@ -39,8 +39,8 @@ module.exports = {
proxy: {
"/api": {
//本地服务接口地址
// target: 'http://192.168.1.34:81',
target: 'http://192.168.3.32:81',
target: 'http://192.168.1.34:81',//测试环境
// target: 'http://192.168.3.32:81',//李涛-wifi
// target: 'http://192.168.1.102:81',
ws: true,
pathRewrite: {

Loading…
Cancel
Save