From 41616f726dafafe7c015bf4f3e02a7aa9488a3a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 三月 2022 10:47:06 +0800
Subject: [PATCH] 修复导入通道时无平台关联时的bug
---
web_src/src/components/dialog/StreamProxyEdit.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index 3310d9c..a6a2058 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -46,7 +46,6 @@
style="width: 100%"
placeholder="璇烽�夋嫨鎷夋祦鑺傜偣"
>
- <el-option label="鑷姩閫夋嫨" value="auto"></el-option>
<el-option
v-for="item in mediaServerList"
:key="item.id"
@@ -106,6 +105,7 @@
<el-checkbox label="鍚敤" v-model="proxyParam.enable" ></el-checkbox>
<el-checkbox label="杞琀LS" v-model="proxyParam.enable_hls" ></el-checkbox>
<el-checkbox label="MP4褰曞埗" v-model="proxyParam.enable_mp4" ></el-checkbox>
+ <el-checkbox label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" v-model="proxyParam.enable_remove_none_reader" ></el-checkbox>
</div>
</el-form-item>
@@ -160,7 +160,7 @@
type: "default",
app: null,
stream: null,
- url: "rtmp://58.200.131.2/livetv/cctv5hd",
+ url: "",
src_url: null,
timeout_ms: null,
ffmpeg_cmd_key: null,
@@ -169,8 +169,9 @@
enable: true,
enable_hls: true,
enable_mp4: false,
+ enable_remove_none_reader: false,
platformGbId: null,
- mediaServerId: "auto",
+ mediaServerId: null,
},
mediaServerList:{},
ffmpegCmdList:{},
@@ -197,14 +198,15 @@
let that = this;
this.$axios({
method: 'get',
- url:`/api/platform/query/10000/0`
+ url:`/api/platform/query/10000/1`
}).then(function (res) {
that.platformList = res.data.list;
}).catch(function (error) {
console.log(error);
});
- this.mediaServer.getMediaServerList((data)=>{
- this.mediaServerList = data;
+ this.mediaServer.getOnlineMediaServerList((data)=>{
+ this.mediaServerList = data.data;
+ this.proxyParam.mediaServerId = this.mediaServerList[0].id
})
},
mediaServerIdChange:function (){
--
Gitblit v1.8.0