From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs，解决较高版本node打包时的警告
---
web_src/src/components/dialog/platformEdit.vue | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 1e51170..0caec32 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -44,6 +44,9 @@
<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>
</el-form-item>
@@ -61,6 +64,18 @@
>
<el-option label="UDP" value="UDP"></el-option>
<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">
@@ -140,6 +155,8 @@
characterSet: "GB2312",
shareAllLiveStream: false,
startOfflinePush: false,
+ catalogGroup: 1,
+ administrativeDivision: null,
},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
@@ -177,6 +194,7 @@
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);
});
@@ -202,6 +220,8 @@
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";
}
@@ -216,6 +236,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 () {
var that = this;
@@ -256,6 +280,7 @@
rtcp: false,
name: null,
serverGBId: null,
+ administrativeDivision: null,
serverGBDomain: null,
serverIP: null,
serverPort: null,
@@ -269,6 +294,8 @@
transport: "UDP",
characterSet: "GB2312",
shareAllLiveStream: false,
+ startOfflinePush: false,
+ catalogGroup: 1,
}
},
deviceGBIdExit: async function (deviceGbId) {
--
Gitblit v1.8.0