From 04f938ef623eb1f69a0b08ba8910bb5639372316 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期五, 06 五月 2022 12:19:44 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
---
web_src/src/components/dialog/platformEdit.vue | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 30 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index cc51652..0caec32 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -17,7 +17,7 @@
<el-input v-model="platform.name"></el-input>
</el-form-item>
<el-form-item label="SIP鏈嶅姟鍥芥爣缂栫爜" prop="serverGBId">
- <el-input v-model="platform.serverGBId" clearable></el-input>
+ <el-input v-model="platform.serverGBId" clearable @input="serverGBIdChange"></el-input>
</el-form-item>
<el-form-item label="SIP鏈嶅姟鍥芥爣鍩�" prop="serverGBDomain">
<el-input v-model="platform.serverGBDomain" clearable></el-input>
@@ -29,7 +29,7 @@
<el-input v-model="platform.serverPort" clearable type="number"></el-input>
</el-form-item>
<el-form-item label="璁惧鍥芥爣缂栧彿" prop="deviceGBId">
- <el-input v-model="platform.deviceGBId" clearable></el-input>
+ <el-input v-model="platform.deviceGBId" clearable @input="deviceGBIdChange"></el-input>
</el-form-item>
<el-form-item label="鏈湴IP" prop="deviceIp">
<el-input v-model="platform.deviceIp" :disabled="true"></el-input>
@@ -43,6 +43,9 @@
<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>
<el-form-item label="SIP璁よ瘉瀵嗙爜" prop="password">
<el-input v-model="platform.password" ></el-input>
@@ -63,6 +66,18 @@
<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="characterSet">
<el-select
v-model="platform.characterSet"
@@ -76,7 +91,8 @@
<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="RTCP淇濇椿" v-model="platform.rtcp"></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>
<el-button type="primary" @click="onSubmit">{{
@@ -97,28 +113,6 @@
name: "platformEdit",
props: {},
computed: {},
- created() {
- this.platform = {
- id: null,
- enable: true,
- ptz: true,
- rtcp: false,
- name: null,
- serverGBId: null,
- serverGBDomain: null,
- serverIP: null,
- serverPort: null,
- deviceGBId: null,
- deviceIp: null,
- devicePort: null,
- username: null,
- password: null,
- expires: 300,
- keepTimeout: 60,
- transport: "UDP",
- characterSet: "GB2312",
- }
- },
data() {
var deviceGBIdRules = async (rule, value, callback) => {
console.log(value);
@@ -138,6 +132,7 @@
showDialog: false,
isLoging: false,
onSubmit_text: "绔嬪嵆鍒涘缓",
+ saveUrl: "/api/platform/save",
platform: {
id: null,
@@ -158,6 +153,10 @@
keepTimeout: 60,
transport: "UDP",
characterSet: "GB2312",
+ shareAllLiveStream: false,
+ startOfflinePush: false,
+ catalogGroup: 1,
+ administrativeDivision: null,
},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
@@ -184,6 +183,7 @@
var that = this;
if (platform == null) {
this.onSubmit_text = "绔嬪嵆鍒涘缓";
+ this.saveUrl = "/api/platform/add";
this.$axios({
method: 'get',
url:`/api/platform/server_config`
@@ -194,25 +194,61 @@
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);
}).catch(function (error) {
console.log(error);
});
}else {
- this.platform = platform;
+ this.platform.id = platform.id;
+ this.platform.enable = platform.enable;
+ this.platform.ptz = platform.ptz;
+ this.platform.rtcp = platform.rtcp;
+ this.platform.name = platform.name;
+ this.platform.serverGBId = platform.serverGBId;
+ this.platform.serverGBDomain = platform.serverGBDomain;
+ this.platform.serverIP = platform.serverIP;
+ this.platform.serverPort = platform.serverPort;
+ this.platform.deviceGBId = platform.deviceGBId;
+ this.platform.deviceIp = platform.deviceIp;
+ this.platform.devicePort = platform.devicePort;
+ this.platform.username = platform.username;
+ this.platform.password = platform.password;
+ this.platform.expires = platform.expires;
+ 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.onSubmit_text = "淇濆瓨";
+ this.saveUrl = "/api/platform/save";
}
this.showDialog = true;
this.listChangeCallback = callback;
},
+ serverGBIdChange: function () {
+ if (this.platform.serverGBId.length > 10) {
+ this.platform.serverGBDomain = this.platform.serverGBId.substr(0, 10);
+ }
+ },
+ 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({
method: 'post',
- url:`/api/platform/save`,
+ url: this.saveUrl,
data: that.platform
}).then(function (res) {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.$message({
showClose: true,
message: "淇濆瓨鎴愬姛",
@@ -222,16 +258,45 @@
if (that.listChangeCallback != null) {
that.listChangeCallback();
}
+ }else {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
}
}).catch(function (error) {
console.log(error);
});
},
close: function () {
- console.log("鍏抽棴娣诲姞瑙嗛骞冲彴");
this.showDialog = false;
this.$refs.platform1.resetFields();
this.$refs.platform2.resetFields();
+ this.platform = {
+ id: null,
+ enable: true,
+ ptz: true,
+ rtcp: false,
+ name: null,
+ serverGBId: null,
+ administrativeDivision: null,
+ serverGBDomain: null,
+ serverIP: null,
+ serverPort: null,
+ deviceGBId: null,
+ deviceIp: null,
+ devicePort: null,
+ username: null,
+ password: null,
+ expires: 300,
+ keepTimeout: 60,
+ transport: "UDP",
+ characterSet: "GB2312",
+ shareAllLiveStream: false,
+ startOfflinePush: false,
+ catalogGroup: 1,
+ }
},
deviceGBIdExit: async function (deviceGbId) {
var result = false;
--
Gitblit v1.8.0