From f595ea40ebacb61dd84947fd2ba029657ac5a0a9 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 16:14:54 +0800
Subject: [PATCH] fix:接口修改
---
src/views/UVA/index1.vue | 7 +++----
src/components/Wind/Map.vue | 3 +--
src/views/UVA/index1Copy.vue | 3 +--
src/views/deviceDetail/index.vue | 6 ++----
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index 7578943..fce77ec 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -333,7 +333,6 @@
import RegionalOverview from '@/components/Wind/RegionalOverview' // ������������������
import { mapGetters } from 'vuex'
import { gcj02towgs84 } from '@/assets/json/transform'
-import requestObj from '@/utils/request'
export default {
components: { RegionalOverview },
props: {
@@ -1524,7 +1523,7 @@
this.getParamsData()
setTimeout(() => {
$.getJSON(
- `${requestObj.baseUrl}/screen_api_v2/screen/windAndDeviceDataByArea`,
+ 'http://47.99.64.149:8080/api/screen_api_v2/screen/windAndDeviceDataByArea',
{ monitorPointId: this.$store.state.monitorPointId },
(data) => {
// ������������������
diff --git a/src/views/UVA/index1.vue b/src/views/UVA/index1.vue
index a977493..d68fdf6 100644
--- a/src/views/UVA/index1.vue
+++ b/src/views/UVA/index1.vue
@@ -90,7 +90,6 @@
import axios from 'axios'
import { getToken } from '@/utils/auth'
import json from '@/assets/json/sensor.json'
-import requestObj from '@/utils/request'
export default {
filters: {
sensorFilter: function(value) {
@@ -140,7 +139,7 @@
this.asideData.activeAreaKey = -1
this.asideData.activeKey = index
- axios.get(`${requestObj.baseUrl}/queryTimeSlot`, {
+ axios.get('http://47.99.64.149:8081/api/uav/queryTimeSlot', {
params: {
organizationId: this.$store.state.orgId,
date: item
@@ -197,7 +196,7 @@
this.map.remove(this.textMarkers.markers)
}
this.asideData.activeAreaKey = index
- axios.get(`${requestObj.baseUrl}/uav/queryDataByBatch`, {
+ axios.get('http://47.99.64.149:8081/api/uav/queryDataByBatch', {
params: {
batch: item.batch
},
@@ -372,7 +371,7 @@
},
// ������������������������������������������
getDate() {
- axios.get(`${requestObj.baseUrl}/uav/queryDate`, {
+ axios.get('http://47.99.64.149:8081/api/uav/queryDate', {
params: {
organizationId: this.$store.state.orgId
},
diff --git a/src/views/UVA/index1Copy.vue b/src/views/UVA/index1Copy.vue
index 52aa71b..fda0c10 100644
--- a/src/views/UVA/index1Copy.vue
+++ b/src/views/UVA/index1Copy.vue
@@ -37,7 +37,6 @@
import axios from 'axios'
import { getToken } from '@/utils/auth'
-import requestObj from '@/utils/request'
export default {
data() {
return {
@@ -241,7 +240,7 @@
},
// ������������������������������������������
getDate() {
- axios.get(`${requestObj.baseUrl}/uav/test`, {
+ axios.get('http://47.99.64.149:8081/api/uav/test', {
params: {
batch: '2021-07-08 01:00:00'
},
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 0420510..1ffb0e9 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -338,7 +338,6 @@
// ���������import������������������from'������������������';
import json from '@/assets/json/sensor.json'
-import requestObj from '@/utils/request'
import * as echarts from 'echarts'
// import { parse } from 'path-to-regexp'
// import LineChart from '@/components/Echarts/LineChart'
@@ -712,12 +711,11 @@
// var param = this.macName
// ������URL
var socketUrl
- console.log('requestObj.baseUrl', requestObj.baseUrl)
if (this.equipment === 'car') {
- socketUrl = requestObj.baseUrl + '/cruiserWebsocket/' + this.macName
+ socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = requestObj.baseUrl + '/singleDevice/' + this.macName
+ socketUrl = 'http://47.99.64.149:8081/api/singleDevice/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
}
// ������http���WS
--
Gitblit v1.8.0