From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
web_src/src/components/dialog/MediaServerEdit.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/MediaServerEdit.vue b/web_src/src/components/dialog/MediaServerEdit.vue
index 9808a1c..9d8491e 100755
--- a/web_src/src/components/dialog/MediaServerEdit.vue
+++ b/web_src/src/components/dialog/MediaServerEdit.vue
@@ -20,6 +20,12 @@
<el-form-item label="SECRET" prop="secret">
<el-input v-model="mediaServerForm.secret" placeholder="濯掍綋鏈嶅姟SECRET" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-select v-model="mediaServerForm.type" style="float: left; width: 100%" >
+ <el-option key="zlm" label="ZLMediaKit" value="zlm"></el-option>
+ <el-option key="abl" label="ABLMediaServer" value="abl"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item>
<div style="float: right;">
<el-button type="primary" v-if="currentStep === 1 && serverCheck === 1" @click="next" >涓嬩竴姝�</el-button>
@@ -170,7 +176,7 @@
hookIp: "",
sdpIp: "",
streamIp: "",
- secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc",
+ secret: "",
httpPort: "",
httpSSlPort: "",
recordAssistPort: "",
@@ -182,6 +188,7 @@
rtpProxyPort: "",
rtspPort: "",
rtspSSLPort: "",
+ type: "zlm",
},
rtpPortRange1:30000,
rtpPortRange2:30500,
@@ -330,7 +337,7 @@
hookIp: "",
sdpIp: "",
streamIp: "",
- secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc",
+ secret: "",
httpPort: "",
httpSSlPort: "",
recordAssistPort: "",
--
Gitblit v1.8.0