代码提交
This commit is contained in:
parent
4ed697d5fa
commit
0f5e32ddc6
File diff suppressed because it is too large
Load Diff
|
|
@ -244,7 +244,7 @@ export default {
|
|||
#app {
|
||||
// width: 6144px;
|
||||
// height: 1920px;
|
||||
background: rgba(1, 1, 7, 1);
|
||||
background: rgba(1, 1, 7, 0);
|
||||
// overflow: hidden;
|
||||
.header {
|
||||
height: 11%;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import axios from 'axios'
|
||||
//根据等级获取报警数据
|
||||
export const getHikvision = (data) => {
|
||||
return axios.post('/video/cameras/hikvision/',
|
||||
return axios.post('cameras/hikvision/',
|
||||
data
|
||||
)
|
||||
};
|
||||
|
|
|
|||
|
|
@ -45,9 +45,7 @@ export default {
|
|||
videoUrl: {
|
||||
deep: true,
|
||||
handler(newVal) {
|
||||
this.$nextTick(()=>{
|
||||
this.clickSurveillance(newVal)
|
||||
})
|
||||
}
|
||||
},
|
||||
id: {
|
||||
|
|
@ -60,7 +58,6 @@ export default {
|
|||
methods: {
|
||||
// 点击摄像头
|
||||
clickSurveillance(newVal) {
|
||||
this.player = null
|
||||
let that = this
|
||||
// 注意这里需要加定时器或者在异步请求中才可以
|
||||
setTimeout(() => {
|
||||
|
|
@ -83,7 +80,7 @@ export default {
|
|||
this.player = this;
|
||||
this.player.play();
|
||||
});
|
||||
}, 500);
|
||||
}, 1000);
|
||||
},
|
||||
// 关闭摄像头
|
||||
closeVideo() {
|
||||
|
|
|
|||
|
|
@ -531,14 +531,14 @@ export default {
|
|||
},
|
||||
//获取视频流
|
||||
getCamera() {
|
||||
this.cameraList[0].video =
|
||||
"https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8";
|
||||
this.cameraList[1].video =
|
||||
"https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8";
|
||||
this.cameraList[2].video =
|
||||
"http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8";
|
||||
this.cameraList[3].video =
|
||||
"http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8";
|
||||
// this.cameraList[0].video =
|
||||
// "https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8";
|
||||
// this.cameraList[1].video =
|
||||
// "https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8";
|
||||
// this.cameraList[2].video =
|
||||
// "http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8";
|
||||
// this.cameraList[3].video =
|
||||
// "http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8";
|
||||
let pathUrl = "/artemis/api/video/v2/cameras/previewURLs";
|
||||
let dataList = {
|
||||
path: pathUrl,
|
||||
|
|
@ -548,12 +548,15 @@ export default {
|
|||
},
|
||||
};
|
||||
getHikvision(dataList).then((res) => {
|
||||
this.cameraList[0].video =
|
||||
"video/video.html?src=" +
|
||||
res.data.result.data.url +
|
||||
"&code=" +
|
||||
dataList.data.cameraIndexCode;
|
||||
// this.cameraList[0].video =
|
||||
// "video/video.html?src=" +
|
||||
// res.data.result.data.url +
|
||||
// "&code=" +
|
||||
// dataList.data.cameraIndexCode;
|
||||
this.cameraList[0].video =res.data.result.data.url;
|
||||
console.log(this.cameraList[0].video,'视频地址');
|
||||
});
|
||||
|
||||
let dataList1 = {
|
||||
path: pathUrl,
|
||||
data: {
|
||||
|
|
@ -562,11 +565,12 @@ export default {
|
|||
},
|
||||
};
|
||||
getHikvision(dataList1).then((res) => {
|
||||
this.cameraList[1].video =
|
||||
"video/video.html?src=" +
|
||||
res.data.result.data.url +
|
||||
"&code=" +
|
||||
dataList1.data.cameraIndexCode;
|
||||
// this.cameraList[1].video =
|
||||
// "video/video.html?src=" +
|
||||
// res.data.result.data.url +
|
||||
// "&code=" +
|
||||
// dataList1.data.cameraIndexCode;
|
||||
this.cameraList[1].video =res.data.result.data.url;
|
||||
});
|
||||
let dataList2 = {
|
||||
path: pathUrl,
|
||||
|
|
@ -576,11 +580,12 @@ export default {
|
|||
},
|
||||
};
|
||||
getHikvision(dataList2).then((res) => {
|
||||
this.cameraList[2].video =
|
||||
"video/video.html?src=" +
|
||||
res.data.result.data.url +
|
||||
"&code=" +
|
||||
dataList2.data.cameraIndexCode;
|
||||
// this.cameraList[2].video =
|
||||
// "video/video.html?src=" +
|
||||
// res.data.result.data.url +
|
||||
// "&code=" +
|
||||
// dataList2.data.cameraIndexCode;
|
||||
this.cameraList[2].video =res.data.result.data.url;
|
||||
});
|
||||
let dataList3 = {
|
||||
path: pathUrl,
|
||||
|
|
@ -590,11 +595,12 @@ export default {
|
|||
},
|
||||
};
|
||||
getHikvision(dataList3).then((res) => {
|
||||
this.cameraList[3].video =
|
||||
"video/video.html?src=" +
|
||||
res.data.result.data.url +
|
||||
"&code=" +
|
||||
dataList3.data.cameraIndexCode;
|
||||
// this.cameraList[3].video =
|
||||
// "video/video.html?src=" +
|
||||
// res.data.result.data.url +
|
||||
// "&code=" +
|
||||
// dataList3.data.cameraIndexCode;
|
||||
this.cameraList[3].video =res.data.result.data.url;
|
||||
});
|
||||
},
|
||||
//获取建筑Id
|
||||
|
|
|
|||
|
|
@ -410,6 +410,7 @@ export default {
|
|||
//获取设备离线在线数据
|
||||
|
||||
getAnfang() {
|
||||
//获取门禁状态
|
||||
var indexcode = [
|
||||
"13222435-8646-4006-982a-76febb4dd8a2",
|
||||
"fd91efcf-9d11-4b3e-ad69-6e6c1069f4ec",
|
||||
|
|
@ -448,7 +449,6 @@ export default {
|
|||
};
|
||||
let indexCodeList = [];
|
||||
getHikvision(dataList).then((res) => {
|
||||
console.log("getHikvision", res.data.result.data.list);
|
||||
res.data.result.data.list.forEach((item, index) => {
|
||||
indexCodeList.push(item.indexCode);
|
||||
});
|
||||
|
|
@ -456,6 +456,8 @@ export default {
|
|||
path: "/artemis/api/acs/v1/door/states",
|
||||
data: {
|
||||
doorIndexCodes: indexCodeList,
|
||||
pageNo:1,
|
||||
pageSize:1000
|
||||
},
|
||||
};
|
||||
let doorTotal = 0;
|
||||
|
|
@ -465,22 +467,65 @@ export default {
|
|||
let doorOnLineList = [];
|
||||
let offLineList = [];
|
||||
getHikvision(doorStatusList).then((res) => {
|
||||
console.log(res.data.authDoorList, "门禁状态数量");
|
||||
for (let i = 0; i < res.data.authDoorList.length; i++) {
|
||||
console.log(res.data.result.data.authDoorList, "门禁状态数量");
|
||||
for (let i = 0; i < res.data.result.data.authDoorList.length; i++) {
|
||||
//获取总数的数组
|
||||
doorTotalList.push(res.data.authDoorList);
|
||||
if (res.data.authDoorList[i].doorState == 3) {
|
||||
doorTotalList.push(res.data.result.data.authDoorList);
|
||||
if (res.data.result.data.authDoorList[i].doorState == 3) {
|
||||
//获取离线的数组
|
||||
offLineList.push(res.data.authDoorList[i].doorState);
|
||||
offLineList.push(res.data.result.data.authDoorList[i].doorState);
|
||||
}
|
||||
}
|
||||
//门禁总数数量
|
||||
doorTotal = doorTotalList.length;
|
||||
this.securityList[1].security[1].count = doorTotalList.length;
|
||||
//门禁离线数数量
|
||||
offLine = offLineList.length;
|
||||
this.securityList[1].security[3].count = offLineList.length;
|
||||
//门禁在线数数量
|
||||
doorOnLine = doorTotal - offLine;
|
||||
console.log(doorTotal, offLine, doorOnLine, "门禁数量==========");
|
||||
this.securityList[1].security[2].count = this.securityList[1].security[1].count - this.securityList[1].security[3].count;
|
||||
});
|
||||
});
|
||||
|
||||
//获取视频状态
|
||||
let cameraList = {
|
||||
path: "/artemis/api/resource/v2/camera/search",
|
||||
data: {
|
||||
regionIndexCodes: indexcode,
|
||||
pageNo: 1,
|
||||
pageSize: 1000,
|
||||
},
|
||||
};
|
||||
let cameraCodeList = []
|
||||
getHikvision(cameraList).then((res) => {
|
||||
res.data.result.data.list.forEach((item, index) => {
|
||||
cameraCodeList.push(item.indexCode);
|
||||
});
|
||||
let cameraStatusList = {
|
||||
path: "/artemis/api/nms/v1/online/camera/get",
|
||||
data: {
|
||||
indexCodes: cameraCodeList,
|
||||
pageNo:1,
|
||||
pageSize:1000
|
||||
},
|
||||
};
|
||||
let cameraTotalList = [];
|
||||
let cameraOnLineList = [];
|
||||
let cameraoffLineList = [];
|
||||
getHikvision(cameraStatusList).then((res) => {
|
||||
console.log(res.data.result.data.list, "摄像头状态数量");
|
||||
for (let i = 0; i < res.data.result.data.list.length; i++) {
|
||||
//获取总数的数组
|
||||
cameraTotalList.push(res.data.result.data.list);
|
||||
if (res.data.result.data.list[i].online == 0) {
|
||||
//获取离线的数组
|
||||
cameraoffLineList.push(res.data.result.data.list[i].online);
|
||||
}
|
||||
}
|
||||
//门禁总数数量
|
||||
this.securityList[0].security[1].count = cameraTotalList.length;
|
||||
//门禁离线数数量
|
||||
this.securityList[0].security[3].count = cameraoffLineList.length;
|
||||
//门禁在线数数量
|
||||
this.securityList[0].security[2].count = this.securityList[0].security[1].count - this.securityList[0].security[3].count;
|
||||
});
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ module.exports = {
|
|||
// port: 8989, // 开发服务器运行端口号
|
||||
proxy: {
|
||||
'/api': { //代理的名字
|
||||
target:'http://172.16.1.253:12308/api/',
|
||||
// target:'http://138.227.208.100:12308/api/',
|
||||
// target:'http://172.16.1.253:12308/api/',
|
||||
target:'http://138.227.208.100:12308/api/',
|
||||
ws: true,
|
||||
changeOrigin: true,
|
||||
pathRewrite:{
|
||||
|
|
@ -31,13 +31,13 @@ module.exports = {
|
|||
'^/ecs-server':'',
|
||||
}
|
||||
},
|
||||
'/video': { //代理的名字
|
||||
'/cameras': { //代理的名字
|
||||
// target:'http://172.16.1.253:12308/api/',
|
||||
target:'http://138.227.208.100:12307/',
|
||||
ws: true,
|
||||
changeOrigin: true,
|
||||
pathRewrite:{
|
||||
'^/video':'',
|
||||
'^/cameras':'',
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue