From cb897aaeed0f3a24f91dc4265b8ff0d2b31284c6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 17:35:00 +0800
Subject: [PATCH] Merge pull request #829 from kairlec/wvp-28181-2.0
---
web_src/src/components/dialog/StreamProxyEdit.vue | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index 3310d9c..76011fa 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"
@@ -84,28 +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_audio" ></el-checkbox>
+ <el-checkbox label="褰曞埗" v-model="proxyParam.enable_mp4" ></el-checkbox>
</div>
</el-form-item>
@@ -160,17 +154,20 @@
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,
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: false,
platformGbId: null,
- mediaServerId: "auto",
+ mediaServerId: null,
},
mediaServerList:{},
ffmpegCmdList:{},
@@ -192,19 +189,22 @@
this.listChangeCallback = callback;
if (proxyParam != null) {
this.proxyParam = proxyParam;
+ this.proxyParam.none_reader = null;
}
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;
+ that.platformList = res.data.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 +218,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);
});
@@ -226,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;
});
@@ -259,7 +260,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;
@@ -272,7 +273,19 @@
if (this.platform.enable && this.platform.expires == "0") {
this.platform.expires = "300";
}
- }
+ },
+ 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;
+ }
+ },
},
};
</script>
--
Gitblit v1.8.0