From 42901d03746d534d701ea3b8663e1c6d2c938c6d Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期二, 15 三月 2022 10:28:23 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/StreamProxyEdit.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index d5a9529..dea93de 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -184,7 +184,7 @@
let that = this;
this.$axios({
method: 'get',
- url:`/api/platform/query/100/1`
+ url:`/api/platform/query/10000/1`
}).then(function (res) {
that.platformList = res.data.list;
}).catch(function (error) {
@@ -193,6 +193,7 @@
this.mediaServer.getOnlineMediaServerList((data)=>{
this.mediaServerList = data.data;
this.proxyParam.mediaServerId = this.mediaServerList[0].id
+ this.mediaServerIdChange()
})
},
mediaServerIdChange:function (){
@@ -206,6 +207,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