From a8c424e49db9213e879bf6c44cebccdfddaa1808 Mon Sep 17 00:00:00 2001
From: BradyXu <brady_xu@outlook.com>
Date: 星期日, 12 五月 2024 02:00:55 +0800
Subject: [PATCH] 修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
---
web_src/src/components/dialog/platformEdit.vue | 263 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 196 insertions(+), 67 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 c0e0f9a..06cb7c4
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -17,7 +17,7 @@
<el-input v-model="platform.name"></el-input>
</el-form-item>
<el-form-item label="SIP鏈嶅姟鍥芥爣缂栫爜" prop="serverGBId">
- <el-input v-model="platform.serverGBId" clearable></el-input>
+ <el-input v-model="platform.serverGBId" clearable @input="serverGBIdChange"></el-input>
</el-form-item>
<el-form-item label="SIP鏈嶅姟鍥芥爣鍩�" prop="serverGBDomain">
<el-input v-model="platform.serverGBDomain" clearable></el-input>
@@ -26,21 +26,34 @@
<el-input v-model="platform.serverIP" clearable></el-input>
</el-form-item>
<el-form-item label="SIP鏈嶅姟绔彛" prop="serverPort">
- <el-input v-model="platform.serverPort" clearable></el-input>
+ <el-input v-model="platform.serverPort" clearable type="number"></el-input>
</el-form-item>
<el-form-item label="璁惧鍥芥爣缂栧彿" prop="deviceGBId">
- <el-input v-model="platform.deviceGBId" clearable></el-input>
+ <el-input v-model="platform.deviceGBId" clearable @input="deviceGBIdChange"></el-input>
</el-form-item>
<el-form-item label="鏈湴IP" prop="deviceIp">
- <el-input v-model="platform.deviceIp" :disabled="true"></el-input>
+ <el-select v-model="platform.deviceIp" placeholder="璇烽�夋嫨涓庝笂绾х浉閫氱殑缃戝崱" style="width: 100%">
+ <el-option
+ v-for="ip in deviceIp"
+ :key="ip"
+ :label="ip"
+ :value="ip">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鏈湴绔彛" prop="devicePort">
- <el-input v-model="platform.devicePort" :disabled="true"></el-input>
+ <el-input v-model="platform.devicePort" :disabled="true" type="number"></el-input>
+ </el-form-item>
+ <el-form-item label="SDP鍙戞祦IP" prop="sendStreamIp">
+ <el-input v-model="platform.sendStreamIp"></el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="12">
<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>
@@ -63,6 +76,18 @@
<el-option label="TCP" value="TCP"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鐩綍鍒嗙粍" prop="catalogGroup">
+ <el-select
+ v-model="platform.catalogGroup"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鐩綍鍒嗙粍"
+ >
+ <el-option label="1" value="1"></el-option>
+ <el-option label="2" value="2"></el-option>
+ <el-option label="4" value="4"></el-option>
+ <el-option label="8" value="8"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="瀛楃闆�" prop="characterSet">
<el-select
v-model="platform.characterSet"
@@ -75,8 +100,11 @@
</el-form-item>
<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="RTCP淇濇椿" v-model="platform.rtcp"></el-checkbox>
+<!-- <el-checkbox label="浜戝彴鎺у埗" v-model="platform.ptz"></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.autoPushChannel" ></el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">{{
@@ -97,7 +125,6 @@
name: "platformEdit",
props: {},
computed: {},
- created() {},
data() {
var deviceGBIdRules = async (rule, value, callback) => {
console.log(value);
@@ -105,9 +132,6 @@
callback(new Error("璇疯緭鍏ヨ澶囧浗鏍囩紪鍙�"));
} else {
var exit = await this.deviceGBIdExit(value);
- console.log(exit);
- console.log(exit == "true");
- console.log(exit === "true");
if (exit) {
callback(new Error("璁惧鍥芥爣缂栧彿宸插瓨鍦�"));
} else {
@@ -120,26 +144,35 @@
showDialog: false,
isLoging: false,
onSubmit_text: "绔嬪嵆鍒涘缓",
+ saveUrl: "/api/platform/save",
platform: {
+ id: null,
enable: true,
ptz: true,
rtcp: false,
- name: "娴嬭瘯001",
- serverGBId: "34020000002000000001",
- serverGBDomain: "3402000000",
- serverIP: "192.168.1.141",
- serverPort: "5060",
- deviceGBId: "34020000001320001101",
- deviceIp: "192.168.1.20",
- devicePort: "5060",
- username: "34020000001320001101",
- password: "12345678",
- expires: 300,
+ asMessageChannel: false,
+ autoPushChannel: false,
+ name: null,
+ serverGBId: null,
+ serverGBDomain: null,
+ serverIP: null,
+ serverPort: null,
+ deviceGBId: null,
+ deviceIp: null,
+ devicePort: null,
+ username: null,
+ password: null,
+ expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
+ startOfflinePush: false,
+ catalogGroup: 1,
+ administrativeDivision: "",
+ sendStreamIp: null,
},
+ deviceIp: [], // 瀛樺偍鐢ㄦ埛閫夋嫨鐨勮澶嘔P
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
serverGBId: [
@@ -163,65 +196,141 @@
methods: {
openDialog: function (platform, callback) {
var that = this;
- this.$axios({
- method: 'get',
- url:`/api/platform/server_config`
- }).then(function (res) {
- console.log(res);
- that.platform.deviceGBId = res.data.username;
- that.platform.deviceIp = res.data.deviceIp;
- that.platform.devicePort = res.data.devicePort;
- that.platform.username = res.data.username;
- that.platform.password = res.data.password;
- }).catch(function (error) {
- console.log(error);
- });
- this.showDialog = true;
- this.listChangeCallback = callback;
- if (platform != null) {
- this.platform = platform;
- this.onSubmit_text = "淇濆瓨";
- } else {
+ if (platform == null) {
this.onSubmit_text = "绔嬪嵆鍒涘缓";
- }
- },
- onSubmit: function () {
- console.log("onSubmit");
- var that = this;
- that.$axios({
- method: 'post',
- url:`/api/platform/save`,
- data: that.platform
- }).then(function (res) {
- if (res.data == "success") {
- that.$message({
- showClose: true,
- message: "淇濆瓨鎴愬姛",
- type: "success",
- });
- that.showDialog = false;
- if (that.listChangeCallback != null) {
- that.listChangeCallback();
- }
+ this.saveUrl = "/api/platform/add";
+ this.$axios({
+ method: 'get',
+ url:`/api/platform/server_config`
+ }).then(function (res) {
+ console.log(res);
+ if (res.data.code === 0) {
+ that.platform.deviceGBId = res.data.data.username;
+ that.deviceIp = res.data.data.deviceIp.split(',');
+ that.platform.devicePort = res.data.data.devicePort;
+ that.platform.username = res.data.data.username;
+ that.platform.password = res.data.data.password;
+ that.platform.sendStreamIp = res.data.data.sendStreamIp;
+ that.platform.administrativeDivision = res.data.data.username.substr(0, 6);
}
+
}).catch(function (error) {
console.log(error);
});
+ }else {
+ this.platform.id = platform.id;
+ this.platform.enable = platform.enable;
+ 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;
+ this.platform.serverIP = platform.serverIP;
+ this.platform.serverPort = platform.serverPort;
+ this.platform.deviceGBId = platform.deviceGBId;
+ this.deviceIp = platform.deviceIp.split(',');
+ this.platform.devicePort = platform.devicePort;
+ this.platform.username = platform.username;
+ this.platform.password = platform.password;
+ this.platform.expires = platform.expires;
+ this.platform.keepTimeout = platform.keepTimeout;
+ this.platform.transport = platform.transport;
+ this.platform.characterSet = platform.characterSet;
+ 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.onSubmit_text = "淇濆瓨";
+ this.saveUrl = "/api/platform/save";
+ }
+ this.showDialog = true;
+ this.listChangeCallback = callback;
+ },
+ serverGBIdChange: function () {
+ if (this.platform.serverGBId.length > 10) {
+ this.platform.serverGBDomain = this.platform.serverGBId.substr(0, 10);
+ }
+ },
+ deviceGBIdChange: function () {
+
+ this.platform.username = this.platform.deviceGBId ;
+ if (this.platform.administrativeDivision == null) {
+ this.platform.administrativeDivision = this.platform.deviceGBId.substr(0, 6);
+ }
+ },
+ onSubmit: function () {
+ this.saveForm()
+ },
+ saveForm: function (){
+ this.$axios({
+ method: 'post',
+ url: this.saveUrl,
+ data: this.platform
+ }).then((res) =>{
+ if (res.data.code === 0) {
+ this.$message({
+ showClose: true,
+ message: "淇濆瓨鎴愬姛",
+ type: "success",
+ });
+ this.showDialog = false;
+ if (this.listChangeCallback != null) {
+ this.listChangeCallback();
+ }
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ }).catch((error)=> {
+ console.log(error);
+ });
},
close: function () {
- console.log("鍏抽棴娣诲姞瑙嗛骞冲彴");
this.showDialog = false;
this.$refs.platform1.resetFields();
this.$refs.platform2.resetFields();
+ this.platform = {
+ id: null,
+ enable: true,
+ ptz: true,
+ rtcp: false,
+ asMessageChannel: false,
+ autoPushChannel: false,
+ name: null,
+ serverGBId: null,
+ administrativeDivision: null,
+ serverGBDomain: null,
+ serverIP: null,
+ serverPort: null,
+ deviceGBId: null,
+ deviceIp: null,
+ devicePort: null,
+ username: null,
+ password: null,
+ expires: 3600,
+ keepTimeout: 60,
+ transport: "UDP",
+ characterSet: "GB2312",
+ startOfflinePush: false,
+ catalogGroup: 1,
+ }
},
deviceGBIdExit: async function (deviceGbId) {
var result = false;
var that = this;
await that.$axios({
- method: 'post',
+ method: 'get',
url:`/api/platform/exit/${deviceGbId}`})
.then(function (res) {
- result = res.data;
+ if (res.data.code === 0) {
+ result = res.data.data;
+ }
})
.catch(function (error) {
console.log(error);
@@ -229,15 +338,35 @@
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){
+ if (result) {
+ this.$message({
+ showClose: true,
+ message: "寮�鍚疪TCP淇濇椿闇�瑕佷笂绾у钩鍙版敮鎸侊紝鍙互閬垮厤鏃犳晥鎺ㄦ祦",
+ type: "warning",
+ });
+ }
+ },
},
};
</script>
<style>
+/* 璋锋瓕 */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ appearance: none;
+ margin: 0;
+}
+/* 鐏嫄 */
+input{
+ -moz-appearance:textfield;
+}
.control-wrapper-not-used {
position: relative;
width: 6.25rem;
--
Gitblit v1.8.0