quanyawei
2023-10-08 f595ea40ebacb61dd84947fd2ba029657ac5a0a9
fix:接口修改
4 files modified
19 ■■■■■ changed files
src/components/Wind/Map.vue 3 ●●●● patch | view | raw | blame | history
src/views/UVA/index1.vue 7 ●●●●● patch | view | raw | blame | history
src/views/UVA/index1Copy.vue 3 ●●●● patch | view | raw | blame | history
src/views/deviceDetail/index.vue 6 ●●●●● patch | view | raw | blame | history
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) => {
            // 遍历所有图层
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
        },
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'
        },
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