Merge remote-tracking branch 'origin/master'

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

@@ -80,7 +80,8 @@ export default {
  alarm: {
    CLOSE_RESCUE: '/alarmManagement/closeRescue', // 关闭救援信息
    ASSIGN_RESCUER: '/alarmManagement/assignRescuer', // 指派救援者
    LOAD_ALARM_DETAILS: '/alarmManagement/loadAlarmDetails' // 实时报警初始化
    LOAD_ALARM_DETAILS: '/alarmManagement/loadAlarmDetails', // 实时报警初始化
    LOAD_MAP_AREA_TOOL: '/alarmManagement/loadMapAreaTool' // 查询所有地图标记和设备
  },
  position: {
    POSITION: '/position/', // 新增post，修改put，删除delete岗位信息

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

@@ -117,35 +117,6 @@ export default {
      var la = Ai.WMTSLayer(GIS_SEA_URL)
      this.map.addLayer(la)
      this.load()
    },
    load() {
      this.personLayer = new Ai.FeatureGroup()
      this.$test
        .post(services.alarm.LOAD_ALARM_DETAILS, '')
        .then((res) => {
          console.log(res)
          this.map.addLayer(this.personLayer)
          res.data.forEach(element => {
            var alarmPoint = null
            if (element.rescueTargetEntityPosition) {
              alarmPoint = this.point(element)
            }
            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
              alarmPoint.getAttributes().point = rescuerPoint
              rescuerPoint.getAttributes().point = alarmPoint
              this.map.addLayer(lineLayer)
            }
          })
          // this.map.setViewPort([this.personLayer])
        })
        .catch((res) => {
          // 请求失败处理...
        })
      this.$test
        .post(services.alarm.LOAD_MAP_AREA_TOOL, {})
        .then((res) => {
@@ -178,6 +149,35 @@ export default {
        // 请求失败处理...
        })
    },
    load() {
      this.personLayer = new Ai.FeatureGroup()
      this.$test
        .post(services.alarm.LOAD_ALARM_DETAILS, '')
        .then((res) => {
          console.log(res)
          this.map.addLayer(this.personLayer)
          res.data.forEach(element => {
            var alarmPoint = null
            if (element.rescueTargetEntityPosition) {
              alarmPoint = this.point(element)
            }
            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.lineLayer = lineLayer
              rescuerPoint.lineLayer = lineLayer
              alarmPoint.point = rescuerPoint
              rescuerPoint.point = alarmPoint
              this.map.addLayer(lineLayer)
            }
          })
          // this.map.setViewPort([this.personLayer])
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    changePoint(msg) {
      var obj = JSON.parse(msg)
      if (obj.data.currentEntityPosition) {
@@ -189,10 +189,10 @@ export default {
              flag = false
              point.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
              point.getAttributes().rescueEntityPosition = obj.data.currentEntityPosition
              if (point.getAttributes().lineLayer) {
              if (point.lineLayer) {
                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)
                point.lineLayer.setPoints(lineWktStr)
              }
              if (point.popup) {
                point.popup.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
@@ -219,10 +219,10 @@ export default {
              flag = false
              point.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
              point.getAttributes().rescueTargetEntityPosition = obj.data.currentEntityPosition
              if (point.getAttributes().lineLayer) {
              if (point.lineLayer) {
                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)
                point.lineLayer.setPoints(lineWktStr)
              }
              if (point.popup) {
                point.popup.setLatLng([obj.data.currentEntityPosition.latitude, obj.data.currentEntityPosition.longitude])
@@ -245,14 +245,15 @@ export default {
                '<div>求救时长</div>' +
                '<div>' + this.getDurationTime(e.alarmTime) + '</div>' +
                '</div>'
                var param = JSON.stringify(e)
                if (e.isAssignAlarm == '0') {
                  callHelp = '<div style="display:flex;">' +
                "<button class='point-out' onClick='window.Vue.appoint(" + e + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                "<button class='close-confirm' onClick='window.Vue.close(" + e + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                "<button class='point-out' onClick='window.Vue.appoint(" + param + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                "<button class='close-confirm' onClick='window.Vue.close(" + param + ")'><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(" + e + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                "<button class='close-confirm' onClick='window.Vue.close(" + param + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                '</div>'
                }
                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">' +
@@ -287,10 +288,10 @@ export default {
          var rescuerPoint = this.rescuePoint({rescueEntityPosition: obj.data.currentEntityPosition})
          var lineWktStr = 'LINESTRING ( ' + obj.data.currentEntityPosition.longitude + ' ' + obj.data.currentEntityPosition.latitude + ',' + targetPoint.getAttributes().rescueTargetEntityPosition.longitude + ' ' + targetPoint.getAttributes().rescueTargetEntityPosition.latitude + ')'
          var lineLayer = new Ai.Polyline(lineWktStr, {color: 'red', opacity: 1.0})
          targetPoint.getAttributes().lineLayer = lineLayer
          rescuerPoint.getAttributes().lineLayer = lineLayer
          targetPoint.getAttributes().point = rescuerPoint
          rescuerPoint.getAttributes().point = targetPoint
          targetPoint.lineLayer = lineLayer
          rescuerPoint.lineLayer = lineLayer
          targetPoint.point = rescuerPoint
          rescuerPoint.point = targetPoint
          this.map.addLayer(lineLayer)
        }
      }
@@ -467,56 +468,11 @@ export default {
              this.personLayer.eachLayer(layer => {
                this.map.removeLayer(layer)
                this.map.closePopup()
                if (layer.lineLayer && this.map.hasLayer(layer.lineLayer)) {
                  this.map.removeLayer(layer.lineLayer)
                }
              })
              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) => {
              // 请求失败处理...
@@ -537,24 +493,11 @@ export default {
              this.personLayer.eachLayer(layer => {
                this.map.removeLayer(layer)
                this.map.closePopup()
                if (layer.lineLayer && this.map.hasLayer(layer.lineLayer)) {
                  this.map.removeLayer(layer.lineLayer)
                }
              })
              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) => {
            // 请求失败处理...

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

@@ -74,8 +74,20 @@ export default {
    // 镜屏调用
    this.load()
    this.connect()
    this.getGisToken()
  },
  methods: {
    async getGisToken() { // 获取GIS token并存入store
      await this.$test
          .post(services.mapTag.GET_MAP_PARAM, '')
          .then((res) => {
            this.$store.commit('setGisToken', res.data.ak)
            this.$store.commit('setMapParam', {center: [res.data.latitude, res.data.longitude], zoom: res.data.scale})
          })
          .catch((res) => {
            // 请求失败处理...
          })
    },
    load() {
      this.$test
        .post(services.organization.BIND_DEVICE, {})
@@ -154,6 +166,7 @@ export default {
      this.stompClient.subscribe('alarm', (msg) => {
        console.log('alarm' + msg)
        this.alarmOpen(msg)
        EventBus.$emit('person', msg.body)
      })
      this.stompClient.subscribe('ship', (msg) => {
        console.log(msg)

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

@@ -271,12 +271,14 @@ export default {
    }
  },
  mounted() {
    this.getTagType()
    this.getToolType()
    this.getGisToken().then(() => { // 获取gistoken后加载地图
      this.initMap()
      this.initTrackMap()
      this.initStatusCount()
    // this.getGisToken().then(() => { // 获取gistoken后加载地图
    // })
    this.getTagType().then(() => {
      this.getToolType().then(() => {
        this.initMap()
        this.initTrackMap()
        this.initStatusCount()
      })
    })
    setInterval(() => { // 当前时间
      this.nowDate = new Date()
@@ -301,19 +303,19 @@ export default {
    })
  },
  methods: {
    async getGisToken() { // 获取GIS token并存入store
    // async getGisToken() { // 获取GIS token并存入store
    //   await this.$test
    //     .post(services.mapTag.GET_MAP_PARAM, '')
    //     .then((res) => {
    //       this.$store.commit('setGisToken', res.data.ak)
    //       this.$store.commit('setMapParam', {center: [res.data.latitude, res.data.longitude], zoom: res.data.scale})
    //     })
    //     .catch((res) => {
    //       // 请求失败处理...
    //     })
    // },
    async getTagType() {
      await this.$test
        .post(services.mapTag.GET_MAP_PARAM, '')
        .then((res) => {
          this.$store.commit('setGisToken', res.data.ak)
          this.$store.commit('setMapParam', {center: [res.data.latitude, res.data.longitude], zoom: res.data.scale})
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    getTagType: function () {
      this.$test
        .post(services.mapTag.MAP_TAG_TYPE, {})
        .then((res) => {
          // 请求成功处理...
@@ -326,8 +328,8 @@ export default {
          // 请求失败处理...
        })
    },
    getToolType: function () {
      this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
    async getToolType() {
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        this.toolTypes = res.data
@@ -708,10 +710,10 @@ export default {
          return 'outline'
          break
        case '050': // 自动告警 ------ 红色
          return 'sso'
          return 'sos'
          break
        case '040': // 手动告警 ------ 红色
          return 'sso'
          return 'sos'
          break
        case '030': // 离线 ------ 灰色
          return 'offline'
@@ -806,10 +808,16 @@ export default {
        .then((res) => {
          console.log(res)
          res.data.forEach(e => {
            var url = ''
            this.toolTypes.forEach(t => {
              if (e.resourceToolType == t.resourceToolType) {
                url = t.iconUrl
              }
            })
            var point = Ai.Point([e.latitude, e.longitude], {
              icon: Ai.Icon({
                // 设置图标URL路径
                iconUrl: '/static/images/fan.png',
                iconUrl: url,
                // 设置图标大小
                iconSize: [20, 20],
                // 设置点对象和图标的相对偏移量
@@ -920,7 +928,14 @@ export default {
            var la = new Ai.FeatureGroup()
            res.data.forEach(e => {
              var wktstr = e.mapAreaContent
              var polygon = Ai.Polygon(wktstr, {color: 'red'})
              debugger
              var areaColor = ''
              this.markTypes.forEach(m => {
                if (m.mapAreaBusinessType == e.businessType) {
                  areaColor = m.color
                }
              })
              var polygon = Ai.Polygon(wktstr, {color: areaColor, opacity: 1.0, weight: 1.2})
              la.addLayer(polygon)
            })
            this.trackMap.addLayer(la)