From 12fa3b4c8da2af13a710400d64c9fe6d5d6b1e5e Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 23 十一月 2022 09:57:17 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' --- web_src/src/components/dialog/StreamProxyEdit.vue | 80 ++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue index 1270999..76011fa 100644 --- a/web_src/src/components/dialog/StreamProxyEdit.vue +++ b/web_src/src/components/dialog/StreamProxyEdit.vue @@ -83,31 +83,23 @@ <el-option label="缁勬挱" value="2"></el-option> </el-select> </el-form-item> - - <el-form-item label="鍥芥爣骞冲彴"> - <el-select - v-model="proxyParam.platformGbId" - style="width: 100%" - placeholder="璇烽�夋嫨鍥芥爣骞冲彴" - > - <el-option - v-for="item in platformList" - :key="item.name" - :label="item.name" - :value="item.serverGBId"> - <span style="float: left">{{ item.name }}</span> - <span style="float: right; color: #8492a6; font-size: 13px">{{ item.serverGBId }}</span> - </el-option> - </el-select> - </el-form-item> + <el-form-item label="鏃犱汉瑙傜湅" prop="rtp_type" > + <el-select + @change="noneReaderHandler" + v-model="proxyParam.none_reader" + style="width: 100%" + placeholder="璇烽�夋嫨鏃犱汉瑙傜湅鐨勫鐞嗘柟寮�" + > + <el-option label="涓嶅仛澶勭悊" value="0"></el-option> + <el-option label="鍋滅敤" value="1"></el-option> + <el-option label="绉婚櫎" value="2"></el-option> + </el-select> + </el-form-item> <el-form-item label="鍏朵粬閫夐」"> <div style="float: left;"> <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" @change="removeNoneReader"></el-checkbox> - <el-checkbox label="鏃犱汉瑙傜湅鍋滄鎷夋祦" v-model="proxyParam.enable_disable_none_reader" @change="disableNoneReaderHandType"></el-checkbox> - + <el-checkbox label="寮�鍚煶棰�" v-model="proxyParam.enable_audio" ></el-checkbox> + <el-checkbox label="褰曞埗" v-model="proxyParam.enable_mp4" ></el-checkbox> </div> </el-form-item> @@ -169,10 +161,11 @@ gbId: null, rtp_type: null, enable: true, - enable_hls: true, + enable_audio: true, enable_mp4: false, + none_reader: null, enable_remove_none_reader: false, - enable_disable_none_reader: true, + enable_disable_none_reader: false, platformGbId: null, mediaServerId: null, }, @@ -196,6 +189,7 @@ this.listChangeCallback = callback; if (proxyParam != null) { this.proxyParam = proxyParam; + this.proxyParam.none_reader = null; } let that = this; @@ -233,26 +227,26 @@ }, onSubmit: function () { this.dialogLoading = true; - var that = this; - that.$axios({ + this.noneReaderHandler(); + this.$axios({ method: 'post', url:`/api/proxy/save`, - data: that.proxyParam - }).then(function (res) { - that.dialogLoading = false; + data: this.proxyParam + }).then((res)=> { + this.dialogLoading = false; if (typeof (res.data.code) != "undefined" && res.data.code === 0) { - that.$message({ + this.$message({ showClose: true, message: res.data.msg, type: "success", }); - that.showDialog = false; - if (that.listChangeCallback != null) { - that.listChangeCallback(); - that.dialogLoading = false; + this.showDialog = false; + if (this.listChangeCallback != null) { + this.listChangeCallback(); + this.dialogLoading = false; } } - }).catch(function (error) { + }).catch((error) =>{ console.log(error); this.dialogLoading = false; }); @@ -280,12 +274,18 @@ this.platform.expires = "300"; } }, - removeNoneReader: function(checked) { - this.proxyParam.enable_disable_none_reader = !checked; + noneReaderHandler: function() { + if (this.proxyParam.none_reader === null || this.proxyParam.none_reader === "0") { + this.proxyParam.enable_disable_none_reader = false; + this.proxyParam.enable_remove_none_reader = false; + }else if (this.proxyParam.none_reader === "1"){ + this.proxyParam.enable_disable_none_reader = true; + this.proxyParam.enable_remove_none_reader = false; + }else if (this.proxyParam.none_reader ==="2"){ + this.proxyParam.enable_disable_none_reader = false; + this.proxyParam.enable_remove_none_reader = true; + } }, - disableNoneReaderHandType: function(checked) { - this.proxyParam.enable_remove_none_reader = !checked; - } }, }; </script> -- Gitblit v1.8.0