From 4172e6c64b1e18ff18958db58fec5a378d0a37dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 17:43:33 +0800
Subject: [PATCH] 修复可空时间参数的校验 #784
---
web_src/src/components/dialog/platformEdit.vue | 140 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 106 insertions(+), 34 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 62a6957..2a41e6a 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -37,12 +37,15 @@
<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 label="琛屾斂鍖哄垝" prop="administrativeDivision">
+ <el-input v-model="platform.administrativeDivision" clearable></el-input>
</el-form-item>
<el-form-item label="SIP璁よ瘉瀵嗙爜" prop="password">
<el-input v-model="platform.password" ></el-input>
@@ -63,6 +66,24 @@
<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="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"
@@ -75,8 +96,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">{{
@@ -116,12 +139,14 @@
showDialog: false,
isLoging: false,
onSubmit_text: "绔嬪嵆鍒涘缓",
+ saveUrl: "/api/platform/save",
platform: {
id: null,
enable: true,
ptz: true,
rtcp: false,
+ asMessageChannel: false,
name: null,
serverGBId: null,
serverGBDomain: null,
@@ -136,7 +161,10 @@
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
+ startOfflinePush: false,
+ catalogGroup: 1,
+ administrativeDivision: null,
+ treeType: "BusinessGroup",
},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
@@ -163,16 +191,22 @@
var that = this;
if (platform == null) {
this.onSubmit_text = "绔嬪嵆鍒涘缓";
+ this.saveUrl = "/api/platform/add";
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;
+ 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);
});
@@ -181,6 +215,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;
@@ -195,9 +230,13 @@
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";
}
this.showDialog = true;
this.listChangeCallback = callback;
@@ -210,29 +249,40 @@
deviceGBIdChange: function () {
this.platform.username = this.platform.deviceGBId ;
+ if (this.platform.administrativeDivision == null) {
+ this.platform.administrativeDivision = this.platform.deviceGBId.substr(0, 6);
+ }
+
},
onSubmit: function () {
- console.log("onSubmit");
- var that = this;
- that.$axios({
+ this.saveForm()
+ },
+ saveForm: function (){
+ this.$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();
- }
+ 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();
}
- }).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;
@@ -243,8 +293,10 @@
enable: true,
ptz: true,
rtcp: false,
+ asMessageChannel: false,
name: null,
serverGBId: null,
+ administrativeDivision: null,
serverGBDomain: null,
serverIP: null,
serverPort: null,
@@ -257,17 +309,21 @@
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
- shareAllLiveStream: false,
+ treeType: "BusinessGroup",
+ 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);
@@ -275,9 +331,25 @@
return result;
},
checkExpires: function() {
- if (this.platform.enable && this.platform.expires == "0") {
+ if (this.platform.enable && this.platform.expires === "0") {
this.platform.expires = "300";
}
+ },
+ rtcpCheckBoxChange: function (result){
+ if (result) {
+ this.$message({
+ showClose: true,
+ message: "寮�鍚疪TCP淇濇椿闇�瑕佷笂绾у钩鍙版敮鎸侊紝鍙互閬垮厤鏃犳晥鎺ㄦ祦",
+ type: "warning",
+ });
+ }
+ },
+ treeTypeChange: function (){
+ this.$message({
+ showClose: true,
+ message: "淇敼鐩綍缁撴瀯浼氬鑷村叧鑱旂洰褰曚笌閫氶亾鏁版嵁琚竻绌猴紝淇濆瓨鍚庣敓鏁�",
+ type: "warning",
+ });
}
},
};
--
Gitblit v1.8.0