|
@@ -190,23 +190,23 @@ export default {
|
|
};
|
|
};
|
|
const res2 = await getDeviceList(deviceParam2);
|
|
const res2 = await getDeviceList(deviceParam2);
|
|
caremaData = caremaData.concat(res2.data.rows);
|
|
caremaData = caremaData.concat(res2.data.rows);
|
|
- console.log(caremaData);
|
|
|
|
|
|
|
|
- // 批量请求,获取播放地址
|
|
|
|
- const resVideos = await getCameraUrls(caremaData.map(p => p.ssbm));
|
|
|
|
- // console.log(videos)
|
|
|
|
- if (resVideos && resVideos.data && resVideos.data.data) {
|
|
|
|
- // 反向更新地址
|
|
|
|
- caremaData.forEach(p => {
|
|
|
|
- const v = resVideos.data.data.find(k => k.deviceName === p.sbmc);
|
|
|
|
- if (v) {
|
|
|
|
- p.mp4 = v.mp4;
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+ // // 批量请求,获取播放地址
|
|
|
|
+ // const resVideos = await getCameraUrls(caremaData.map(p => p.sbbm));
|
|
|
|
+ // // console.log(videos)
|
|
|
|
+ // if (resVideos && resVideos.data && resVideos.data.data) {
|
|
|
|
+ // // 反向更新地址
|
|
|
|
+ // caremaData.forEach(p => {
|
|
|
|
+ // const v = resVideos.data.data.find(k => k.deviceName === p.sbmc);
|
|
|
|
+ // if (v) {
|
|
|
|
+ // p.mp4 = v.mp4;
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // }
|
|
|
|
|
|
- // 只显示有视频地址的摄像头
|
|
|
|
- caremaData = caremaData.filter(p => p.mp4);
|
|
|
|
|
|
+ // // 只显示有视频地址的摄像头
|
|
|
|
+ // caremaData = caremaData.filter(p => p.mp4);
|
|
|
|
+ console.log(caremaData);
|
|
|
|
|
|
if (caremaData && caremaData.length > 0) {
|
|
if (caremaData && caremaData.length > 0) {
|
|
let randoms = [];
|
|
let randoms = [];
|
|
@@ -240,7 +240,7 @@ export default {
|
|
);
|
|
);
|
|
this.caremaData = showCaremarData;
|
|
this.caremaData = showCaremarData;
|
|
this.caremaList = caremaData;
|
|
this.caremaList = caremaData;
|
|
- console.log(this.caremaData);
|
|
|
|
|
|
+ // console.log(this.caremaData);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
loadIotMapData() {
|
|
loadIotMapData() {
|