From 7565b2ea779ae973e894b6da051eb4119e49286d Mon Sep 17 00:00:00 2001
From: BradyXu <brady_xu@outlook.com>
Date: 星期三, 15 五月 2024 23:28:38 +0800
Subject: [PATCH] fix 优化及联本地IP选择
---
web_src/src/components/dialog/platformEdit.vue | 106 ++++++++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 06cb7c4..0a75222 100755
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -34,7 +34,7 @@
<el-form-item label="鏈湴IP" prop="deviceIp">
<el-select v-model="platform.deviceIp" placeholder="璇烽�夋嫨涓庝笂绾х浉閫氱殑缃戝崱" style="width: 100%">
<el-option
- v-for="ip in deviceIp"
+ v-for="ip in deviceIps"
:key="ip"
:label="ip"
:value="ip">
@@ -58,7 +58,7 @@
<el-input v-model="platform.username"></el-input>
</el-form-item>
<el-form-item label="SIP璁よ瘉瀵嗙爜" prop="password">
- <el-input v-model="platform.password" ></el-input>
+ <el-input v-model="platform.password"></el-input>
</el-form-item>
<el-form-item label="娉ㄥ唽鍛ㄦ湡(绉�)" prop="expires">
<el-input v-model="platform.expires"></el-input>
@@ -100,16 +100,17 @@
</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.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-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">{{
- onSubmit_text
- }}</el-button>
+ onSubmit_text
+ }}
+ </el-button>
<el-button @click="close">鍙栨秷</el-button>
</el-form-item>
</el-form>
@@ -172,52 +173,56 @@
administrativeDivision: "",
sendStreamIp: null,
},
- deviceIp: [], // 瀛樺偍鐢ㄦ埛閫夋嫨鐨勮澶嘔P
+ deviceIps: [], // 瀛樺偍鐢ㄦ埛璁惧IP鏁扮粍
rules: {
- name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
+ name: [{required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur"}],
serverGBId: [
- { required: true, message: "璇疯緭鍏IP鏈嶅姟鍥芥爣缂栫爜", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏IP鏈嶅姟鍥芥爣缂栫爜", trigger: "blur"},
],
serverGBDomain: [
- { required: true, message: "璇疯緭鍏IP鏈嶅姟鍥芥爣鍩�", trigger: "blur" },
+ {required: true, message: "璇疯緭鍏IP鏈嶅姟鍥芥爣鍩�", trigger: "blur"},
],
- serverIP: [{ required: true, message: "璇疯緭鍏IP鏈嶅姟IP", trigger: "blur" }],
- serverPort: [{ required: true, message: "璇疯緭鍏IP鏈嶅姟绔彛", trigger: "blur" }],
- deviceGBId: [{ validator: deviceGBIdRules, trigger: "blur" }],
- username: [{ required: false, message: "璇疯緭鍏IP璁よ瘉鐢ㄦ埛鍚�", trigger: "blur" }],
- password: [{ required: false, message: "璇疯緭鍏IP璁よ瘉瀵嗙爜", trigger: "blur" }],
- expires: [{ required: true, message: "璇疯緭鍏ユ敞鍐屽懆鏈�", trigger: "blur" }],
- keepTimeout: [{ required: true, message: "璇疯緭鍏ュ績璺冲懆鏈�", trigger: "blur" }],
- transport: [{ required: true, message: "璇烽�夋嫨淇′护浼犺緭", trigger: "blur" }],
- characterSet: [{ required: true, message: "璇烽�夋嫨缂栫爜瀛楃闆�", trigger: "blur" }],
+ serverIP: [{required: true, message: "璇疯緭鍏IP鏈嶅姟IP", trigger: "blur"}],
+ serverPort: [{required: true, message: "璇疯緭鍏IP鏈嶅姟绔彛", trigger: "blur"}],
+ deviceGBId: [{validator: deviceGBIdRules, trigger: "blur"}],
+ username: [{required: false, message: "璇疯緭鍏IP璁よ瘉鐢ㄦ埛鍚�", trigger: "blur"}],
+ password: [{required: false, message: "璇疯緭鍏IP璁よ瘉瀵嗙爜", trigger: "blur"}],
+ expires: [{required: true, message: "璇疯緭鍏ユ敞鍐屽懆鏈�", trigger: "blur"}],
+ keepTimeout: [{required: true, message: "璇疯緭鍏ュ績璺冲懆鏈�", trigger: "blur"}],
+ transport: [{required: true, message: "璇烽�夋嫨淇′护浼犺緭", trigger: "blur"}],
+ characterSet: [{required: true, message: "璇烽�夋嫨缂栫爜瀛楃闆�", trigger: "blur"}],
+ deviceIp: [{required: true, message: "璇烽�夋嫨鏈湴IP", trigger: "blur"}],
},
};
},
methods: {
openDialog: function (platform, callback) {
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);
+ this.$axios({
+ method: 'get',
+ url: `/api/platform/server_config`
+ }).then(function (res) {
+ if (platform == null) {
if (res.data.code === 0) {
that.platform.deviceGBId = res.data.data.username;
- that.deviceIp = res.data.data.deviceIp.split(',');
+ that.deviceIps = res.data.data.deviceIp.split(',');
+ that.platform.deviceIp = that.deviceIps[0];
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 {
+ } else {
+ that.deviceIps = res.data.data.deviceIp.split(',');
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ if (platform == null) {
+ this.onSubmit_text = "绔嬪嵆鍒涘缓";
+ this.saveUrl = "/api/platform/add";
+ } else {
this.platform.id = platform.id;
this.platform.enable = platform.enable;
this.platform.ptz = platform.ptz;
@@ -230,7 +235,7 @@
this.platform.serverIP = platform.serverIP;
this.platform.serverPort = platform.serverPort;
this.platform.deviceGBId = platform.deviceGBId;
- this.deviceIp = platform.deviceIp.split(',');
+ this.platform.deviceIp = platform.deviceIp;
this.platform.devicePort = platform.devicePort;
this.platform.username = platform.username;
this.platform.password = platform.password;
@@ -256,7 +261,7 @@
},
deviceGBIdChange: function () {
- this.platform.username = this.platform.deviceGBId ;
+ this.platform.username = this.platform.deviceGBId;
if (this.platform.administrativeDivision == null) {
this.platform.administrativeDivision = this.platform.deviceGBId.substr(0, 6);
}
@@ -264,12 +269,12 @@
onSubmit: function () {
this.saveForm()
},
- saveForm: function (){
+ saveForm: function () {
this.$axios({
method: 'post',
url: this.saveUrl,
data: this.platform
- }).then((res) =>{
+ }).then((res) => {
if (res.data.code === 0) {
this.$message({
showClose: true,
@@ -280,14 +285,14 @@
if (this.listChangeCallback != null) {
this.listChangeCallback();
}
- }else {
+ } else {
this.$message({
showClose: true,
message: res.data.msg,
type: "error",
});
}
- }).catch((error)=> {
+ }).catch((error) => {
console.log(error);
});
},
@@ -325,24 +330,25 @@
var result = false;
var that = this;
await that.$axios({
- method: 'get',
- url:`/api/platform/exit/${deviceGbId}`})
+ method: 'get',
+ url: `/api/platform/exit/${deviceGbId}`
+ })
.then(function (res) {
- if (res.data.code === 0) {
- result = res.data.data;
- }
+ if (res.data.code === 0) {
+ result = res.data.data;
+ }
})
.catch(function (error) {
console.log(error);
});
return result;
},
- checkExpires: function() {
+ checkExpires: function () {
if (this.platform.enable && this.platform.expires === "0") {
this.platform.expires = "3600";
}
},
- rtcpCheckBoxChange: function (result){
+ rtcpCheckBoxChange: function (result) {
if (result) {
this.$message({
showClose: true,
@@ -363,10 +369,12 @@
appearance: none;
margin: 0;
}
+
/* 鐏嫄 */
-input{
- -moz-appearance:textfield;
+input {
+ -moz-appearance: textfield;
}
+
.control-wrapper-not-used {
position: relative;
width: 6.25rem;
--
Gitblit v1.8.0