From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/platformEdit.vue | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue
index 4a916e8..34ee27d 100644
--- a/web_src/src/components/dialog/platformEdit.vue
+++ b/web_src/src/components/dialog/platformEdit.vue
@@ -75,7 +75,7 @@
</el-form-item>
<el-form-item label="鍏朵粬閫夐」">
<el-checkbox label="鍚敤" v-model="platform.enable" @change="checkExpires"></el-checkbox>
- <el-checkbox label="浜戝彴鎺у埗" v-model="platform.PTZEnable"></el-checkbox>
+ <el-checkbox label="浜戝彴鎺у埗" v-model="platform.ptz"></el-checkbox>
<el-checkbox label="RTCP淇濇椿" v-model="platform.rtcp"></el-checkbox>
</el-form-item>
<el-form-item>
@@ -120,28 +120,10 @@
showDialog: false,
isLoging: false,
onSubmit_text: "绔嬪嵆鍒涘缓",
- // platform: {
- // enable: false,
- // PTZEnable: 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",
- // },
+
platform: {
enable: true,
- PTZEnable: true,
+ ptz: true,
rtcp: false,
name: "娴嬭瘯001",
serverGBId: "34020000002000000001",
@@ -182,7 +164,7 @@
openDialog: function (platform, callback) {
var that = this;
this.$axios
- .get(`/api/platforms/serverconfig`)
+ .get(`/api/platform/server_config`)
.then(function (res) {
console.log(res);
that.platform.deviceGBId = res.data.username;
@@ -207,7 +189,7 @@
console.log("onSubmit");
var that = this;
that.$axios
- .post(`/api/platforms/save`, that.platform)
+ .post(`/api/platform/save`, that.platform)
.then(function (res) {
console.log(res);
console.log(res.data == "success");
@@ -237,7 +219,7 @@
var result = false;
var that = this;
await that.$axios
- .post(`/api/platforms/exit/${deviceGbId}`)
+ .post(`/api/platform/exit/${deviceGbId}`)
.then(function (res) {
result = res.data;
})
--
Gitblit v1.8.0