From 6b3732b8c43165342b7521b1e3ea788e471d58e8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 19 六月 2023 20:19:31 +0800
Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0
---
web_src/src/components/dialog/platformEdit.vue | 106 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 45 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 0caec32..0158cf7 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -37,13 +37,13 @@
<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>
</el-form>
</el-col>
<el-col :span="12">
<el-form ref="platform2" :rules="rules" :model="platform" label-width="160px">
- <el-form-item label="SIP璁よ瘉鐢ㄦ埛鍚�" prop="username">
- <el-input v-model="platform.username"></el-input>
- </el-form-item>
<el-form-item label="琛屾斂鍖哄垝" prop="administrativeDivision">
<el-input v-model="platform.administrativeDivision" clearable></el-input>
</el-form-item>
@@ -90,9 +90,10 @@
</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="鍏变韩鎵�鏈夌洿鎾祦" v-model="platform.shareAllLiveStream"></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-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">{{
@@ -139,6 +140,7 @@
enable: true,
ptz: true,
rtcp: false,
+ asMessageChannel: false,
name: null,
serverGBId: null,
serverGBDomain: null,
@@ -149,11 +151,10 @@
devicePort: null,
username: null,
password: null,
- expires: 300,
+ expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
startOfflinePush: false,
catalogGroup: 1,
administrativeDivision: null,
@@ -189,12 +190,15 @@
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;
- that.platform.administrativeDivision = res.data.username.substr(0, 6);
+ if (res.data.code === 0) {
+ that.platform.deviceGBId = res.data.data.username;
+ that.platform.deviceIp = res.data.data.deviceIp;
+ that.platform.devicePort = res.data.data.devicePort;
+ that.platform.username = res.data.data.username;
+ that.platform.password = res.data.data.password;
+ that.platform.administrativeDivision = res.data.data.username.substr(0, 6);
+ }
+
}).catch(function (error) {
console.log(error);
});
@@ -203,6 +207,7 @@
this.platform.enable = platform.enable;
this.platform.ptz = platform.ptz;
this.platform.rtcp = platform.rtcp;
+ this.platform.asMessageChannel = platform.asMessageChannel;
this.platform.name = platform.name;
this.platform.serverGBId = platform.serverGBId;
this.platform.serverGBDomain = platform.serverGBDomain;
@@ -217,7 +222,6 @@
this.platform.keepTimeout = platform.keepTimeout;
this.platform.transport = platform.transport;
this.platform.characterSet = platform.characterSet;
- this.platform.shareAllLiveStream = platform.shareAllLiveStream;
this.platform.catalogId = platform.catalogId;
this.platform.startOfflinePush = platform.startOfflinePush;
this.platform.catalogGroup = platform.catalogGroup;
@@ -239,35 +243,36 @@
if (this.platform.administrativeDivision == null) {
this.platform.administrativeDivision = this.platform.deviceGBId.substr(0, 6);
}
-
},
onSubmit: function () {
- var that = this;
- that.$axios({
+ this.saveForm()
+ },
+ saveForm: function (){
+ this.$axios({
method: 'post',
url: this.saveUrl,
- data: that.platform
- }).then(function (res) {
- if (res.data.code === 0) {
- that.$message({
- showClose: true,
- message: "淇濆瓨鎴愬姛",
- type: "success",
- });
- that.showDialog = false;
- if (that.listChangeCallback != null) {
- that.listChangeCallback();
- }
- }else {
- that.$message({
- showClose: true,
- message: res.data.msg,
- type: "error",
- });
+ 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();
}
- }).catch(function (error) {
- console.log(error);
- });
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ }).catch((error)=> {
+ console.log(error);
+ });
},
close: function () {
this.showDialog = false;
@@ -278,6 +283,7 @@
enable: true,
ptz: true,
rtcp: false,
+ asMessageChannel: false,
name: null,
serverGBId: null,
administrativeDivision: null,
@@ -289,11 +295,10 @@
devicePort: null,
username: null,
password: null,
- expires: 300,
+ expires: 3600,
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
startOfflinePush: false,
catalogGroup: 1,
}
@@ -302,10 +307,12 @@
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);
@@ -313,10 +320,19 @@
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>
--
Gitblit v1.8.0