wangkang3 4 anni fa
parent
commit
2c1df8f650

+ 8 - 4
ebc-middle-platform/src/ipu-stomp.js

@ -22,10 +22,14 @@ export default function initWebSocket(params) {
22 22
}
23 23
24 24
function successCallback() {
25
  stompClient.subscribe('personnel', msg => {
26
    EventBus.$emit('person', msg)
27
  })
28 25
  stompClient.subscribe('ship', msg => {
29
    EventBus.$emit('ship', msg)
26
    // EventBus.$emit('ship', msg)
27
  })
28
  stompClient.subscribe('personnel', msg => { // 订阅多个topic暂时实现
29
    if (msg.headers.destination === 'personnel') {
30
      EventBus.$emit('person', msg.body)
31
    } else if (msg.headers.destination === 'ship') {
32
      EventBus.$emit('ship', msg.body)
33
    }
30 34
  })
31 35
}

+ 1 - 1
ebc-middle-platform/src/modules/layouts/BasicLayout.vue

@ -70,7 +70,7 @@ export default {
70 70
    initWebSocket({name: 'zhangsan', passcode: '123456', uuid: this.uuid()})
71 71
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
72 72
      console.log(msg)
73
      var obj = JSON.parse(msg.body)
73
      var obj = JSON.parse(msg)
74 74
      if (obj.isNewAlarm == '1') {
75 75
        this.alarmObj.alarmType = obj.alarmType
76 76
        this.alarmObj.alarmLocation = obj.longitude + ' , ' + obj.latitude

+ 23 - 3
ebc-middle-platform/src/modules/orientation/orientation.vue

@ -329,6 +329,7 @@ export default {
329 329
      this.nowDate = new Date()
330 330
    }, 1000)
331 331
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
332
      console.log(msg)
332 333
      this.changeLocation(msg)
333 334
    })
334 335
    EventBus.$on('ship', (msg) => { // 获取镜屏推送消息
@ -348,7 +349,7 @@ export default {
348 349
        })
349 350
    },
350 351
    changeLocation(msg) { // 修改人员信息状态等
351
      var obj = JSON.parse(msg.body)
352
      var obj = JSON.parse(msg)
352 353
      console.log('person' + obj)
353 354
      var flag = false
354 355
      this.layer.personLayer.eachLayer((e) => {
@ -374,7 +375,7 @@ export default {
374 375
      }
375 376
    },
376 377
    changeShip(msg) {
377
      var obj = JSON.parse(msg.body)
378
      var obj = JSON.parse(msg)
378 379
      console.log('ship' + obj)
379 380
      this.layer.equipmentLayer.eachLayer((point) => {
380 381
        if (point.getAttributes().DEVICE_NO == obj.deviceNo) {
@ -693,6 +694,7 @@ export default {
693 694
          res.data.dataList.forEach((e) => {
694 695
            var icon, tips
695 696
            var callHelp = ''
697
            var other = ''
696 698
            if (e.locationStatus === '0') {
697 699
              icon = '/static/images/normalworker.png'
698 700
              layer = this.layer.normalLayer
@ -712,10 +714,28 @@ export default {
712 714
              layer = this.layer.outLineLayer
713 715
              tips = '<div class="outline">违规</div>'
714 716
              this.personStatistics.outLine++
717
              if (e.locationStatus == '2') {
718
                other = '<div class="row outline">' +
719
                        '<div>定点停留超时</div>' +
720
                        '<div>已停留' + e.fixedLong + 'min</div>' +
721
                        '</div>'
722
              } else {
723
                other = '<div class="row outline">' +
724
                        '<div>进入时间</div>' +
725
                        '<div>' + e.inDate + '</div>' +
726
                        '</div>'
727
              }
715 728
            } else if (e.locationStatus === '4' || e.locationStatus === '5') {
716 729
              icon = '/static/images/sosworker.png'
717 730
              layer = this.layer.sosLayer
718 731
              tips = '<div class="sos">SOS</div>'
732
              other = '<div class="row sos">' +
733
                  '<div>求救时间</div>' +
734
                  '<div>' + e.alarmDate + '</div>' +
735
                  '</div>' + '<div class="row sos">' +
736
                  '<div>求救时长</div>' +
737
                  '<div>' + e.alarmLong + 'min</div>' +
738
                  '</div>'
719 739
              callHelp = '<div style="display:flex;">' +
720 740
                  '<button class="point-out" onClick="window.Vue.rescueModal=true"><i style="font-size: 20px;" class="aidicon aidicon-user-outline"></i>指派</button>' +
721 741
                  '<button class="close-confirm" onClick="window.Vue.close()"><i style="font-size: 20px;" class="aidicon aidicon-close"></i>关闭</button>' +
@ -746,7 +766,7 @@ export default {
746 766
                  '<div class="row">' +
747 767
                  '<div>纬度</div>' +
748 768
                  '<div>' + e.latitude + '</div>' +
749
                  '</div>' +
769
                  '</div>' + other +
750 770
                  '<div class="row">' +
751 771
                  '<div>最新定位时间</div>' +
752 772
                  '<div>' + e.newDate + '</div>' +