From d1b793c51a67e7aebf04d35c0200b21681337024 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 15:13:54 +0800
Subject: [PATCH] fix:接口修改和echarts修改
---
src/components/Echarts/PieChartNew.vue | 3 +--
src/views/UVA/index1.vue | 9 +++++----
src/components/Wind/Map.vue | 3 ++-
src/views/UVA/index1Copy.vue | 4 ++--
src/views/deviceDetail/index.vue | 11 ++++++++---
src/components/Echarts/BarChart.vue | 4 +---
6 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/components/Echarts/BarChart.vue b/src/components/Echarts/BarChart.vue
index aa2f02b..f296750 100644
--- a/src/components/Echarts/BarChart.vue
+++ b/src/components/Echarts/BarChart.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
// require('echarts/theme/macarons') // echarts theme
// import resize from './mixins/resize'
@@ -40,11 +40,9 @@
},
watch: {
datas(n) {
-
this.initChart()
},
datas1(n) {
-
this.initChart()
}
},
diff --git a/src/components/Echarts/PieChartNew.vue b/src/components/Echarts/PieChartNew.vue
index 95ff770..42e0469 100644
--- a/src/components/Echarts/PieChartNew.vue
+++ b/src/components/Echarts/PieChartNew.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
export default {
props: {
datas: {
@@ -34,7 +34,6 @@
},
watch: {
datas(val, oldVal) {
-
this.initChart()
}
},
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index fce77ec..7578943 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -333,6 +333,7 @@
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: {
@@ -1523,7 +1524,7 @@
this.getParamsData()
setTimeout(() => {
$.getJSON(
- 'http://47.99.64.149:8080/api/screen_api_v2/screen/windAndDeviceDataByArea',
+ `${requestObj.baseUrl}/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 f0bacaf..a977493 100644
--- a/src/views/UVA/index1.vue
+++ b/src/views/UVA/index1.vue
@@ -90,7 +90,7 @@
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) {
@@ -139,7 +139,8 @@
getTimeAreaData(item, index) {
this.asideData.activeAreaKey = -1
this.asideData.activeKey = index
- axios.get('http://47.99.64.149:8081/api/uav/queryTimeSlot', {
+
+ axios.get(`${requestObj.baseUrl}/queryTimeSlot`, {
params: {
organizationId: this.$store.state.orgId,
date: item
@@ -196,7 +197,7 @@
this.map.remove(this.textMarkers.markers)
}
this.asideData.activeAreaKey = index
- axios.get('http://47.99.64.149:8081/api/uav/queryDataByBatch', {
+ axios.get(`${requestObj.baseUrl}/uav/queryDataByBatch`, {
params: {
batch: item.batch
},
@@ -371,7 +372,7 @@
},
// ������������������������������������������
getDate() {
- axios.get('http://47.99.64.149:8081/api/uav/queryDate', {
+ axios.get(`${requestObj.baseUrl}/uav/queryDate`, {
params: {
organizationId: this.$store.state.orgId
},
diff --git a/src/views/UVA/index1Copy.vue b/src/views/UVA/index1Copy.vue
index 47206a8..52aa71b 100644
--- a/src/views/UVA/index1Copy.vue
+++ b/src/views/UVA/index1Copy.vue
@@ -37,7 +37,7 @@
import axios from 'axios'
import { getToken } from '@/utils/auth'
-
+import requestObj from '@/utils/request'
export default {
data() {
return {
@@ -241,7 +241,7 @@
},
// ������������������������������������������
getDate() {
- axios.get('http://47.99.64.149:8081/api/uav/test', {
+ axios.get(`${requestObj.baseUrl}/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 9b4ab1c..d4ec9ff 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -338,6 +338,8 @@
// ���������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'
// import draggable from 'vuedraggable'
@@ -446,6 +448,7 @@
watch: {
PM2_5Data(val) {
// console.log('���������' + val)
+ this.myChart = null
this.drawChart()
},
leftaSide(n, o) {
@@ -702,6 +705,7 @@
if (this.ws) {
this.ws.close()
}
+ console.log('socketUrl', socketUrl, this.macNamel)
var that = this
// ������������
// var param = this.accountId + '&' + this.orgId + '&' + this.macName
@@ -709,13 +713,14 @@
// ������URL
var socketUrl
if (this.equipment === 'car') {
- socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
+ socketUrl = `${requestObj.baseUrl}cruiserWebsocket/` + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = 'http://47.99.64.149:8081/api/singleDevice/' + this.macName
+ socketUrl = `${requestObj.baseUrl}singleDevice/` + this.macName
// socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
}
// ������http���WS
+
socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws')
this.ws = new WebSocket(socketUrl)
@@ -1231,7 +1236,7 @@
const that = this
var bar_dv = this.$refs.main
if (bar_dv) {
- that.myChart = this.$echarts.init(bar_dv)
+ that.myChart = echarts.init(bar_dv)
var option = {
title: {
left: 'center',
--
Gitblit v1.8.0