From 7710f8b0179d496d437647e679888146d0befda2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 30 Jan 2021 14:57:57 +0800
Subject: [PATCH] 冲突文件完善修改
---
src/views/realTimePolice/real.vue | 214 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 154 insertions(+), 60 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index fcdff40..59e2ede 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -756,66 +756,6 @@
this.form = row;
this.dialogTableVisible = true;
},
- beginTimeOrEndTime(time) {
- var beginTime = new Date(time);
-
- var endTime = new Date(new Date(time).valueOf() - 1000 * 30);
-
- var beginY = beginTime.getFullYear();
-
- var beginM =
- beginTime.getMonth() + 1 < 10
- ? "0" + (beginTime.getMonth() + 1)
- : beginTime.getMonth() + 1;
-
- var beginD =
- beginTime.getDate() < 10
- ? "0" + beginTime.getDate()
- : beginTime.getDate();
-
- var beginH =
- beginTime.getHours() < 10
- ? "0" + beginTime.getHours()
- : beginTime.getHours();
-
- var beginm =
- beginTime.getMinutes() < 10
- ? "0" + beginTime.getMinutes()
- : beginTime.getMinutes();
-
- var begins =
- beginTime.getSeconds() < 10
- ? "0" + beginTime.getSeconds()
- : beginTime.getSeconds();
-
- var endY = endTime.getFullYear();
-
- var endM =
- endTime.getMonth() + 1 < 10
- ? "0" + (endTime.getMonth() + 1)
- : endTime.getMonth() + 1;
-
- var endD =
- endTime.getDate() < 10 ? "0" + endTime.getDate() : endTime.getDate();
-
- var endH =
- endTime.getHours() < 10 ? "0" + endTime.getHours() : endTime.getHours();
-
- var endm =
- endTime.getMinutes() < 10
- ? "0" + endTime.getMinutes()
- : endTime.getMinutes();
-
- var ends =
- endTime.getSeconds() < 10
- ? "0" + endTime.getSeconds()
- : endTime.getSeconds();
-
- return {
- begin: beginY + beginM + beginD + beginH + beginm + begins,
- end: endY + endM + endD + endH + endm + ends
- };
- },
handleStart(row) {
this.$router.push({
path: `/real/video/${row.channelNumber}/${row.serialNumber}`
@@ -905,6 +845,160 @@
}).then(function() {
that.onLoad(that.page, that.query);
});
+ },
+
+ beginTimeOrEndTime(time) {
+ var beginTime = new Date(time);
+
+ var endTime = new Date(new Date(time).valueOf() - 1000 * 30);
+
+ var beginY = beginTime.getFullYear();
+
+ var beginM =
+ beginTime.getMonth() + 1 < 10
+ ? "0" + (beginTime.getMonth() + 1)
+ : beginTime.getMonth() + 1;
+
+ var beginD =
+ beginTime.getDate() < 10
+ ? "0" + beginTime.getDate()
+ : beginTime.getDate();
+
+ var beginH =
+ beginTime.getHours() < 10
+ ? "0" + beginTime.getHours()
+ : beginTime.getHours();
+
+ var beginm =
+ beginTime.getMinutes() < 10
+ ? "0" + beginTime.getMinutes()
+ : beginTime.getMinutes();
+
+ var begins =
+ beginTime.getSeconds() < 10
+ ? "0" + beginTime.getSeconds()
+ : beginTime.getSeconds();
+
+ var endY = endTime.getFullYear();
+
+ var endM =
+ endTime.getMonth() + 1 < 10
+ ? "0" + (endTime.getMonth() + 1)
+ : endTime.getMonth() + 1;
+
+ var endD =
+ endTime.getDate() < 10 ? "0" + endTime.getDate() : endTime.getDate();
+
+ var endH =
+ endTime.getHours() < 10 ? "0" + endTime.getHours() : endTime.getHours();
+
+ var endm =
+ endTime.getMinutes() < 10
+ ? "0" + endTime.getMinutes()
+ : endTime.getMinutes();
+
+ var ends =
+ endTime.getSeconds() < 10
+ ? "0" + endTime.getSeconds()
+ : endTime.getSeconds();
+
+ return {
+ begin: beginY + beginM + beginD + beginH + beginm + begins,
+ end: endY + endM + endD + endH + endm + ends
+ };
+ },
+ queryOldVideo(data) {
+ console.log(data);
+ var newAxios = axios.create({
+ baseURL: "http://s16s652780.51mypc.cn",
+ withCredentials: false,
+ headers: {
+ "Content-type": "application/x-www-form-urlencoded"
+ }
+ });
+
+ //s16s652780.51mypc.cn/api_control
+
+ var time = this.beginTimeOrEndTime(data.alarmTime);
+
+ newAxios
+ .post(
+ "/api_control",
+ {},
+ {
+ params: {
+ param: JSON.stringify({ PktType: "GetAccessToken" })
+ }
+ }
+ )
+ .then(res => {
+ console.log(res.data.data.accessToken);
+
+ newAxios
+ .get(
+ `/GetPlayUrl?deviceCode=${data.channelNumber}&chl=${data.serialNumber}`
+ )
+ .then(result => {
+
+ this.innerVisibleVideo = true;
+
+ this.videoSource = result.data.data.m3u8;
+
+ });
+
+ // newAxios
+ // .post(
+ // "/api_control",
+ // {},
+ // {
+ // params: {
+ // param: JSON.stringify({
+ // PktType: "RemotePlayback",
+ // accessToken: res.data.data.accessToken,
+ // deviceCode: data.channelNumber,
+ // startTime: time.end,
+ // endTime: time.begin,
+ // chl: data.serialNumber
+ // })
+ // }
+ // }
+ // )
+ // .then(result => {
+
+ // this.videoSource = result.data.data.m3u8
+
+ // this.innerVisibleVideo = true
+
+ // });
+ });
+ },
+ openOldVideoBox() {
+ if (Hls.isSupported()) {
+ var dom = document.getElementById("old_video");
+
+ // if (dom.volume) dom.volume = 1.0;
+
+ this.hls = new Hls();
+
+ var m3u8Url = decodeURIComponent(this.videoSource);
+
+ this.hls.loadSource(m3u8Url);
+
+ this.hls.attachMedia(dom);
+
+ this.hls.on(Hls.Events.MANIFEST_PARSED, function() {
+ dom.play();
+ });
+ }
+ },
+ closeOldVideoBox() {
+ var dom = document.getElementById("old_video");
+
+ if (dom.getAttribute("src") != "") {
+ dom.pause();
+
+ dom.setAttribute("");
+ }
}
}
};
--
Gitblit v1.9.3