From 03d6ad289baddf8feed64ffca5f1b13828bea710 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 九月 2022 14:50:28 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/platformEdit.vue | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 512f00a..ef28b4c 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -97,7 +97,6 @@
<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.startOfflinePush"></el-checkbox>
</el-form-item>
<el-form-item>
@@ -159,7 +158,6 @@
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
startOfflinePush: false,
catalogGroup: 1,
administrativeDivision: null,
@@ -196,13 +194,16 @@
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.treeType = "BusinessGroup";
- 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.treeType = "BusinessGroup";
+ that.platform.administrativeDivision = res.data.data.username.substr(0, 6);
+ }
+
}).catch(function (error) {
console.log(error);
});
@@ -225,7 +226,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;
@@ -268,30 +268,29 @@
}
},
saveForm: function (){
- var that = this;
- that.$axios({
+ this.$axios({
method: 'post',
url: this.saveUrl,
- data: that.platform
- }).then(function (res) {
+ data: this.platform
+ }).then((res) =>{
if (res.data.code === 0) {
- that.$message({
+ this.$message({
showClose: true,
message: "淇濆瓨鎴愬姛",
type: "success",
});
- that.showDialog = false;
- if (that.listChangeCallback != null) {
- that.listChangeCallback();
+ this.showDialog = false;
+ if (this.listChangeCallback != null) {
+ this.listChangeCallback();
}
}else {
- that.$message({
+ this.$message({
showClose: true,
message: res.data.msg,
type: "error",
});
}
- }).catch(function (error) {
+ }).catch((error)=> {
console.log(error);
});
},
@@ -320,7 +319,6 @@
transport: "UDP",
characterSet: "GB2312",
treeType: "BusinessGroup",
- shareAllLiveStream: false,
startOfflinePush: false,
catalogGroup: 1,
}
@@ -329,10 +327,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);
--
Gitblit v1.8.0