husq
2023-09-19 f4cb15adb08fa2e142918a5c534c383fad238aa6
地图默认中心点修改
6 files modified
44 ■■■■■ changed files
src/api/http/request.ts 5 ●●●● patch | view | raw | blame | history
src/components/GMap.vue 22 ●●●●● patch | view | raw | blame | history
src/components/g-map/DroneControlPanel.vue 2 ●●● patch | view | raw | blame | history
src/hooks/use-g-map-tsa.ts 2 ●●● patch | view | raw | blame | history
src/hooks/use-g-map.ts 12 ●●●● patch | view | raw | blame | history
src/pages/page-web/projects/tsa.vue 1 ●●●● patch | view | raw | blame | history
src/api/http/request.ts
@@ -35,7 +35,10 @@
instance.interceptors.response.use(
  response => {
    // console.info('URL: ' + response.config.baseURL + response.config.url, '\nData: ', response.data, '\nResponse:', response)
    const whiteList = ['/manage/api/v1/live/streams/stop']
    if (whiteList.includes(response.config.url)) {
      return Promise.reject(response.data)
    }
    // 处理消息返回
    // if (response.data.code && !response.data.success) {
    //   message.error(response.data.message)
src/components/GMap.vue
@@ -953,16 +953,22 @@
    }
    // 飞行设备关闭
    const closeFly = async () => {
      const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
      aircraftList.value.forEach(item => {
        const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + item.value + '/' + 'normal-0'
        stopLivestream({
          video_id: videoId
        }).then(res => {
          console.log(res, 'res')
          if (res.code === 0) {
            aircraftUrl.value = ''
          }
        }).catch(e => {
          console.log(e, 'errrrrrrrrrrrrrr')
        })
      })
      // const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
      aircraftList.value = []
      aircraSelected.value = ''
      stopLivestream({
        video_id: videoId
      }).then(res => {
        if (res.code === 0) {
          aircraftUrl.value = ''
        }
      })
    }
    watch(() => store.state.deviceStatusEvent,
      data => {
src/components/g-map/DroneControlPanel.vue
@@ -115,7 +115,7 @@
              </div>
            </template>
            <Button size="small" ghost @click="onShowTakeoffToPointPopover" >
              <span>起飞</span>
              <span>一键起飞</span>
            </Button>
          </DroneControlPopover>
          <Button :loading="cmdItem.loading" size="small" ghost @click="sendControlCmd(cmdItem, 0)">
src/hooks/use-g-map-tsa.ts
@@ -104,6 +104,6 @@
    marker: markers,
    initMarker,
    removeMarker,
    moveTo
    moveTo,
  }
}
src/hooks/use-g-map.ts
@@ -15,11 +15,10 @@
    }).then((AMap) => {
      state.aMap = AMap
      state.map = new AMap.Map(container, {
        center: [113.943225499, 22.577673716],
        center: [115.85666327144976, 28.62452712442823],
        zoom: 15
      })
      state.mouseTool = new AMap.MouseTool(state.map)
      // 挂在到全局
      app.config.globalProperties.$aMap = state.aMap
      app.config.globalProperties.$map = state.map
@@ -32,8 +31,15 @@
  function globalPropertiesConfig (app:App) {
    initMap('g-container', app)
  }
  async function setCenter (position: any) {
    state.map?.setCenter(position)
  }
  function getCenter () {
    const center = state.map?.getCenter()
  }
  return {
    globalPropertiesConfig,
    setCenter,
    getCenter
  }
}
src/pages/page-web/projects/tsa.vue
@@ -243,7 +243,6 @@
<script lang="ts" setup>
import { computed, onMounted, reactive, ref, watch, WritableComputedRef } from 'vue'
import { EDeviceTypeName, ELocalStorageKey } from '/@/types'
import JessibucaVideo from '/@/components/Jessibuca/Jessibuca.vue'
import noData from '/@/assets/icons/no-data.png'
import rc from '/@/assets/icons/rc.png'
import { OnlineDevice, EModeCode, OSDVisible, EDockModeCode, DeviceOsd, EDockModeText, EModeText } from '/@/types/device'