From c0e5478a847ff095e2386562de6991cff9c5e949 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 八月 2022 08:45:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/platformEdit.vue | 88 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 0caec32..d2ebb84 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -78,6 +78,12 @@
<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%" >
+ <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"
@@ -91,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>
@@ -153,10 +158,10 @@
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
startOfflinePush: false,
catalogGroup: 1,
administrativeDivision: null,
+ treeType: "BusinessGroup",
},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
@@ -189,12 +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.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);
});
@@ -217,11 +226,11 @@
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;
this.platform.administrativeDivision = platform.administrativeDivision;
+ this.platform.treeType = platform.treeType;
this.onSubmit_text = "淇濆瓨";
this.saveUrl = "/api/platform/save";
}
@@ -242,32 +251,49 @@
},
onSubmit: function () {
+ if (this.onSubmit_text === "淇濆瓨") {
+ this.$confirm("淇敼鐩綍缁撴瀯浼氬鑷村叧鑱旂洰褰曚笌閫氶亾鏁版嵁琚竻绌�", '鎻愮ず', {
+ dangerouslyUseHTMLString: true,
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ center: true,
+ type: 'warning'
+ }).then(() => {
+ this.saveForm()
+ }).catch(() => {
+
+ });
+ }else {
+ this.saveForm()
+ }
+ },
+ saveForm: function (){
var that = this;
that.$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",
- });
+ if (res.data.code === 0) {
+ that.$message({
+ showClose: true,
+ message: "淇濆瓨鎴愬姛",
+ type: "success",
+ });
+ that.showDialog = false;
+ if (that.listChangeCallback != null) {
+ that.listChangeCallback();
}
- }).catch(function (error) {
- console.log(error);
- });
+ }else {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
},
close: function () {
this.showDialog = false;
@@ -293,7 +319,7 @@
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
+ treeType: "BusinessGroup",
startOfflinePush: false,
catalogGroup: 1,
}
@@ -305,7 +331,9 @@
method: 'post',
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