From 04f938ef623eb1f69a0b08ba8910bb5639372316 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期五, 06 五月 2022 12:19:44 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
---
web_src/src/components/dialog/StreamProxyEdit.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index c9330fd..77ee1d8 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>
@@ -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,16 @@
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.getOnlineMediaServerList((data)=>{
- this.mediaServerList = data;
+ this.mediaServerList = data.data;
+ this.proxyParam.mediaServerId = this.mediaServerList[0].id
+ this.mediaServerIdChange()
})
},
mediaServerIdChange:function (){
@@ -218,6 +221,7 @@
}
}).then(function (res) {
that.ffmpegCmdList = res.data.data;
+ that.proxyParam.ffmpeg_cmd_key = Object.keys(res.data.data)[0];
}).catch(function (error) {
console.log(error);
});
--
Gitblit v1.8.0