From e48ef997c03b49c8090970f5fbb29ce80b0ac6df Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期三, 14 七月 2021 15:57:39 +0800
Subject: [PATCH] 更换播放器， 修正和优化sql脚本，
---
web_src/src/components/dialog/StreamProxyEdit.vue | 78 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index 696379e..e1d224a 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -36,11 +36,23 @@
<el-form-item label="鎷夋祦鍦板潃" prop="src_url" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.src_url" clearable></el-input>
</el-form-item>
- <el-form-item label="瓒呮椂鏃堕棿" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'">
+ <el-form-item label="瓒呮椂鏃堕棿:姣" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.timeout_ms" clearable></el-input>
</el-form-item>
<el-form-item label="FFmpeg鍛戒护妯℃澘" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'">
- <el-input v-model="proxyParam.ffmpeg_cmd_key" clearable></el-input>
+<!-- <el-input v-model="proxyParam.ffmpeg_cmd_key" clearable></el-input>-->
+ <el-select
+ v-model="proxyParam.ffmpeg_cmd_key"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨FFmpeg鍛戒护妯℃澘"
+ >
+ <el-option
+ v-for="item in Object.keys(ffmpegCmdList)"
+ :key="item"
+ :label="ffmpegCmdList[item]"
+ :value="item">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鍥芥爣缂栫爜" prop="gbId">
<el-input v-model="proxyParam.gbId" placeholder="璁剧疆鍥芥爣缂栫爜鍙帹閫佸埌鍥芥爣" clearable></el-input>
@@ -54,6 +66,22 @@
<el-option label="TCP" value="0"></el-option>
<el-option label="UDP" value="1"></el-option>
<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="鍏朵粬閫夐」">
@@ -106,6 +134,27 @@
isLoging: false,
dialogLoading: false,
onSubmit_text: "绔嬪嵆鍒涘缓",
+ platformList: [{
+ id: 1,
+ enable: true,
+ name: "141",
+ serverGBId: "34020000002000000001",
+ serverGBDomain: "3402000000",
+ serverIP: "192.168.1.141",
+ serverPort: 15060,
+ deviceGBId: "34020000002000000001",
+ deviceIp: "192.168.1.20",
+ devicePort: "5060",
+ username: "34020000002000000001",
+ password: "12345678",
+ expires: "300",
+ keepTimeout: "60",
+ transport: "UDP",
+ characterSet: "GB2312",
+ ptz: false,
+ rtcp: false,
+ status: true,
+ }],
proxyParam: {
name: null,
type: "default",
@@ -120,7 +169,9 @@
enable: true,
enable_hls: true,
enable_mp4: false,
+ platformGbId: null,
},
+ ffmpegCmdList:{},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ悕绉�", trigger: "blur" }],
@@ -139,10 +190,26 @@
this.listChangeCallback = callback;
if (proxyParam != null) {
this.proxyParam = proxyParam;
- this.onSubmit_text = "淇濆瓨";
- } else {
- this.onSubmit_text = "绔嬪嵆鍒涘缓";
}
+
+ let that = this;
+
+ this.$axios({
+ method: 'get',
+ url:`/api/platform/query/10000/0`
+ }).then(function (res) {
+ that.platformList = res.data.list;
+ }).catch(function (error) {
+ console.log(error);
+ });
+ this.$axios({
+ method: 'get',
+ url:`/api/proxy/ffmpeg_cmd/list`
+ }).then(function (res) {
+ that.ffmpegCmdList = res.data.data;
+ }).catch(function (error) {
+ console.log(error);
+ });
},
onSubmit: function () {
console.log("onSubmit");
@@ -163,6 +230,7 @@
that.showDialog = false;
if (that.listChangeCallback != null) {
that.listChangeCallback();
+ that.dialogLoading = false;
}
}
}).catch(function (error) {
--
Gitblit v1.8.0