From 7c2162f9d27047fc92939b3b8f2c601e5479c3be Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 07 Apr 2021 17:36:55 +0800
Subject: [PATCH] 视频录制相关修改
---
src/views/realTimePolice/real.vue | 27 ++++++++++++++++-----------
src/page/index/logo.vue | 28 +++++++++++++---------------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index af4bfe4..e7b5548 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -403,11 +403,9 @@
.then((result) => {
axios({
method: "post",
- url: `/api/blade-jfpts/rvideo/rVoid`,
- timeout: 600000,
+ url: `/api/blade-jfpts/rvideo/rVoids`,
params: {
- sourcePath: result.data.data.flv,
- jid: that.form.id,
+ url: result.data.data.flv,
},
}).then((resdata) => {});
});
@@ -444,7 +442,6 @@
this.videoConversationReal = false;
this.oldVideoSatart = false;
},
-
getDate() {
// 当前时间
var timestamp = Date.parse(new Date());
@@ -574,6 +571,14 @@
)
.then(function () {
that.dialogTableVisible = false;
+
+ axios({
+ method: "post",
+ url: `/api/blade-jfpts/rvideo/stop`,
+ params: {
+ jid: row.id,
+ },
+ }).then((resdata) => {});
that.$router.push({
path: "/policeTracking/track",
@@ -802,7 +807,6 @@
//启动websocket
websocketStart() {
-
var that = this;
if (!window.WebSocket) {
@@ -819,14 +823,11 @@
window.socket.onopen = function (event) {};
- window.socket.onclose = function (event) {
-
- };
+ window.socket.onclose = function (event) {};
window.socket.error = function (event) {
//执行重连
that.websocketStart();
};
-
} else {
console.log("WebSocket连接没有建立成功！！");
}
@@ -846,18 +847,15 @@
//开启心跳传送
window.websockPing = setInterval(function () {
-
if (window.socket.readyState == WebSocket.OPEN) {
window.socket.send("ping");
- }else{
- console.log("心跳停止，断开重连")
+ } else {
+ console.log("心跳停止，断开重连");
//断开连接，重连
window.clearTimeout(window.websockPing);
//执行重连
that.websocketStart();
}
-
-
}, 10000);
} else {
console.log("WebSocket连接没有建立成功！！");
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index cd9b25d..13fcc15 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-03-17 15:21:33
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-03-29 14:12:05
+ * @Last Modified time: 2021-04-07 17:36:33
*/
<template>
<basic-container>
@@ -435,13 +435,13 @@
labelWidth: "100",
size: "mini",
border: false,
- stripe:true,
+ stripe: true,
menuWidth: 240,
dialogWidth: 950,
tip: false,
searchShow: true,
searchMenuSpan: 3,
- align:"center",
+ align: "center",
index: true,
viewBtn: true,
selection: true,
@@ -506,7 +506,7 @@
{
label: "报警人",
prop: "galarmPeople",
- width: 90
+ width: 90,
},
{
label: "报警人电话",
@@ -616,7 +616,7 @@
{
label: "接警人",
prop: "alarmPeople",
- width: 90
+ width: 90,
},
{
label: "接警时间",
@@ -906,8 +906,6 @@
return a.jtype - b.jtype;
});
-
-
this.data = data.records;
this.loading = false;
@@ -1138,6 +1136,15 @@
)
.then(function () {
that.dialogTableVisible = false;
+
+ axios({
+ method: "post",
+ url: `/api/blade-jfpts/rvideo/stop`,
+ params: {
+ jid: row.id,
+ },
+ }).then((resdata) => {});
+
that.onLoad(that.page, that.query);
that.$router.push({
path: "/policeTracking/track",
@@ -1250,8 +1257,7 @@
});
that.hls.on(Hls.Events.ERROR, function (event, data) {
-
- console.log(data, 4566824159, "视频播放有问题！！！")
+ console.log(data, 4566824159, "视频播放有问题！！！");
if (data.fatal) {
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:
@@ -1503,8 +1509,7 @@
border-color: rgb(64, 158, 255);
}
-.tabFontSize{
+.tabFontSize {
font-size: 15px;
}
-
</style>
--
Gitblit v1.9.3