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 |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 62a6957..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>
@@ -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"
@@ -77,6 +92,7 @@
                 <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>
                 <el-button type="primary" @click="onSubmit">{{
@@ -116,6 +132,7 @@
       showDialog: false,
       isLoging: false,
       onSubmit_text: "绔嬪嵆鍒涘缓",
+      saveUrl: "/api/platform/save",
 
       platform: {
         id: null,
@@ -137,6 +154,9 @@
         transport: "UDP",
         characterSet: "GB2312",
         shareAllLiveStream: false,
+        startOfflinePush: false,
+        catalogGroup: 1,
+        administrativeDivision: null,
       },
       rules: {
         name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }],
@@ -163,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`
@@ -173,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);
         });
@@ -197,7 +219,11 @@
         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;
@@ -210,16 +236,19 @@
     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: "淇濆瓨鎴愬姛",
@@ -229,6 +258,12 @@
             if (that.listChangeCallback != null) {
               that.listChangeCallback();
             }
+          }else {
+            that.$message({
+              showClose: true,
+              message: res.data.msg,
+              type: "error",
+            });
           }
         }).catch(function (error) {
           console.log(error);
@@ -245,6 +280,7 @@
         rtcp: false,
         name: null,
         serverGBId: null,
+        administrativeDivision: null,
         serverGBDomain: null,
         serverIP: null,
         serverPort: null,
@@ -258,6 +294,8 @@
         transport: "UDP",
         characterSet: "GB2312",
         shareAllLiveStream: false,
+        startOfflinePush: false,
+        catalogGroup: 1,
       }
     },
     deviceGBIdExit: async function (deviceGbId) {

--
Gitblit v1.8.0