diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 2e5b981..a43ab61 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -93,11 +93,11 @@
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
-
-
-
-
-
+
+ {{ item.label }}
@@ -1597,7 +1598,7 @@ export default {
const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
collection.entities.add(entity)
viewer.dataSources.add(collection)
- trajectoryEntityCollection = collection
+ trajectoryEntityCollection = Object.freeze(collection)
}
})
},
@@ -1679,11 +1680,11 @@ export default {
transformWGS84ToCartesian: function(position, alt) {
// eslint-disable-next-line no-return-assign
return position ? Cesium.Cartesian3.fromDegrees(
- position.lng || position.lon,
- position.lat,
- position.alt = alt || position.alt,
- Cesium.Ellipsoid.WGS84
- )
+ position.lng || position.lon,
+ position.lat,
+ position.alt = alt || position.alt,
+ Cesium.Ellipsoid.WGS84
+ )
: Cesium.Cartesian3.ZERO
},
closeBubbles() {
@@ -2246,7 +2247,7 @@ export default {
}
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
- } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') {
+ } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') {
// websocket实时获取人员定位
this.initRYDWWebsocket(this.CORP_INFO_ID)
} else {
@@ -3000,9 +3001,7 @@ export default {
const wsUrl = config.noDwSysUrl + '/ltLocation/DW_' + new Date().getTime() + '_98'
_this.fwebsocket = new WebSocket(encodeURI(wsUrl))
_this.fwebsocket.onmessage = function(message) {
- console.info('接收消息')
const peopleList = JSON.parse(message.data)
- console.log(peopleList)
viewer.entities.suspendEvents()
for (let i = 0; i < peopleList.length; i++) {
const item = peopleList[i]
@@ -3072,12 +3071,12 @@ export default {
if (decodedStr) {
// const perTrack = JSON.parse(decodedStr)
const perTrack = { 'msg': '000', 'data': [
- '8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单',
- '8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦',
- '8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖',
- '8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟',
- '8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官'
- ] }
+ '8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单',
+ '8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦',
+ '8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖',
+ '8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟',
+ '8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官'
+ ] }
if (perTrack.msg === '000' && perTrack.data && perTrack.data.length > 0) {
perTrack.data.forEach(item => {
const newPos = item.split(',')