优化发流逻辑

web_src/src/components/dialog/MediaServerEdit.vue

@@ -81,6 +81,7 @@
                 <el-switch  active-text="多端口" inactive-text="单端口" @change="portRangeChange" v-model="mediaServerForm.rtpEnable" :disabled="mediaServerForm.defaultServer"></el-switch>
               </el-form-item>
 
+
               <el-form-item v-if="!mediaServerForm.rtpEnable" label="收流端口" prop="rtpProxyPort">
                 <el-input v-model.number="mediaServerForm.rtpProxyPort" clearable :disabled="mediaServerForm.defaultServer"></el-input>
               </el-form-item>
@@ -89,6 +90,11 @@
                 -
                 <el-input v-model="rtpPortRange2" placeholder="终止" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange2" :disabled="mediaServerForm.defaultServer"></el-input>
               </el-form-item>
+              <el-form-item v-if="mediaServerForm.sendRtpEnable" label="发流端口" >
+                <el-input v-model="sendRtpPortRange1" placeholder="起始" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange1" :disabled="mediaServerForm.defaultServer"></el-input>
+                -
+                <el-input v-model="sendRtpPortRange2" placeholder="终止" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange2" :disabled="mediaServerForm.defaultServer"></el-input>
+              </el-form-item>
               <el-form-item label="录像管理服务端口" prop="recordAssistPort">
                 <el-input v-model.number="mediaServerForm.recordAssistPort" :disabled="mediaServerForm.defaultServer">
 <!--                  <el-button v-if="mediaServerForm.recordAssistPort > 0" slot="append" type="primary" @click="checkRecordServer">测试</el-button>-->
@@ -172,6 +178,7 @@ export default {
         rtmpSSlPort: "",
         rtpEnable: false,
         rtpPortRange: "",
+        sendRtpPortRange: "",
         rtpProxyPort: "",
         rtspPort: "",
         rtspSSLPort: "",
@@ -179,6 +186,9 @@ export default {
       rtpPortRange1:30000,
       rtpPortRange2:30500,
 
+      sendRtpPortRange1:50000,
+      sendRtpPortRange2:60000,
+
       rules: {
         ip:  [{ required: true, validator: isValidIp, message: '请输入有效的IP地址', trigger: 'blur' }],
         httpPort:  [{ required: true, validator: isValidPort, message: '请输入有效的端口号', trigger: 'blur' }],
@@ -214,10 +224,15 @@ export default {
         this.currentStep = 3;
         if (param.rtpPortRange) {
           let rtpPortRange = this.mediaServerForm.rtpPortRange.split(",");
+          let sendRtpPortRange = this.mediaServerForm.sendRtpPortRange.split(",");
           if (rtpPortRange.length > 0) {
             this.rtpPortRange1 =  rtpPortRange[0]
             this.rtpPortRange2 =  rtpPortRange[1]
           }
+          if (sendRtpPortRange.length > 0) {
+            this.sendRtpPortRange1 =  sendRtpPortRange[0]
+            this.sendRtpPortRange2 =  sendRtpPortRange[1]
+          }
         }
       }
     },
@@ -240,6 +255,8 @@ export default {
           that.mediaServerForm.autoConfig = true;
           that.rtpPortRange1 = 30000
           that.rtpPortRange2 = 30500
+          that.sendRtpPortRange1 = 50000
+          that.sendRtpPortRange2 = 60000
           that.serverCheck = 1;
         }else {
           that.serverCheck = -1;
@@ -321,12 +338,15 @@ export default {
         rtmpSSlPort: "",
         rtpEnable: false,
         rtpPortRange: "",
+        sendRtpPortRange: "",
         rtpProxyPort: "",
         rtspPort: "",
         rtspSSLPort: "",
       };
       this.rtpPortRange1 = 30500;
       this.rtpPortRange2 = 30500;
+      this.sendRtpPortRange1 = 50000;
+      this.sendRtpPortRange2 = 60000;
       this.listChangeCallback = null
       this.currentStep = 1;
     },
@@ -351,7 +371,7 @@ export default {
     portRangeChange: function() {
       if (this.mediaServerForm.rtpEnable) {
         this.mediaServerForm.rtpPortRange = this.rtpPortRange1 + "," + this.rtpPortRange2
-        console.log(this.mediaServerForm.rtpPortRange)
+        this.mediaServerForm.sendRtpPortRange = this.sendRtpPortRange1 + "," + this.sendRtpPortRange2
       }
     }
   },

web_src/src/components/dialog/StreamProxyEdit.vue

@@ -82,17 +82,21 @@
                   <el-option label="组播" value="2"></el-option>
                 </el-select>
               </el-form-item>
+
             <el-form-item label="无人观看" prop="rtpType" >
-              <el-select
-                @change="noneReaderHandler"
-                v-model="proxyParam.noneReader"
-                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-radio v-model="proxyParam.noneReader" label="1">不做处理</el-radio>
+              <el-radio v-model="proxyParam.enableDisableNoneReader" label="2">停用</el-radio>
+              <el-radio v-model="proxyParam.enableRemoveNoneReader" label="3">移除</el-radio>
+<!--              <el-select-->
+<!--                @change="noneReaderHandler"-->
+<!--                v-model="proxyParam.noneReader"-->
+<!--                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;">