From e4918d29f39c3da1a3c036221c57ce97834cfff4 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 21 一月 2021 20:58:11 +0800
Subject: [PATCH] 添加浏览器ID，确保SSE可同时推送到不同的前端
---
web_src/src/components/gb28181/devicePlayer.vue | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index ed8464a..2341831 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -1,6 +1,6 @@
<template>
<div id="devicePlayer" v-loading="isLoging">
-
+
<el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
<!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
<player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></player>
@@ -64,9 +64,13 @@
<div class="control-round">
<div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
</div>
- <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in" style="font-size: 1.875rem;"></i></div>
- <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out"></i></div>
+ <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.875rem;"></i></div>
+ <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
+ <div class="contro-speed" style="position: absolute; left: 4px; top: 7rem; width: 9rem;">
+ <el-slider v-model="controSpeed" :max="255"></el-slider>
+ </div>
</div>
+
<div class="control-panel">
<el-button-group>
<el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">棰勭疆浣嶇紪鍙�</el-tag>
@@ -121,7 +125,7 @@
<p>閲囨牱鐜�: {{item.sample_rate}}</p>
</div>
</div>
-
+
</div>
</el-tab-pane>
@@ -167,6 +171,7 @@
loadingRecords: false,
recordsLoading: false,
isLoging: false,
+ controSpeed: 30,
timeVal: 0,
timeMin: 0,
timeMax: 1440,
@@ -178,7 +183,8 @@
scanGroup: 0,
tracks: [],
coverPlaying:false,
- tracksLoading: false
+ tracksLoading: false,
+ recordPlay: ""
};
},
methods: {
@@ -232,7 +238,7 @@
console.log(val)
},
play: function (streamInfo, hasAudio) {
-
+
this.hasaudio = hasAudio;
this.isLoging = false;
this.videoUrl = streamInfo.ws_flv;
@@ -313,8 +319,12 @@
this.convertStop();
}
this.convertKey = ''
+ if (this.recordPlay != '') {
+ this.stopPlayRecord();
+ }
+ this.recordPlay = ''
},
-
+
copySharedInfo: function (data) {
console.log('澶嶅埗鍐呭锛�' + data);
this.coverPlaying = false;
@@ -379,6 +389,7 @@
var streamInfo = res.data;
that.streamId = streamInfo.streamId;
that.videoUrl = streamInfo.ws_flv;
+ that.recordPlay = true;
});
}
},
@@ -399,7 +410,7 @@
method: 'post',
// url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
// '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
- url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=30&verticalSpeed=30&zoomSpeed=' + (2 * 16)
+ url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
//////////////////////鎾斁鍣ㄤ簨浠跺鐞�//////////////////////////
@@ -490,7 +501,7 @@
max-width: 6.25rem;
max-height: 6.25rem;
border-radius: 100%;
- margin-top: 2.5rem;
+ margin-top: 1.5rem;
margin-left: 0.5rem;
float: left;
}
@@ -514,6 +525,9 @@
box-sizing: border-box;
transition: all 0.3s linear;
}
+.control-btn:hover {
+ cursor:pointer
+}
.control-btn i {
font-size: 20px;
@@ -522,6 +536,12 @@
justify-content: center;
align-items: center;
}
+.control-btn i:hover {
+ cursor:pointer
+}
+.control-zoom-btn:hover {
+ cursor:pointer
+}
.control-round {
position: absolute;
--
Gitblit v1.8.0