From 62e82ea9ee6a73cf7cdcfe1ab1a7b49a23f571e3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 十月 2021 17:58:28 +0800
Subject: [PATCH] 录像下载修复
---
web_src/src/components/dialog/StreamProxyEdit.vue | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index afc03cc..ea3a64f 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -36,11 +36,39 @@
<el-form-item label="鎷夋祦鍦板潃" prop="src_url" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.src_url" clearable></el-input>
</el-form-item>
- <el-form-item label="瓒呮椂鏃堕棿" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'">
+ <el-form-item label="瓒呮椂鏃堕棿:姣" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.timeout_ms" clearable></el-input>
</el-form-item>
+ <el-form-item label="鑺傜偣閫夋嫨" prop="rtp_type">
+ <el-select
+ v-model="proxyParam.mediaServerId"
+ @change="mediaServerIdChange"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鎷夋祦鑺傜偣"
+ >
+ <el-option label="鑷姩閫夋嫨" value="auto"></el-option>
+ <el-option
+ v-for="item in mediaServerList"
+ :key="item.id"
+ :label="item.id"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="FFmpeg鍛戒护妯℃澘" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'">
- <el-input v-model="proxyParam.ffmpeg_cmd_key" clearable></el-input>
+<!-- <el-input v-model="proxyParam.ffmpeg_cmd_key" clearable></el-input>-->
+ <el-select
+ v-model="proxyParam.ffmpeg_cmd_key"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨FFmpeg鍛戒护妯℃澘"
+ >
+ <el-option
+ v-for="item in Object.keys(ffmpegCmdList)"
+ :key="item"
+ :label="ffmpegCmdList[item]"
+ :value="item">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鍥芥爣缂栫爜" prop="gbId">
<el-input v-model="proxyParam.gbId" placeholder="璁剧疆鍥芥爣缂栫爜鍙帹閫佸埌鍥芥爣" clearable></el-input>
@@ -56,6 +84,7 @@
<el-option label="缁勬挱" value="2"></el-option>
</el-select>
</el-form-item>
+
<el-form-item label="鍥芥爣骞冲彴">
<el-select
v-model="proxyParam.platformGbId"
@@ -94,6 +123,8 @@
</template>
<script>
+import MediaServer from './../service/MediaServer'
+
export default {
name: "streamProxyEdit",
props: {},
@@ -122,27 +153,8 @@
isLoging: false,
dialogLoading: false,
onSubmit_text: "绔嬪嵆鍒涘缓",
- platformList: [{
- id: 1,
- enable: true,
- name: "141",
- serverGBId: "34020000002000000001",
- serverGBDomain: "3402000000",
- serverIP: "192.168.1.141",
- serverPort: 15060,
- deviceGBId: "34020000002000000001",
- deviceIp: "192.168.1.20",
- devicePort: "5060",
- username: "34020000002000000001",
- password: "12345678",
- expires: "300",
- keepTimeout: "60",
- transport: "UDP",
- characterSet: "GB2312",
- ptz: false,
- rtcp: false,
- status: true,
- }],
+ platformList: [],
+ mediaServer: new MediaServer(),
proxyParam: {
name: null,
type: "default",
@@ -158,7 +170,10 @@
enable_hls: true,
enable_mp4: false,
platformGbId: null,
+ mediaServerId: "auto",
},
+ mediaServerList:{},
+ ffmpegCmdList:{},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ悕绉�", trigger: "blur" }],
@@ -180,7 +195,6 @@
}
let that = this;
-
this.$axios({
method: 'get',
url:`/api/platform/query/10000/0`
@@ -189,9 +203,28 @@
}).catch(function (error) {
console.log(error);
});
+ this.mediaServer.getOnlineMediaServerList((data)=>{
+ this.mediaServerList = data;
+ })
+ },
+ mediaServerIdChange:function (){
+ let that = this;
+ if (that.proxyParam.mediaServerId !== "auto"){
+ that.$axios({
+ method: 'get',
+ url:`/api/proxy/ffmpeg_cmd/list`,
+ params: {
+ mediaServerId: that.proxyParam.mediaServerId
+ }
+ }).then(function (res) {
+ that.ffmpegCmdList = res.data.data;
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }
+
},
onSubmit: function () {
- console.log("onSubmit");
this.dialogLoading = true;
var that = this;
that.$axios({
@@ -218,7 +251,6 @@
});
},
close: function () {
- console.log("鍏抽棴娣诲姞瑙嗛骞冲彴");
this.showDialog = false;
this.dialogLoading = false;
this.$refs.streamProxy.resetFields();
--
Gitblit v1.8.0