Compare commits
2 Commits
2ce3e8c27e
...
be9fb71e66
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be9fb71e66 | ||
|
|
2f991d8934 |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 30 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 30 KiB |
@ -8,7 +8,8 @@
|
|||||||
import mapboxgl from 'mapbox-gl'
|
import mapboxgl from 'mapbox-gl'
|
||||||
import { MapboxStyleSwitcherControl, FollowControl, CustomFullscreenControl, NoFlyControl, RestrictflyControl, SaveToFileControl, PolygonToggleControl } from '@/utils/mapboxgl_plugs'
|
import { MapboxStyleSwitcherControl, FollowControl, CustomFullscreenControl, NoFlyControl, RestrictflyControl, SaveToFileControl, PolygonToggleControl } from '@/utils/mapboxgl_plugs'
|
||||||
import planeIcon from '@/assets/svg/plane.svg'
|
import planeIcon from '@/assets/svg/plane.svg'
|
||||||
// import unlineIcon from '@/assets/svg/plane_unline.svg'
|
import planeRunIcon from '@/assets/svg/plane_run.svg'
|
||||||
|
import unlineIcon from '@/assets/svg/plane_unline.svg'
|
||||||
import civilIcon from '@/assets/svg/civil.svg'
|
import civilIcon from '@/assets/svg/civil.svg'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@ -87,22 +88,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
/** 动态开关地图样式切换控件 */
|
|
||||||
enableSwitch (val) {
|
|
||||||
if (!this.map) return
|
|
||||||
if (val) {
|
|
||||||
if (!this.styleSwitcherControlRef) {
|
|
||||||
const control = new MapboxStyleSwitcherControl(this.mapStyleList, 'iconfont icon-duozhang f-s-20', this.currentStyleIndex)
|
|
||||||
this.map.addControl(control, 'top-right')
|
|
||||||
this.styleSwitcherControlRef = control
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (this.styleSwitcherControlRef) {
|
|
||||||
try { this.map.removeControl(this.styleSwitcherControlRef) } catch (e) { /* noop */ }
|
|
||||||
this.styleSwitcherControlRef = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
/** 动态开关全屏控件(enableZoom) */
|
/** 动态开关全屏控件(enableZoom) */
|
||||||
enableZoom (val) {
|
enableZoom (val) {
|
||||||
if (!this.map) return
|
if (!this.map) return
|
||||||
@ -118,6 +103,22 @@ export default {
|
|||||||
this.fullscreenControlRef = null
|
this.fullscreenControlRef = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
/** 动态开关地图样式切换控件 */
|
||||||
|
enableSwitch (val) {
|
||||||
|
if (!this.map) return
|
||||||
|
if (val) {
|
||||||
|
if (!this.styleSwitcherControlRef) {
|
||||||
|
const control = new MapboxStyleSwitcherControl(this.mapStyleList, 'iconfont icon-duozhang f-s-20', this.currentStyleIndex)
|
||||||
|
this.map.addControl(control, 'top-right')
|
||||||
|
this.styleSwitcherControlRef = control
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (this.styleSwitcherControlRef) {
|
||||||
|
try { this.map.removeControl(this.styleSwitcherControlRef) } catch (e) { /* noop */ }
|
||||||
|
this.styleSwitcherControlRef = null
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async mounted () {
|
async mounted () {
|
||||||
@ -253,13 +254,6 @@ export default {
|
|||||||
this.map.addControl(this.fullscreenControlRef, 'top-right')
|
this.map.addControl(this.fullscreenControlRef, 'top-right')
|
||||||
}
|
}
|
||||||
|
|
||||||
// 地图样式选择控件
|
|
||||||
// 自定义地图样式列表
|
|
||||||
if (this.enableSwitch) {
|
|
||||||
this.styleSwitcherControlRef = new MapboxStyleSwitcherControl(this.mapStyleList, 'iconfont icon-duozhang f-s-20', this.currentStyleIndex)
|
|
||||||
this.map.addControl(this.styleSwitcherControlRef, 'top-right')
|
|
||||||
}
|
|
||||||
|
|
||||||
// 飞机跟随
|
// 飞机跟随
|
||||||
if (this.enableFollow) {
|
if (this.enableFollow) {
|
||||||
this.map.addControl(new FollowControl({
|
this.map.addControl(new FollowControl({
|
||||||
@ -349,6 +343,13 @@ export default {
|
|||||||
}
|
}
|
||||||
}), 'top-right')
|
}), 'top-right')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 地图样式选择控件
|
||||||
|
// 自定义地图样式列表
|
||||||
|
if (this.enableSwitch) {
|
||||||
|
this.styleSwitcherControlRef = new MapboxStyleSwitcherControl(this.mapStyleList, 'iconfont icon-duozhang f-s-20', this.currentStyleIndex)
|
||||||
|
this.map.addControl(this.styleSwitcherControlRef, 'top-right')
|
||||||
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* @description 通用地图图层和数据源清除方法
|
* @description 通用地图图层和数据源清除方法
|
||||||
@ -917,7 +918,15 @@ export default {
|
|||||||
makePlane (plane, index = 0) {
|
makePlane (plane, index = 0) {
|
||||||
const customIcon = document.createElement('div')
|
const customIcon = document.createElement('div')
|
||||||
customIcon.className = 'custom-marker'
|
customIcon.className = 'custom-marker'
|
||||||
customIcon.style.backgroundImage = `url(${planeIcon})`
|
// 根据在线状态与是否有货显示不同图标,空值安全处理
|
||||||
|
// 约定: online === false 才判定为离线;其他(包括 undefined/null) 默认为在线
|
||||||
|
const isOnline = !((plane && plane.planeState && plane.planeState.online) === false)
|
||||||
|
const hasGoods = !!(plane && plane.planeState && plane.planeState.hasGoods)
|
||||||
|
const iconToUse = !isOnline ? unlineIcon : (hasGoods ? planeRunIcon : planeIcon)
|
||||||
|
// 使用 important 确保覆盖样式表中的背景图设置
|
||||||
|
customIcon.style.setProperty('background-image', `url(${iconToUse})`, 'important')
|
||||||
|
customIcon.style.setProperty('background-repeat', 'no-repeat', 'important')
|
||||||
|
customIcon.style.setProperty('background-size', 'contain', 'important')
|
||||||
customIcon.style.width = '64px'
|
customIcon.style.width = '64px'
|
||||||
customIcon.style.height = '64px'
|
customIcon.style.height = '64px'
|
||||||
|
|
||||||
@ -1088,6 +1097,30 @@ export default {
|
|||||||
popup.setHTML(popupContent)
|
popup.setHTML(popupContent)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* @description 实时根据在线状态与载重更新指定飞机的图标
|
||||||
|
* @param {Object} stateObj 飞机状态对象(需包含 online, loadweight)
|
||||||
|
* @param {number} index 对应的飞机索引
|
||||||
|
*/
|
||||||
|
updatePlaneIcon (stateObj, index = 0) {
|
||||||
|
const marker = this.planes[index]
|
||||||
|
if (!marker) return
|
||||||
|
const el = marker.getElement()
|
||||||
|
if (!el) return
|
||||||
|
// 约定: online === false 才判定为离线;其他(包括 undefined/null) 默认为在线
|
||||||
|
const isOnline = !((stateObj && stateObj.online) === false)
|
||||||
|
const hasGoods = !!(stateObj && stateObj.hasGoods)
|
||||||
|
const iconToUse = !isOnline ? unlineIcon : (hasGoods ? planeRunIcon : planeIcon)
|
||||||
|
// 使用 important 确保覆盖样式表中的背景图设置
|
||||||
|
el.style.setProperty('background-image', `url(${iconToUse})`, 'important')
|
||||||
|
el.style.setProperty('background-repeat', 'no-repeat', 'important')
|
||||||
|
el.style.setProperty('background-size', 'contain', 'important')
|
||||||
|
// 调试信息,观察状态与最终图标选择
|
||||||
|
try {
|
||||||
|
el.dataset.icon = !isOnline ? 'unline' : (hasGoods ? 'run' : 'normal')
|
||||||
|
console.debug('[updatePlaneIcon]', { index, online: stateObj && stateObj.online, hasGoods, chosen: el.dataset.icon })
|
||||||
|
} catch (e) { /* noop */ }
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @description: 镜头跳转
|
* @description: 镜头跳转
|
||||||
* @param {obj} lonLat {lon:lon,lat:lat} 经纬度
|
* @param {obj} lonLat {lon:lon,lat:lat} 经纬度
|
||||||
|
|||||||
@ -394,6 +394,7 @@ const store = new Vuex.Store({
|
|||||||
acceState: null, // 加速度计校准状态
|
acceState: null, // 加速度计校准状态
|
||||||
getPlaneMode: null, // 飞机模式
|
getPlaneMode: null, // 飞机模式
|
||||||
loadweight: null, // 重量
|
loadweight: null, // 重量
|
||||||
|
hasGoods: false, // 是否有货
|
||||||
hookstatus: null, // 钩子状态
|
hookstatus: null, // 钩子状态
|
||||||
position: [], // [[经度,维度,相对高度]]累计数组
|
position: [], // [[经度,维度,相对高度]]累计数组
|
||||||
battCapacity: null, // 电池容量
|
battCapacity: null, // 电池容量
|
||||||
|
|||||||
@ -43,6 +43,19 @@ export default {
|
|||||||
return Array.isArray(posArr) ? posArr : []
|
return Array.isArray(posArr) ? posArr : []
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* @description: 派生出与“图标选择”强相关的轻量状态,供独立 watcher 监控
|
||||||
|
* offline: 是否离线;run: 载重是否超过阈值(>300)
|
||||||
|
*/
|
||||||
|
planeIconStates () {
|
||||||
|
return this.planeList.map(plane => {
|
||||||
|
const s = plane.planeState || {}
|
||||||
|
return {
|
||||||
|
offline: s.online === false,
|
||||||
|
run: !!s.hasGoods
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @description: 侧边栏显隐
|
* @description: 侧边栏显隐
|
||||||
*/
|
*/
|
||||||
@ -129,6 +142,21 @@ export default {
|
|||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
},
|
},
|
||||||
|
// 专门监听轻量图标状态,必要时才更新图标,避免不必要的 DOM 操作
|
||||||
|
planeIconStates: {
|
||||||
|
handler (val, oldVal) {
|
||||||
|
val.forEach((iconState, index) => {
|
||||||
|
const prev = Array.isArray(oldVal) ? oldVal[index] : undefined
|
||||||
|
const changed = !prev || prev.offline !== iconState.offline || prev.run !== iconState.run
|
||||||
|
if (changed) {
|
||||||
|
// 使用原始 planeState 作为数据源更新图标
|
||||||
|
const stateObj = this.planeList[index].planeState || {}
|
||||||
|
this.$refs.mapbox.updatePlaneIcon(stateObj, index)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
deep: true
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @description: 侧边栏缩进有变化时 地图重新自适应
|
* @description: 侧边栏缩进有变化时 地图重新自适应
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -175,8 +175,19 @@ export default {
|
|||||||
*/
|
*/
|
||||||
isCollapse () {
|
isCollapse () {
|
||||||
return this.$store.state.app.isCollapse
|
return this.$store.state.app.isCollapse
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* @description: 与图标选择强相关的轻量状态(仅当前选中飞机)
|
||||||
|
*/
|
||||||
|
planeIconState () {
|
||||||
|
const s = this.planeState || {}
|
||||||
|
return {
|
||||||
|
offline: s.online === false,
|
||||||
|
run: !!s.hasGoods
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
/** 切换主视图 */
|
/** 切换主视图 */
|
||||||
toggleMainView () {
|
toggleMainView () {
|
||||||
@ -336,6 +347,18 @@ export default {
|
|||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
},
|
},
|
||||||
|
// 仅当离线/载重跨阈值状态发生变化时更新图标(当前选中飞机)
|
||||||
|
planeIconState: {
|
||||||
|
handler (val, oldVal) {
|
||||||
|
const changed = !oldVal || oldVal.offline !== val.offline || oldVal.run !== val.run
|
||||||
|
if (changed) {
|
||||||
|
const stateObj = this.planeState || {}
|
||||||
|
// 当前视图只有一架选中飞机,对应 MapBox 数组索引为 0
|
||||||
|
this.$refs.mapbox.updatePlaneIcon(stateObj, 0)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
deep: false
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @description: 更新飞机位置 并画出轨迹 跟随飞机
|
* @description: 更新飞机位置 并画出轨迹 跟随飞机
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -79,6 +79,20 @@ export default {
|
|||||||
return Array.isArray(posArr) ? posArr : []
|
return Array.isArray(posArr) ? posArr : []
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* @description: 派生出与“图标选择”强相关的轻量状态,供独立 watcher 监控
|
||||||
|
* offline: 是否离线;run: 载重是否超过阈值(>300)
|
||||||
|
*/
|
||||||
|
planeIconStates () {
|
||||||
|
return this.planeList.map(plane => {
|
||||||
|
const s = plane.planeState || {}
|
||||||
|
const n = Number(s.loadweight)
|
||||||
|
return {
|
||||||
|
offline: s.online === false,
|
||||||
|
run: Number.isFinite(n) && n > 300
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @description: 侧边栏显隐
|
* @description: 侧边栏显隐
|
||||||
*/
|
*/
|
||||||
@ -293,6 +307,20 @@ export default {
|
|||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
},
|
},
|
||||||
|
// 专门监听轻量图标状态,必要时才更新图标,避免不必要的 DOM 操作
|
||||||
|
planeIconStates: {
|
||||||
|
handler (val, oldVal) {
|
||||||
|
val.forEach((iconState, index) => {
|
||||||
|
const prev = Array.isArray(oldVal) ? oldVal[index] : undefined
|
||||||
|
const changed = !prev || prev.offline !== iconState.offline || prev.run !== iconState.run
|
||||||
|
if (changed) {
|
||||||
|
const stateObj = this.planeList[index].planeState || {}
|
||||||
|
this.$refs.mapbox.updatePlaneIcon(stateObj, index)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
deep: true
|
||||||
|
},
|
||||||
// 实时更新所有飞机位置 和轨迹
|
// 实时更新所有飞机位置 和轨迹
|
||||||
planePositions: {
|
planePositions: {
|
||||||
handler (allPositions) {
|
handler (allPositions) {
|
||||||
|
|||||||
@ -223,6 +223,11 @@ export default {
|
|||||||
this.$store.dispatch('fetchLog', { content: `${plane.name}--${jsonData[key]}`, color: '#f57c00' })
|
this.$store.dispatch('fetchLog', { content: `${plane.name}--${jsonData[key]}`, color: '#f57c00' })
|
||||||
} else {
|
} else {
|
||||||
plane.planeState[key] = jsonData[key] // 按订阅信息 刷新飞机状态
|
plane.planeState[key] = jsonData[key] // 按订阅信息 刷新飞机状态
|
||||||
|
// 重量更新时,派生更新是否有货标记
|
||||||
|
if (key === 'loadweight') {
|
||||||
|
const n = Number(jsonData[key])
|
||||||
|
plane.planeState.hasGoods = Number.isFinite(n) && n > 300
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user