From 0984290ca2a75cf0316c3ca312bf8026b4edcf3e Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:38 +0800
Subject: [PATCH] 继续优化docker配置： 1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段，方便配置JVM参数 2.修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
---
web_src/src/components/dialog/devicePlayer.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 020cc22..5d23f35 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -48,7 +48,10 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button-group>
+ <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button icon="el-icon-download" size="mini" @click="downloadRecord(scope.row)">涓嬭浇</el-button>
+ </el-button-group>
</template>
</el-table-column>
</el-table>
@@ -282,7 +285,21 @@
let baseZlmApi = process.env.NODE_ENV === 'development'?`${location.host}/debug/zlm`:`${location.host}/zlm`
// return `${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
// return `http://${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
- return streamInfo.ws_flv;
+ if (location.protocol === "https:") {
+ if (streamInfo.wss_flv === null) {
+ this.$message({
+ showClose: true,
+ message: '濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛',
+ type: 'error'
+ });
+ }else {
+ return streamInfo.wss_flv;
+ }
+
+ }else {
+ return streamInfo.ws_flv;
+ }
+
},
coverPlay: function () {
var that = this;
@@ -444,6 +461,38 @@
if (callback) callback()
});
},
+ downloadRecord: function (row) {
+ let that = this;
+ if (that.streamId != "") {
+ that.stopDownloadRecord(function () {
+ that.streamId = "",
+ that.downloadRecord(row);
+ })
+ } else {
+ this.$axios({
+ method: 'get',
+ url: '/api/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ row.endTime + '&downloadSpeed=4'
+ }).then(function (res) {
+ var streamInfo = res.data;
+ that.app = streamInfo.app;
+ that.streamId = streamInfo.streamId;
+ that.mediaServerId = streamInfo.mediaServerId;
+ that.videoUrl = that.getUrlByStreamInfo(streamInfo);
+ that.recordPlay = true;
+ });
+ }
+ },
+ stopDownloadRecord: function (callback) {
+ this.$refs.videoPlayer.pause();
+ this.videoUrl = '';
+ this.$axios({
+ method: 'get',
+ url: '/api/download/stop/' + this.deviceId + "/" + this.channelId
+ }).then(function (res) {
+ if (callback) callback()
+ });
+ },
ptzCamera: function (leftRight, upDown, zoom) {
console.log('浜戝彴鎺у埗锛�' + leftRight + ' : ' + upDown + " : " + zoom);
let that = this;
--
Gitblit v1.8.0