提交

ebc-middle-platform/src/conf/services.js

@@ -73,8 +73,14 @@ export default {
    INIT_STATUS_COUNT: '/locationManagement/loadEmployeeStatusCount', // 初始化顶部状态人数统计
    INIT_LOCATION_DETAILS: '/locationManagement/loadLocationDetails', // 位置信息,围栏数据的初始化
    BIND_DEVICE: '/workEmployee/queryEmployeeBindDeviceList', // 查询绑定的人员列表
    FENCE_BY_DEPARTMENT: '/mapTag/queryAllMapTagByOrg', // 按部门查询查询围栏
    EQUIPMENT_NOT_BIND: '/equipment/queryAllEquipmentNotBind' // 查询所有未绑定的设备
    FENCE_BY_DEPARTMENT: '/mapTag/queryAllMapAreaByOrg', // 按部门查询查询围栏
    EQUIPMENT_NOT_BIND: '/equipment/queryAllEquipmentNotBind', // 查询所有未绑定的设备
    EMPLOYEE_TRACE: '/locationManagement/queryEmployeeTrace' // 按时间段查询定位信息
  },
  alarm: {
    CLOSE_RESCUE: '/alarmManagement/closeRescue', // 关闭救援信息
    ASSIGN_RESCUER: '/alarmManagement/assignRescuer', // 指派救援者
    LOAD_ALARM_DETAILS: '/alarmManagement/loadAlarmDetails' // 实时报警初始化
  },
  position: {
    POSITION: '/position/', // 新增post，修改put，删除delete岗位信息

ebc-middle-platform/src/modules/call-help/current.scss

@@ -167,6 +167,15 @@
      height: 25px;
      line-height: 25px;
    }
    .offline{
      color: #000000;
      background-color: #D9D9D9;
      margin: 7.5px 0 0 5px;
      padding: 0 5px;
      font-size: 8px;
      height: 25px;
      line-height: 25px;
    }
  }
  .middle{
    padding-left: 20px;

ebc-middle-platform/src/modules/call-help/current.vue

@@ -1,36 +1,5 @@
<template>
  <div class="current-container">
    <!-- <t-scroll-bar :auto-hide="false" class="left">
      <div v-for="(item,index) in alarmList" :key="index" :class="[{active:index == activeIndex},'item']" @click="choose(item,index)">
        <div class="top">
          <div class="user-pic"></div>
          <div>{{ item.name }}</div>
          <div :class="item.type==1?'alarm':'hand-alarm'">{{ item.type==1?'落水报警':'手动报警' }}</div>
        </div>
        <div class="middle">
          <div class="row">
            <div>终端编号</div>
            <div>{{ item.number }}</div>
          </div>
          <div class="row">
            <div>救援人</div>
            <div>{{ item.rescue==''?'--':item.rescue }}</div>
          </div>
          <div class="row">
            <div>报警时间</div>
            <div>{{ item.alarmTime }}</div>
          </div>
          <div class="row">
            <div>最新定位时间</div>
            <div>{{ item.positionTime }}</div>
          </div>
        </div>
        <div class="footer">
          <t-button v-show="item.rescue==''" icon="user-outline" color="primary" @click="showModal(item)">指派</t-button>
          <t-button icon="close" color="primary" @click="close(item)">关闭</t-button>
        </div>
      </div>
    </t-scroll-bar> -->
    <div class="right">
      <div id="current-map"></div>
    </div>
@@ -38,7 +7,7 @@
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="救援人员" prop="rescue">
          <t-select v-model="formValidate.rescue" placeholder="请选择">
            <t-option v-for="(item, index) in rescuer" :key="index+'rescuer'" :value="item.ID">{{ item.NAME }}</t-option>
            <t-option v-for="(item, index) in rescuer" :key="index+'rescuer'" :value="item.workEmployeeId">{{ item.workEmployeeName }}</t-option>
          </t-select>
        </t-form-item>
      </t-form>
@@ -125,6 +94,14 @@ export default {
      console.log(msg)
      this.changePoint(msg)
    })
    EventBus.$on('reload', (msg) => { // 获取镜屏推送消息
      this.personLayer.eachLayer(layer => {
        this.map.removeLayer(layer)
        this.map.closePopup()
      })
      this.load()
    })
    // this.changePoint('1')
  },
  methods: {
    loadMap() {
@@ -144,17 +121,18 @@ export default {
    load() {
      this.personLayer = new Ai.FeatureGroup()
      this.$test
        .post(services.rescue.RESCUE_LOCATION, '')
        .post(services.alarm.LOAD_ALARM_DETAILS, '')
        .then((res) => {
          console.log(res)
          res.data.dataList.forEach(element => {
            if (element.alarm) {
              var alarmPoint = this.point(element.alarm)
          this.map.addLayer(this.personLayer)
          res.data.forEach(element => {
            var alarmPoint = null
            if (element.rescueTargetEntityPosition) {
              alarmPoint = this.point(element)
            }
            if (element.rescuer) {
              var rescuerPoint = this.point(element.rescuer)
              var lineWktStr = 'LINESTRING ( ' + element.alarm.longitude + ' ' + element.alarm.latitude + ',' + element.rescuer.longitude + ' ' + element.rescuer.latitude + ')'
              console.log(lineWktStr)
            if (element.rescueEntityPosition) {
              var rescuerPoint = this.rescuerPoint(element)
              var lineWktStr = 'LINESTRING ( ' + element.rescueTargetEntityPosition.longitude + ' ' + element.rescueTargetEntityPosition.latitude + ',' + element.rescueEntityPosition.longitude + ' ' + element.rescueEntityPosition.latitude + ')'
              var lineLayer = new Ai.Polyline(lineWktStr, {color: 'red', opacity: 1.0})
              alarmPoint.getAttributes().lineLayer = lineLayer
              rescuerPoint.getAttributes().lineLayer = lineLayer
@@ -163,74 +141,102 @@ export default {
              this.map.addLayer(lineLayer)
            }
          })
          console.log(this.personLayer)
          this.map.addLayer(this.personLayer)
          this.map.setViewPort([this.personLayer])
          // this.map.setViewPort([this.personLayer])
        })
        .catch((res) => {
          // 请求失败处理...
        })
      this.$test
        .post(services.organization.EQUIPMENT_NOT_BIND, {})
        .then((res) => {
          console.log(res)
          res.data.forEach(e => {
          })
        })
        .catch((res) => {
        // 请求失败处理...
        })
    },
    changePoint(msg) {
      var obj = JSON.parse(msg)
      this.personLayer.eachLayer((point) => {
        if (point.getAttributes().deviceId == obj.deviceId) {
          if (obj.locationStatus === '0' || obj.locationStatus === '1' || obj.locationStatus === '2' || obj.locationStatus === '3') {
            if (point.getAttributes().point) {
              point.getAttributes().point.remove()
            }
      if (obj.data.currentEntityPosition) {
        this.personLayer.eachLayer((point) => {
          if (point.getAttributes().rescueEntityPosition && point.getAttributes().rescueEntityPosition.entityId == obj.data.currentEntityPosition.entityId) {
            point.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
            point.getAttributes().rescueEntityPosition = obj.data.currentEntityPosition
            if (point.getAttributes().lineLayer) {
              point.getAttributes().lineLayer.remove()
              var lineWktStr = 'LINESTRING ( ' + obj.data.currentEntityPosition.longitude + ' ' + obj.data.currentEntityPosition.latitude + ',' + point.getAttributes().rescueTargetEntityPosition.longitude + ' ' + point.getAttributes().rescueTargetEntityPosition.latitude + ')'
              console.log(lineWktStr)
              point.getAttributes().lineLayer.setPoints(lineWktStr)
            }
            if (point.getAttributes().popup) {
              point.getAttributes().popup.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
              var tips
              tips = '<div class="hand-alarm">救援人员</div>'
              var content =
                  '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + obj.data.currentEntityPosition.name + '</div>' + tips + '</div><div class="middle">' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + obj.data.currentEntityPosition.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + obj.data.currentEntityPosition.latitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + new Date(obj.data.currentEntityPosition.createDate) + '</div>' +
                  '</div></div></div>' +
                  '</div></div>'
              point.getAttributes().popup.setContent(content)
            }
          } else {
            point.setLatLng([obj.latitude, obj.longitude])
          } else if (point.getAttributes().rescueTargetEntityPosition && point.getAttributes().rescueTargetEntityPosition.entityId == obj.data.currentEntityPosition.entityId) {
            point.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
            point.getAttributes().rescueTargetEntityPosition = obj.data.currentEntityPosition
            if (point.getAttributes().lineLayer) {
              var lineWktStr = 'LINESTRING ( ' + obj.longitude + ' ' + obj.latitude + ',' + point.getAttributes().point.getLng() + ' ' + point.getAttributes().point.getLat() + ')'
              var lineWktStr = 'LINESTRING ( ' + obj.data.currentEntityPosition.longitude + ' ' + obj.data.currentEntityPosition.latitude + ',' + point.getAttributes().rescueEntityPosition.longitude + ' ' + point.getAttributes().rescueEntityPosition.latitude + ')'
              console.log(lineWktStr)
              point.getAttributes().lineLayer.setPoints(lineWktStr)
            }
            if (point.getAttributes().popup) {
              point.getAttributes().popup.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
              // point.getAttributes().popup.setContent(content)
            }
          }
        }
      })
        })
      }
    },
    point(e) {
      console.log(e)
      var icon, tips
      var callHelp = ''
      var other = ''
      if (e.locationStatus === '4' || e.locationStatus === '5') {
        icon = '/static/images/sosworker.png'
        tips = '<div class="alarm">报警人员</div>'
        other = '<div class="row sos">' +
                  '<div>求救时间</div>' +
                  '<div>' + e.alarmDate + '</div>' +
                  '</div>' + '<div class="row sos">' +
                  '<div>求救时长</div>' +
                  '<div>' + e.alarmLong + 'min</div>' +
                  '</div>'
        if (e.isNewAlarm === '1') {
          callHelp = '<div style="display:flex;">' +
                  "<button class='point-out' onClick='window.Vue.appoint(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
        } else {
          callHelp = '<div style="display:flex;justify-content: flex-end;">' +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
        }
      } else if (e.locationStatus === '6') {
        icon = '/static/images/outlineworker.png'
        tips = '<div class="hand-alarm">救援人员</div>'
      var className = 'alarm'
      icon = '/static/images/sosworker.png'
      if (e.businessType == '2') {
        className = 'hand-alarm'
      } else if (e.businessType == '4') {
        className = 'offline'
      }
      // var point = Ai.Point([e.latitude, e.longitude], {
      //   icon: Ai.Icon({
      //     // 设置图标URL路径
      //     iconUrl: icon,
      //     // 设置图标大小
      //     iconSize: [20, 20],
      //     // 设置点对象和图标的相对偏移量
      //     iconAnchor: [0, 0]
      //   })
      // })
      var point = Ai.Point([e.latitude, e.longitude], {
      tips = '<div class="' + className + '">' + e.businessTypeZH + '</div>'
      other = '<div class="row sos">' +
                '<div>求救时间</div>' +
                '<div>' + e.alarmTime + '</div>' +
                '</div>' + '<div class="row sos">' +
                '<div>求救时长</div>' +
                '<div>' + 1 + 'min</div>' +
                '</div>'
      if (e.isAssignAlarm == '0') {
        callHelp = '<div style="display:flex;">' +
                "<button class='point-out' onClick='window.Vue.appoint(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                '</div>'
      } else {
        callHelp = '<div style="display:flex;justify-content: flex-end;">' +
                "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                '</div>'
      }
      var point = Ai.Point([e.rescueTargetEntityPosition.latitude, e.rescueTargetEntityPosition.longitude], {
        icon: Ai.DivIcon({
          html: '<img src="' + icon + '"/>',
          className: 'myicon-lv',
@@ -241,37 +247,86 @@ export default {
        })
      })
      point.setAttributes(e)
      point.on('click', (pointE) => {
        var content =
                  '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + e.userName + '</div>' + tips + '</div><div class="middle"><div class="row">' +
      var content =
                  '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + e.rescueTargetEntityPosition.name + '</div>' + tips + '</div><div class="middle"><div class="row">' +
                  '<div>终端编号</div>' +
                  '<div>' + e.deviceNo + '</div>' +
                  '<div>' + e.terminalId + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.longitude + '</div>' +
                  '<div>' + e.rescueTargetEntityPosition.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.latitude + '</div>' +
                  '<div>' + e.rescueTargetEntityPosition.latitude + '</div>' +
                  '</div>' + other +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.newDate + '</div>' +
                  '<div>' + e.alarmTime + '</div>' +
                  '</div></div></div>' + callHelp +
                  '</div></div>'
        var popup = Ai.Popup({
          minWidth: 300,
          offset: [0, -10],
          autoClose: true,
          closeButton: false
        })
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -10],
        autoClose: false,
        closeButton: true
      })
        // 设置弹出框弹出位置
        popup.setLatLng(point.getLatLng())
        .setLatLng(point.getLatLng())
        // 设置弹出框弹出内容
        popup.setContent(content)
        .setContent(content)
        .openOn(this.map)
      point.on('click', (pointE) => {
        popup.openOn(this.map)
      })
      point.getAttributes().popup = popup
      this.personLayer.addLayer(point)
      return point
    },
    rescuerPoint(e) {
      var icon, tips
      icon = '/static/images/outlineworker.png'
      tips = '<div class="hand-alarm">救援人员</div>'
      var point = Ai.Point([e.rescueEntityPosition.latitude, e.rescueEntityPosition.longitude], {
        icon: Ai.DivIcon({
          html: '<img src="' + icon + '"/>',
          className: 'myicon-lv',
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [10, 20]
        })
      })
      point.setAttributes(e)
      var content =
                  '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + e.rescueEntityPosition.name + '</div>' + tips + '</div><div class="middle">' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.rescueEntityPosition.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.rescueEntityPosition.latitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.rescueEntityPosition.doneDate + '</div>' +
                  '</div></div></div>' +
                  '</div></div>'
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -10],
        autoClose: false,
        closeButton: true
      })
      // 设置弹出框弹出位置
      popup.setLatLng(point.getLatLng())
      // 设置弹出框弹出内容
      popup.setContent(content)
      popup.openOn(this.map)
      point.getAttributes().popup = popup
      point.on('click', (pointE) => {
        popup.openOn(this.map)
        point.getAttributes().popup = popup
      })
      this.personLayer.addLayer(point)
      return point
@@ -283,72 +338,121 @@ export default {
      this.modal = false
    },
    appoint(item) { // 打开指派Modal
      console.log(item)
      this.modal = true
      this.$test
        .post(services.rescue.RESCUER_LIST, '')
        .post(services.organization.BIND_DEVICE, {})
        .then((res) => {
          this.modal = true
          console.log(res)
          this.appointAlarmId = item.alarmLogId
          this.rescuer = res.data.dataList
          this.rescuer = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
      this.appointAlarm = item
    },
    appointSubmit() { // 指派
      console.log(this.formValidate.rescue)
      this.$refs['formValidate'].validate(valid => {
        console.log(valid)
        if (valid) {
          var params = new FormData()
          params.append('data', JSON.stringify({
            alarmLogId: this.appointAlarmId,
            rescuersId: this.formValidate.rescue
          }))
          this.$test
            .post(services.rescue.ASSIGN_RESCUER, params)
            .post(services.alarm.ASSIGN_RESCUER, {workTaskId: this.appointAlarm.workTaskId, rescuersId: this.formValidate.rescue})
            .then((res) => {
              if (res.data.result) {
                this.$Message.success('指派成功！')
                this.load()
                this.modal = false
              } else {
                this.$Message.danger('指派失败！')
                this.modal = false
              }
              this.modal = false
              this.personLayer.eachLayer(layer => {
                this.map.removeLayer(layer)
                this.map.closePopup()
              })
              this.load()
              // var alarmPoint = this.rescuerPoint({rescueEntityPosition: res.data})
              // var lineWktStr = 'LINESTRING ( ' + res.data.longitude + ' ' + res.data.latitude + ',' + this.appointAlarm.rescueTargetEntityPosition.longitude + ' ' + this.appointAlarm.rescueTargetEntityPosition.latitude + ')'
              // var lineLayer = new Ai.Polyline(lineWktStr, {color: 'red', opacity: 1.0})
              // this.personLayer.addLayer(alarmPoint)
              // this.map.addLayer(lineLayer)
              // var that = this
              // this.personLayer.eachLayer(layer => {
              //   if (layer.getAttributes().rescueTargetEntityPosition.entityId === that.appointAlarm.rescueTargetEntityPosition.entityId) {
              //     var className = 'alarm'
              //     if (layer.getAttributes().businessType == '2') {
              //       className = 'hand-alarm'
              //     } else if (layer.getAttributes().businessType == '4') {
              //       className = 'offline'
              //     }
              //     var tips = '<div class="' + className + '">' + layer.getAttributes().businessTypeZH + '</div>'
              //     var content =
              //     '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + layer.getAttributes().rescueTargetEntityPosition.name + '</div>' + tips + '</div><div class="middle"><div class="row">' +
              //     '<div>终端编号</div>' +
              //     '<div>' + layer.getAttributes().terminalId + '</div>' +
              //     '</div>' +
              //     '<div class="row">' +
              //     '<div>经度</div>' +
              //     '<div>' + layer.getAttributes().rescueTargetEntityPosition.longitude + '</div>' +
              //     '</div>' +
              //     '<div class="row">' +
              //     '<div>纬度</div>' +
              //     '<div>' + layer.getAttributes().rescueTargetEntityPosition.latitude + '</div>' +
              //     '</div>' + '<div class="row sos">' +
              //   '<div>求救时间</div>' +
              //   '<div>' + layer.getAttributes().alarmTime + '</div>' +
              //   '</div>' + '<div class="row sos">' +
              //   '<div>求救时长</div>' +
              //   '<div>' + 1 + 'min</div>' +
              //   '</div>' +
              //     '<div class="row">' +
              //     '<div>最新定位时间</div>' +
              //     '<div>' + layer.getAttributes().alarmTime + '</div>' +
              //     '</div></div></div>' + '<div style="display:flex;justify-content: flex-end;">' +
              //   "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(layer.getAttributes()) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
              //   '</div>' +
              //     '</div></div>'
              //     layer.getAttributes().popup.setContent(content).openOn(this.map)
              //     alarmPoint.getAttributes().lineLayer = lineLayer
              //     layer.getAttributes().lineLayer = lineLayer
              //     alarmPoint.getAttributes().point = layer
              //     layer.getAttributes().point = alarmPoint
              //   }
              // })
            })
            .catch((res) => {
              // 请求失败处理...
            })
        }
      })
    },
    close(item) {
      this.$Confirm.confirm({
        title: '确认要关闭张三落水报警吗？',
        title: '确认要关闭' + item.rescueTargetEntityPosition.name + item.businessTypeZH + '吗？',
        content: '关闭后将不再进行报警显示',
        ok: () => {
          console.log(item.alarmLogId)
          var params = new FormData()
          params.append('data', JSON.stringify({
            alarmLogId: item.alarmLogId
          }))
          console.log(item)
          this.$test
            .post(services.rescue.CLOSE_RESCUE, params)
            .post(services.alarm.CLOSE_RESCUE, {workTaskId: item.workTaskId, isAssignAlarm: item.isAssignAlarm})
            .then((res) => {
              console.log(res.data.result)
              if (res.data.result) {
                this.layer.personLayer.eachLayer(layer => {
                  if (layer.getAttributes().deviceId === item.deviceId) {
                    item.locationStatus = '0'
                    this.popupContent(item, layer)
                  }
                })
              }
              console.log(res)
              this.personLayer.eachLayer(layer => {
                this.map.removeLayer(layer)
                this.map.closePopup()
              })
              this.load()
              // var chooseLayer
              // this.personLayer.eachLayer(layer => {
              //   if (layer.getAttributes().rescueTargetEntityPosition.entityId === item.rescueTargetEntityPosition.entityId) {
              //     chooseLayer = layer
              //     if (layer.getAttributes().point) {
              //       this.map.removeLayer(layer.getAttributes().point)
              //       this.map.closePopup(layer.getAttributes().point.popup)
              //       this.map.removeLayer(layer.getAttributes().lineLayer)
              //     }
              //   }
              // })
              // this.personLayer.removeLayer(chooseLayer)
              // if (chooseLayer.getAttributes().point) {
              //   this.personLayer.removeLayer(chooseLayer.getAttributes().point)
              // }
              // this.map.closePopup(chooseLayer.popup)
            })
            .catch((res) => {
            // 请求失败处理...
            })
        },
        cancel: () => {

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

@@ -26,16 +26,15 @@
      <div class="rescue">
        <div>救援人员：</div>
        <div>
          <t-select placeholder="请选择救援人员" width="150">
            <t-option>张三(zhangsan)</t-option>
            <t-option>李四(lisi)</t-option>
          <t-select v-model="rescue" placeholder="请选择救援人员" width="150">
            <t-option v-for="(item,index) in personList" :key="index" :value="item.workEmployeeId">{{ item.workEmployeeName }}</t-option>
          </t-select>
        </div>
      </div>
      <div slot="footer">
        <t-button @click="closeAlarmModal">直接关闭报警</t-button>
        <t-button color="success" @click="closeAlarmModal">确认并稍后指派</t-button>
        <t-button color="success" @click="closeAlarmModal">确认并立即指派</t-button>
        <t-button @click="closeModal">直接关闭报警</t-button>
        <t-button color="success" @click="close">确认并稍后指派</t-button>
        <t-button color="success" @click="closeModalAndAppoint">确认并立即指派</t-button>
      </div>
    </t-modal>
  </global-layout>
@@ -46,6 +45,7 @@ import GlobalLayout from '../page/GlobalLayout.vue'
import EventBus from '../../bus'
import StompClient from '../../stomp/ipu-stomp'
import {socketUrl} from '../../constants'
import services from '../../conf/services'
export default {
  name: 'BasicLayout',
  components: {
@@ -55,9 +55,12 @@ export default {
    return {
      modal: false,
      stompClient: null,
      personList: [],
      rescue: '',
      alarmObj: {
        alarmType: '',
        alarmLocation: '',
        workTaskId: '',
        userName: ''
      }
    }
@@ -69,21 +72,70 @@ export default {
  },
  mounted() {
    // 镜屏调用
    this.load()
    this.connect()
  },
  methods: {
    closeAlarmModal() {
      this.modal = false
    load() {
      this.$test
        .post(services.organization.BIND_DEVICE, {})
        .then((res) => {
          console.log(res)
          this.personList = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    closeModalAndAppoint() {
      if (!this.rescue) {
        this.$Message.warning('请选择救援人！')
        return
      }
      this.$test
        .post(services.alarm.ASSIGN_RESCUER, {workTaskId: this.alarmObj.workTaskId, rescuersId: this.rescue})
        .then((res) => {
          this.modal = false
          EventBus.$emit('reload', true)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    closeModal() {
      this.$Confirm.confirm({
        title: '请确认',
        content: '是否关闭？关闭后不可恢复',
        ok: () => {
          this.$test
            .post(services.alarm.CLOSE_RESCUE, {workTaskId: this.alarmObj.workTaskId, isAssignAlarm: 0})
            .then((res) => {
              this.modal = false
            })
            .catch((res) => {
              // 请求失败处理...
            })
        }
      })
    },
    close() {
      this.$Confirm.confirm({
        title: '请确认',
        content: '是否关闭稍后指派？',
        ok: () => {
          this.modal = false
          EventBus.$emit('reload', true)
        }
      })
    },
    alarmOpen(msg) {
      console.log(msg)
      var obj = JSON.parse(msg)
      if (obj.isNewAlarm == '1') {
        this.alarmObj.alarmType = obj.alarmType
        this.alarmObj.alarmLocation = obj.longitude + ' , ' + obj.latitude
        this.alarmObj.userName = obj.userName
        this.modal = true
      }
      var obj = JSON.parse(msg.body)
      this.alarmObj.alarmType = obj.data.businessTypeZH
      this.alarmObj.alarmLocation = obj.data.longitude + ' , ' + obj.data.latitude
      this.alarmObj.userName = obj.data.employeeName
      this.alarmObj.workTaskId = obj.data.workTaskId
      this.modal = true
    },
    connect() {
      if (this.stompClient == null || !this.stompClient.connected()) {
@@ -97,9 +149,12 @@ export default {
      console.log('connectCallback')
      this.stompClient.subscribe('personnel', (msg) => {
        console.log(msg)
        this.alarmOpen(msg.body)
        EventBus.$emit('person', msg.body)
      })
      this.stompClient.subscribe('alarm', (msg) => {
        console.log('alarm' + msg)
        this.alarmOpen(msg)
      })
      this.stompClient.subscribe('ship', (msg) => {
        console.log(msg)
        EventBus.$emit('ship', msg.body)

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -90,7 +90,7 @@
            style="width: 200px"
          ></t-input>
          <div>
            <div v-for="(item,index) in personList" :class="trackPerson==item.code?'active':''" :key="index" @click="personTrack(item)">{{ item.name }}</div>
            <div v-for="(item,index) in personList" :class="trackPerson.workEmployeeCode==item.workEmployeeCode?'active':''" :key="index" @click="personTrack(item)">{{ item.workEmployeeName }}</div>
          </div>
        </div>
        <div class="track-modal-right">
@@ -115,13 +115,13 @@
              placeholder="请选择时间"
              @date-change="onChangeDate">
            </t-date-picker>
            <div style="display: flex;line-height:32.5px;width: 120px;">
            <!-- <div style="display: flex;line-height:32.5px;width: 120px;">
              <div>速度</div>
              <t-select>
                <t-option>1x</t-option>
                <t-option>2x</t-option>
              </t-select>
            </div>
            </div> -->
            <t-button color="success" icon="video-outline" @click="playback()">回放</t-button>
            <t-button color="secondary" icon="upload-outline" @click="toExport"
            >导出至Excel</t-button
@@ -224,6 +224,7 @@ export default {
        currentIndex: 0
      },
      trackMap: null,
	  trackPath: null,
      rangeDate: '',
      rescueModal: false,
      formValidate: {
@@ -875,7 +876,12 @@ export default {
    },
    personTrack(item) {
      console.log(item)
      this.trackPerson = item.code
      console.log(this.trackMap.hasLayer(this.trackPath))
      if (this.trackMap.hasLayer(this.trackPath)) {
        this.trackMap.removeLayer(this.trackPath)
        this.trackPath.hideTraceFrom(this.trackMap)
      }
      this.trackPerson = item
      if (this.orgId !== item.orgId) {
        this.$test
          .post(services.organization.FENCE_BY_DEPARTMENT, {entityId: item.orgId})
@@ -896,46 +902,57 @@ export default {
      }
    },
    playback() {
      var coords = [[40.026037, 116.323928, '1'], [40.017886, 116.328048], [40.00763, 116.336631], [39.99132, 116.338348], [39.97527, 116.341094], [39.96685, 116.346244], [39.96633, 116.354827], [39.96580, 116.37233], [39.96659, 116.38538], [39.96685, 116.40048], [39.96685, 116.41834], [39.96028, 116.419029], [39.95501, 116.41937], [39.92501, 116.41937], [39.91501, 116.41937], [39.90501, 116.41937], [39.87501, 116.41937]]
      var defaultOptions = {
        paused: false,
        reverse: false,
        delay: 800,
        dashArray: [10, 20],
        weight: 5,
        opacity: 0.9,
        color: '#0000ff',
        pulseColor: '#FFFFFF',
        playerTrack: true,
        traceTitle: true,
        traceIcon: new Ai.Icon({
          iconUrl: 'http://192.168.74.189:9999/gisapi/images/man-or32.png',
          iconSize: [36, 36],
          iconAnchor: [18, 36]
        }),
        titleOptions: {
          className: 'trace_title',
          iconSize: null,
          iconAnchor: [48, 57]
      console.log(this.trackQueryCondition.currentIndex)
      var params = {}
      if (this.trackQueryCondition.currentIndex === 3) {
        if (!this.rangeDate) {
          this.$Message.warning('请选择时间！')
          return
        } else {
          params = {
            entityId: this.trackPerson.workEmployeeId,
            timeType: (this.trackQueryCondition.currentIndex + 1),
            startTime: this.rangeDate[0],
            endTime: this.rangeDate[1]
          }
        }
      } else {
        params = {
          entityId: this.trackPerson.workEmployeeId,
          timeType: (this.trackQueryCondition.currentIndex + 1)
        }
      }
      var path = new Ai.DynamicPath(coords, defaultOptions)
      this.trackMap.addLayer(path)
      path.playTraceOn(this.trackMap)
      // path1.playTraceOn(this.trackMap)
      var params = new FormData()
      params.append('data', JSON.stringify({
        deviceId: '981453',
        timeType: 4,
        pageNum: 1,
        pageSize: 20,
        beginTime: '2020-11-05 14:01:01',
        endTime: '2020-11-05 14:18:14'
      }))
      console.log(this.rangeDate)
      this.$test
        .post(services.device.DEVICE_TRACK, params)
        .post(services.organization.EMPLOYEE_TRACE, params)
        .then((res) => {
          console.log(res.data)
          console.log(res)
          var coords = res.data.coordArray
          var defaultOptions = {
            paused: false,
            reverse: false,
            delay: 800,
            dashArray: [10, 20],
            weight: 5,
            opacity: 0.9,
            color: '#0000ff',
            pulseColor: '#FFFFFF',
            playerTrack: true,
            traceTitle: false,
            traceIcon: new Ai.Icon({
              iconUrl: '/static/images/normalworker.png',
              iconSize: [16, 16],
              iconAnchor: [8, 8]
            }),
            titleOptions: {
              className: 'trace_title',
              iconSize: null,
              iconAnchor: [48, 57]
            }
          }
          this.trackPath = new Ai.DynamicPath(coords, defaultOptions)
          this.trackMap.addLayer(this.trackPath)
          this.trackPath.playTraceOn(this.trackMap)
        })
        .catch((res) => {
          // 请求失败处理...