diff --git a/src/views/alarmcenter/index.vue b/src/views/alarmcenter/index.vue
index 3df5f92..61c95d6 100644
--- a/src/views/alarmcenter/index.vue
+++ b/src/views/alarmcenter/index.vue
@@ -20,11 +20,12 @@
@@ -42,10 +43,12 @@ import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import func from "@/util/func";
import VideoPlayer from "../components/video/video"
+import player from "../components/h5Player/player"
export default {
components: {
- VideoPlayer
+ VideoPlayer,
+ player
},
data() {
return {
diff --git a/src/views/alarmcenter/sosAlarm/list.vue b/src/views/alarmcenter/sosAlarm/list.vue
index 831e961..3679237 100644
--- a/src/views/alarmcenter/sosAlarm/list.vue
+++ b/src/views/alarmcenter/sosAlarm/list.vue
@@ -20,17 +20,18 @@
@@ -256,18 +257,16 @@ export default {
linkVideo(row) {
let token = window.sessionStorage.getItem('bizToken');
if (token == 'undefined' || !token) {
- console.log('ceshi1')
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 => {
const data = res2.data;
this.videoData = data.data;
-
- console.log('videoData ===>',this.videoData)
if(this.videoData.length === 0){
this.$message.warning('未查询到该报警点摄像头');
}
else{
+ let arr = []
this.videoData.map(item =>{
arr.push(item.name)
})
diff --git a/src/views/components/h5Player/player.vue b/src/views/components/h5Player/player.vue
index fcbda66..12b6daf 100644
--- a/src/views/components/h5Player/player.vue
+++ b/src/views/components/h5Player/player.vue
@@ -1,168 +1,374 @@
-
+
+
+
+
+ {{
+ this.playUrlList.length > 0 && this.player
+ ? this.playUrlList[this.player.currentWindowIndex].code
+ : "--"
+ }}
+
+
+
+ 1x1
+ 2x2
+ 3x3
+ 4x4
+
+
+
+ 开始预览
+ 停止预览
+ 停止全部窗口
+
+
+
+
+
+
+
+
+ 开始回放
+ 暂停
+ 恢复
+ 停止回放
+
+
+ 抓取JPEG
+ 抓取BMP
+
+
+
-
\ No newline at end of file
+
diff --git a/src/views/components/h5Player/player1.vue b/src/views/components/h5Player/player1.vue
new file mode 100644
index 0000000..fcbda66
--- /dev/null
+++ b/src/views/components/h5Player/player1.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue
index ade93c3..9c47044 100644
--- a/src/views/wirelessintrusion/warn/record.vue
+++ b/src/views/wirelessintrusion/warn/record.vue
@@ -31,11 +31,12 @@
@@ -67,10 +68,12 @@ import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import func from "@/util/func";
import VideoPlayer from "../../components/video/video"
+import player from "../../components/h5Player/player"
export default {
components: {
- VideoPlayer
+ VideoPlayer,
+ player
},
data() {
return {