From dbcd050c66388bd9c8d9fdcf843458e38273b785 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 十一月 2021 15:04:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/StreamProxyEdit.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index 3310d9c..c9330fd 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -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,
@@ -203,7 +203,7 @@
}).catch(function (error) {
console.log(error);
});
- this.mediaServer.getMediaServerList((data)=>{
+ this.mediaServer.getOnlineMediaServerList((data)=>{
this.mediaServerList = data;
})
},
--
Gitblit v1.8.0