XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化拉流代理

Browse Source
This commit is contained in:
648540858
2024-07-19 17:54:14 +08:00
parent 78088ba53f
commit 9f4e66a38b
23 changed files with 607 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
web_src/src/components/StreamProxyEdit.vue
View File

@@ -12,7 +12,7 @@
</div>
</div>
</div>
<el-tabs tab-position="left">
<el-tabs tab-position="left" style="background-color: #FFFFFF; padding-top: 1rem">
<el-tab-pane label="拉流代理信息">
<el-form ref="streamProxy" :rules="rules" :model="streamProxy" label-width="140px" style="width: 50%; margin: 0 auto">
<el-form-item label="类型" prop="type">
@@ -34,7 +34,7 @@
<el-form-item label="拉流地址" prop="url">
<el-input v-model="streamProxy.srcUrl" clearable></el-input>
</el-form-item>
<el-form-item label="超时时间:毫秒" prop="timeoutMs" v-if="streamProxy.type=='ffmpeg'">
<el-form-item label="超时时间(秒)" prop="timeoutMs">
<el-input v-model="streamProxy.timeout" clearable></el-input>
</el-form-item>
<el-form-item label="节点选择" prop="rtpType">
@@ -44,6 +44,7 @@
style="width: 100%"
placeholder="请选择拉流节点"
>
<el-option key="auto" label="自动选择" value=""></el-option>
<el-option
v-for="item in mediaServerList"
:key="item.id"
@@ -66,7 +67,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="拉流方式" prop="rtpType" v-if="streamProxy.type ==='default'">
<el-form-item label="拉流方式(RTSP)" prop="rtpType" v-if="streamProxy.type ==='default'">
<el-select
v-model="streamProxy.rtspType"
style="width: 100%"
@@ -93,7 +94,7 @@
</el-form-item>
<el-form-item>
<div style="float: right;">
<el-button type="primary" @click="onSubmit" :loading="dialogLoading" >保存</el-button>
<el-button type="primary" @click="onSubmit" :loading="locading" >保存</el-button>
<el-button @click="close">取消</el-button>
</div>
@@ -109,6 +110,7 @@
<script>
import CommonChannelEdit from './common/CommonChannelEdit'
import MediaServer from "./service/MediaServer";
export default {
name: "channelEdit",
@@ -117,59 +119,65 @@ export default {
CommonChannelEdit,
},
created() {
console.log(this.streamPush)
console.log(this.streamProxy)
this.mediaServer.getOnlineMediaServerList((data)=>{
this.mediaServerList = data.data;
})
},
data() {
return {
locading: false,
mediaServer: new MediaServer(),
mediaServerList:{},
ffmpegCmdList:{},
rules: {
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
app: [{ required: true, message: "请输入应用名", trigger: "blur" }],
stream: [{ required: true, message: "请输入流ID", trigger: "blur" }],
url: [{ required: true, message: "请输入要代理的流", trigger: "blur" }],
srcUrl: [{ required: true, message: "请输入要代理的流", trigger: "blur" }],
timeoutMs: [{ required: true, message: "请输入FFmpeg推流成功超时时间", trigger: "blur" }],
timeout: [{ required: true, message: "请输入FFmpeg推流成功超时时间", trigger: "blur" }],
ffmpegCmdKey: [{ required: false, message: "请输入FFmpeg命令参数模板（可选）", trigger: "blur" }],
},
};
},
methods: {
onSubmit: function () {
console.log(this.streamPush)
this.locading = true
if (this.streamPush.id) {
this.locading = true;
this.noneReaderHandler();
if (this.streamProxy.id) {
this.$axios({
method: 'post',
url: "/api/push/update",
data: this.streamPush
}).then((res) => {
if (res.data.code === 0) {
url:`/api/proxy/update`,
data: this.streamProxy
}).then((res)=> {
if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
this.$message.success("保存成功");
this.streamProxy = res.data.data
}else {
this.$message.error(res.data.msg)
this.$message.error(res.data.msg);
}
}).catch((error) => {
this.$message.error(error)
}).finally(()=>[
this.locading = false
])
}).catch((error) =>{
this.$message.error(res.data.error);
}).finally(()=>{
this.locading = false;
})
}else {
this.$axios({
method: 'post',
url: "/api/push/add",
data: this.streamPush
}).then((res) => {
if (res.data.code === 0) {
url:`/api/proxy/add`,
data: this.streamProxy
}).then((res)=> {
if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
this.$message.success("保存成功");
this.streamPush = res.data.data
this.streamProxy = res.data.data
}else {
this.$message.error(res.data.msg)
this.$message.error(res.data.msg);
}
}).catch((error) => {
this.$message.error(error)
}).finally(()=>[
this.locading = false
])
}).catch((error) =>{
this.$message.error(res.data.error);
}).finally(()=>{
this.locading = false;
})
}
},
@@ -177,23 +185,35 @@ export default {
this.closeEdit()
},
mediaServerIdChange:function (){
let that = this;
if (that.proxyParam.mediaServerId !== "auto"){
that.$axios({
if (this.streamProxy.mediaServerId !== "auto"){
this.$axios({
method: 'get',
url:`/api/proxy/ffmpeg_cmd/list`,
params: {
mediaServerId: that.proxyParam.mediaServerId
mediaServerId: this.streamProxy.mediaServerId
}
}).then(function (res) {
that.ffmpegCmdList = res.data.data;
that.proxyParam.ffmpegCmdKey = Object.keys(res.data.data)[0];
}).then((res)=> {
this.ffmpegCmdList = res.data.data;
this.streamProxy.ffmpegCmdKey = Object.keys(res.data.data)[0];
}).catch(function (error) {
console.log(error);
});
}
},
noneReaderHandler: function() {
console.log(this.streamProxy)
if (this.streamProxy.noneReader === null || this.streamProxy.noneReader === "0" || !this.streamProxy.noneReader) {
this.streamProxy.enableDisableNoneReader = false;
this.streamProxy.enableRemoveNoneReader = false;
}else if (this.streamProxy.noneReader === "1"){
this.streamProxy.enableDisableNoneReader = true;
this.streamProxy.enableRemoveNoneReader = false;
}else if (this.streamProxy.noneReader ==="2"){
this.streamProxy.enableDisableNoneReader = false;
this.streamProxy.enableRemoveNoneReader = true;
}
},
},
};
</script>