From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
web_src/src/components/dialog/platformEdit.vue | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
old mode 100644
new mode 100755
index 0298ee7..4c02dfc
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -37,8 +37,8 @@
<el-form-item label="鏈湴绔彛" prop="devicePort">
<el-input v-model="platform.devicePort" :disabled="true" type="number"></el-input>
</el-form-item>
- <el-form-item label="SIP璁よ瘉鐢ㄦ埛鍚�" prop="username">
- <el-input v-model="platform.username"></el-input>
+ <el-form-item label="SDP鍙戞祦IP" prop="sendStreamIp">
+ <el-input v-model="platform.sendStreamIp"></el-input>
</el-form-item>
</el-form>
</el-col>
@@ -46,6 +46,9 @@
<el-form ref="platform2" :rules="rules" :model="platform" label-width="160px">
<el-form-item label="琛屾斂鍖哄垝" prop="administrativeDivision">
<el-input v-model="platform.administrativeDivision" clearable></el-input>
+ </el-form-item>
+ <el-form-item label="SIP璁よ瘉鐢ㄦ埛鍚�" prop="username">
+ <el-input v-model="platform.username"></el-input>
</el-form-item>
<el-form-item label="SIP璁よ瘉瀵嗙爜" prop="password">
<el-input v-model="platform.password" ></el-input>
@@ -78,12 +81,6 @@
<el-option label="8" value="8"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐩綍缁撴瀯" prop="treeType" >
- <el-select v-model="platform.treeType" style="width: 100%" @change="treeTypeChange">
- <el-option key="WGS84" label="琛屾斂鍖哄垝" value="CivilCode"></el-option>
- <el-option key="GCJ02" label="涓氬姟鍒嗙粍" value="BusinessGroup"></el-option>
- </el-select>
- </el-form-item>
<el-form-item label="瀛楃闆�" prop="characterSet">
<el-select
v-model="platform.characterSet"
@@ -97,9 +94,10 @@
<el-form-item label="鍏朵粬閫夐」">
<el-checkbox label="鍚敤" v-model="platform.enable" @change="checkExpires"></el-checkbox>
<!-- <el-checkbox label="浜戝彴鎺у埗" v-model="platform.ptz"></el-checkbox>-->
- <el-checkbox label="鎷夎捣绂荤嚎鎺ㄦ祦" v-model="platform.startOfflinePush"></el-checkbox>
+ <el-checkbox label="鎷夎捣鎺ㄦ祦" v-model="platform.startOfflinePush"></el-checkbox>
<el-checkbox label="RTCP淇濇椿" v-model="platform.rtcp" @change="rtcpCheckBoxChange"></el-checkbox>
- <el-checkbox label="浣滀负娑堟伅閫氶亾" v-model="platform.asMessageChannel" ></el-checkbox>
+ <el-checkbox label="娑堟伅閫氶亾" v-model="platform.asMessageChannel" ></el-checkbox>
+ <el-checkbox label="鎺ㄩ�侀�氶亾" v-model="platform.autoPushChannel" ></el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">{{
@@ -147,6 +145,7 @@
ptz: true,
rtcp: false,
asMessageChannel: false,
+ autoPushChannel: false,
name: null,
serverGBId: null,
serverGBDomain: null,
@@ -157,14 +156,14 @@
devicePort: null,
username: null,
password: null,
- expires: 300,
+ expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
startOfflinePush: false,
catalogGroup: 1,
- administrativeDivision: null,
- treeType: "BusinessGroup",
+ administrativeDivision: "",
+ sendStreamIp: null,
},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
@@ -203,7 +202,7 @@
that.platform.devicePort = res.data.data.devicePort;
that.platform.username = res.data.data.username;
that.platform.password = res.data.data.password;
- that.platform.treeType = "BusinessGroup";
+ that.platform.sendStreamIp = res.data.data.sendStreamIp;
that.platform.administrativeDivision = res.data.data.username.substr(0, 6);
}
@@ -216,6 +215,7 @@
this.platform.ptz = platform.ptz;
this.platform.rtcp = platform.rtcp;
this.platform.asMessageChannel = platform.asMessageChannel;
+ this.platform.autoPushChannel = platform.autoPushChannel;
this.platform.name = platform.name;
this.platform.serverGBId = platform.serverGBId;
this.platform.serverGBDomain = platform.serverGBDomain;
@@ -233,8 +233,8 @@
this.platform.catalogId = platform.catalogId;
this.platform.startOfflinePush = platform.startOfflinePush;
this.platform.catalogGroup = platform.catalogGroup;
+ this.platform.sendStreamIp = platform.sendStreamIp;
this.platform.administrativeDivision = platform.administrativeDivision;
- this.platform.treeType = platform.treeType;
this.onSubmit_text = "淇濆瓨";
this.saveUrl = "/api/platform/save";
}
@@ -252,7 +252,6 @@
if (this.platform.administrativeDivision == null) {
this.platform.administrativeDivision = this.platform.deviceGBId.substr(0, 6);
}
-
},
onSubmit: function () {
this.saveForm()
@@ -294,6 +293,7 @@
ptz: true,
rtcp: false,
asMessageChannel: false,
+ autoPushChannel: false,
name: null,
serverGBId: null,
administrativeDivision: null,
@@ -305,11 +305,10 @@
devicePort: null,
username: null,
password: null,
- expires: 300,
+ expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- treeType: "BusinessGroup",
startOfflinePush: false,
catalogGroup: 1,
}
@@ -331,8 +330,8 @@
return result;
},
checkExpires: function() {
- if (this.platform.enable && this.platform.expires == "0") {
- this.platform.expires = "300";
+ if (this.platform.enable && this.platform.expires === "0") {
+ this.platform.expires = "3600";
}
},
rtcpCheckBoxChange: function (result){
@@ -344,13 +343,6 @@
});
}
},
- treeTypeChange: function (){
- this.$message({
- showClose: true,
- message: "淇敼鐩綍缁撴瀯浼氬鑷村叧鑱旂洰褰曚笌閫氶亾鏁版嵁琚竻绌猴紝淇濆瓨鍚庣敓鏁�",
- type: "warning",
- });
- }
},
};
</script>
--
Gitblit v1.8.0