#227 release

已合併
lixin 10 月之前 將 7 次代碼提交從 release合併至 master
  1. +1
    -1
      src/layout/components/Header/index.vue
  2. +3
    -3
      src/views/dashboard/components/OneMap.vue
  3. +2
    -3
      src/views/dashboard/components/Underlay.vue
  4. +2
    -3
      src/views/early-warning/fire/components/FlightDrawer.vue

+ 1
- 1
src/layout/components/Header/index.vue 查看文件

@@ -11,7 +11,7 @@
<ul ref="scrollRef">
<li v-for="(item,index) in list" :key="index" @click="handleClick(item)">
<n-ellipsis :tooltip="false">
{{ `${item.airportName}正在执行紧急任务,${item.airportStatus}` }}
{{ `${item.airportName}正在执行紧急任务,${item.airportStatus || '飞行中'}` }}
</n-ellipsis>
</li>
</ul>

+ 3
- 3
src/views/dashboard/components/OneMap.vue 查看文件

@@ -45,7 +45,6 @@ import {
airportList, getWarning
} from '@/api/dashboard/index.js'
import { getTaskDetail } from '@/api/task/index.js'
import { gcj02towgs84 } from '@/utils/coordinate-util.js'
import AirInfo from './AirInfo.vue'
import ProblemInfo from './ProblemInfo.vue'
import SuppliesInfo from './SuppliesInfo.vue'
@@ -281,10 +280,11 @@ export default {
if (data.airportsAll.length > 0) {
for (let i = 0; i < data.airportsAll.length; i++) {
const airport = data.airportsAll[i]
const lngLat = gcj02towgs84(
const lngLat = [
parseFloat(airport.longitude),
parseFloat(airport.latitude)
)
]

const feature = new Feature({
geometry: new Point(fromLonLat(lngLat))
})

+ 2
- 3
src/views/dashboard/components/Underlay.vue 查看文件

@@ -21,7 +21,6 @@ import { styleList } from '@/utils/style.js'
import { getTrackList } from '@/api/task/index.js'
import { useInspectionStore } from '@/store/modules/inspection.js'
import { airportList, getWarningInfo } from '@/api/dashboard/index.js'
import { gcj02towgs84 } from '@/utils/coordinate-util.js'
import uav_icon from '@/assets/images/airport.png'
import warningIcon from '@/assets/gis/images/fire.png'
import gcj02Mecator from '@/utils/map/gcj02Mecator.js'
@@ -120,10 +119,10 @@ export default {
for (let i = 0; i < res.data.length; i++) {
if (id === res.data[i].id) {
const airport = res.data[i]
const lngLat = gcj02towgs84(
const lngLat = [
parseFloat(airport.longitude),
parseFloat(airport.latitude)
)
]
const feature = new Feature({
geometry: new Point(fromLonLat(lngLat))
})

+ 2
- 3
src/views/early-warning/fire/components/FlightDrawer.vue 查看文件

@@ -59,7 +59,6 @@ import warningIcon from '@/assets/gis/images/fire.png'
// 视频组件
import VideoPlayer from '@/components/VideoPlayer/index.vue'
import gcj02Mecator from '@/utils/map/gcj02Mecator.js'
import { gcj02towgs84 } from '@/utils/coordinate-util.js'
export default defineComponent({
name: 'FlightDrawer',
components: { VideoPlayer },
@@ -160,10 +159,10 @@ export default defineComponent({
for (let i = 0; i < res.data.length; i++) {
if (id === res.data[i].id) {
const airport = res.data[i]
const lngLat = gcj02towgs84(
const lngLat = [
parseFloat(airport.longitude),
parseFloat(airport.latitude)
)
]
const feature = new Feature({
geometry: new Point(fromLonLat(lngLat))
})

Loading…
取消
儲存