From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 24 九月 2022 21:04:58 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/StreamProxyEdit.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index a6a2058..936bc53 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -200,13 +200,14 @@
method: 'get',
url:`/api/platform/query/10000/1`
}).then(function (res) {
- that.platformList = res.data.list;
+ that.platformList = res.data.data.list;
}).catch(function (error) {
console.log(error);
});
this.mediaServer.getOnlineMediaServerList((data)=>{
this.mediaServerList = data.data;
this.proxyParam.mediaServerId = this.mediaServerList[0].id
+ this.mediaServerIdChange()
})
},
mediaServerIdChange:function (){
@@ -220,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);
});
@@ -261,7 +263,7 @@
var result = false;
var that = this;
await that.$axios({
- method: 'post',
+ method: 'get',
url:`/api/platform/exit/${deviceGbId}`
}).then(function (res) {
result = res.data;
--
Gitblit v1.8.0