From d09d8f11f06ee6eeeb4c7f9bd6d35e6fbd49e05f Mon Sep 17 00:00:00 2001 From: jiang <893224616@qq.com> Date: 星期四, 04 八月 2022 17:01:31 +0800 Subject: [PATCH] 修改‘修改pushkey’窗口的标题提示文案 --- web_src/src/components/dialog/StreamProxyEdit.vue | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue index 3310d9c..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> @@ -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,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.getMediaServerList((data)=>{ - this.mediaServerList = data; + this.mediaServer.getOnlineMediaServerList((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