From 8f9a53029632f258bbafa8f6dc2c896759206695 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 02 三月 2022 09:22:20 +0800
Subject: [PATCH] Merge pull request #360 from TristingChen/alarm-test
---
web_src/src/components/devicePosition.vue | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/web_src/src/components/devicePosition.vue b/web_src/src/components/devicePosition.vue
index dfee0b1..777b11e 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -171,13 +171,14 @@
this.endTime = null;
}
let self = this;
- this.$axios.get(`/api/position/history/${this.deviceId}`, {
+ this.$axios({
+ method: 'get',
+ url:`/api/position/history/${this.deviceId}`,
params: {
start: self.startTime,
end: self.endTime,
},
- })
- .then(function (res) {
+ }).then(function (res) {
self.total = res.data.length;
self.mobilePositionList = res.data;
console.log(self.mobilePositionList);
@@ -192,8 +193,7 @@
self.showMarkPoints(self);
});
}
- })
- .catch(function (error) {
+ }).catch(function (error) {
console.log(error);
});
},
@@ -202,8 +202,10 @@
this.mapPointList = [];
this.mobilePositionList = [];
let self = this;
- this.$axios.get(`/api/position/latest/${this.deviceId}`)
- .then(function (res) {
+ this.$axios({
+ method: 'get',
+ url:`/api/position/latest/${this.deviceId}`
+ }).then(function (res) {
console.log(res.data);
self.total = res.data.length;
self.mobilePositionList.push(res.data);
@@ -219,20 +221,20 @@
self.showMarkPoints(self);
});
}
- })
- .catch(function (error) {
+ }).catch(function (error) {
console.log(error);
});
},
subscribeMobilePosition: function() {
let self = this;
- this.$axios.get(`/api/position/subscribe/${this.deviceId}`, {
- params: {
- expires: self.expired,
- interval: self.interval,
- },
- })
- .then(function (res) {
+ this.$axios({
+ method: 'get',
+ url:`/api/position/subscribe/${this.deviceId}`,
+ params: {
+ expires: self.expired,
+ interval: self.interval,
+ },
+ }).then(function (res) {
console.log(res.data);
})
.catch(function (error) {
@@ -241,16 +243,17 @@
},
unSubscribeMobilePosition: function() {
let self = this;
- this.$axios.get(`/api/position/subscribe/${this.deviceId}`, {
- params: {
- expires: 0,
- interval: self.interval,
- },
+ this.$axios({
+ method: 'get',
+ url:`/api/position/subscribe/${this.deviceId}`,
+ params: {
+ expires: 0,
+ interval: self.interval,
+ },
})
.then(function (res) {
console.log(res.data);
- })
- .catch(function (error) {
+ }).catch(function (error) {
console.log(error);
});
},
--
Gitblit v1.8.0