首页修改提交

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

@@ -412,6 +412,36 @@ background: #344979!important;
      color: #000000;
    }
  }
  .container1{
    display: flex;
    flex-wrap: wrap;
    padding: 10px 0 10px 0px;
    div{
      width: 80%;
      color: #ffffff;
      font-size: 10px;
      line-height: 20px;
      height: 20px;
      margin: 10px;
      text-align: center;
      border-radius: 3px;
    }
    .sos{
      background-color: #F5222D;
      animation:pointsos 1s ease infinite;
      -webkit-animation:pointsos 1s ease infinite;
    }
    .normal{
      background-color: #19BB20;
    }
    .outline{
      background-color: #FAAD14;
    }
    .offline{
      background-color: #D9D9D9;
      color: #000000;
    }
  }
  .footer{
    height: 40px;
    border-top: 1px solid #E0E0E0;

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

@@ -283,8 +283,11 @@ export default {
    }, 1000)
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
      msg = JSON.parse(msg)
      // console.log(msg)
      console.log(msg)
      this.personStatistics = msg.data.countMap
      if (msg.data.aggregatedMapAreaList.length === 1 && msg.data.unaggregatedEntityPositionList.length === 0){
        this.removeUnaggregated(msg.data.currentEntityPosition)
      }
      if (msg.data.aggregatedMapAreaList) {
        this.changeLocation(msg.data.aggregatedMapAreaList)
      }
@@ -302,8 +305,8 @@ export default {
      await this.$test
        .post(services.mapTag.GET_MAP_PARAM, '')
        .then((res) => {
          this.$store.commit('setGisToken', res.data.result.ak)
          this.$store.commit('setMapParam', {center: [res.data.result.latitude, res.data.result.longitude], zoom: res.data.result.scale})
          this.$store.commit('setGisToken', res.data.ak)
          this.$store.commit('setMapParam', {center: [res.data.latitude, res.data.longitude], zoom: res.data.scale})
        })
        .catch((res) => {
          // 请求失败处理...
@@ -376,8 +379,8 @@ export default {
      this.map.addLayer(this.layer.equipmentLayer)
      this.aggregatedMapAreaList.coreEntitys.forEach(e => {
        if (e.latitude) {
          var url = '/static/images/ship.png'
          var businessTypeName = '设备'
          var url = ''
          var businessTypeName = ''
          this.toolTypes.forEach(t => {
            if (e.coreEntityType == t.resourceToolType) {
              url = t.iconUrl
@@ -419,7 +422,7 @@ export default {
      this.map.addLayer(this.layer.areaLayer)
      this.aggregatedMapAreaList.mapAreas.forEach(e => {
        var coverWktStr = e.mapAreaContent
        var coverLayer = Ai.Polygon(coverWktStr, {color: e.areaColor, opacity: 1.0})
        var coverLayer = Ai.Polygon(coverWktStr, {color: e.areaColor, opacity: 1.0, weight: 1.2})
        coverLayer.setAttributes({'elementId': e.mapAreaId, 'mapAreaBusinessType': e.businessType})
        this.layer.areaLayer.addLayer(coverLayer)
        if (e.ebcEntityPositionList.length > 0) {
@@ -489,6 +492,7 @@ export default {
            if (e.mapAreaId == la.getAttributes().elementId) {
              if (la.point) {
                this.map.closePopup(la.point.popup)
                la.point.popup.remove()
                this.map.removeLayer(la.point)
              }
              if (e.ebcEntityPositionList.length > 0) {
@@ -520,6 +524,7 @@ export default {
            if (e.coreEntityId == la.getAttributes().elementId) {
              if (la.point) {
                this.map.closePopup(la.point.popup)
                la.point.popup.remove()
                this.map.removeLayer(la.point)
              }
              console.log(la.getAttributes().elementId)
@@ -565,6 +570,7 @@ export default {
      }
      point.popup = Ai.Popup({
        maxWidth: maxWidth,
        minWidth: 100,
        offset: offset,
        autoClose: false,
        autoPan: false,
@@ -573,19 +579,28 @@ export default {
      var content = '<div class="tips-item">'
      if (type) {
        content += '<div class="top"><div><b>' + type + '</b></div><div>' + name + '</div></div>'
        content += '<div class="container">'
        positionList.forEach(e => {
          content +=
              '<div class="' + this.getClassByStatus(e.locationStatus) + '">' + e.name + '</div>'
        })
        content += '</div></div>'
      } else {
        content += '<div class="container1">'
        positionList.forEach(e => {
          content +=
              '<div class="' + this.getClassByStatus(e.locationStatus) + '">' + e.name + '</div>'
        })
        content += '</div></div>'
      }
      content += '<div class="container">'
      positionList.forEach(e => {
        content +=
            '<div class="' + this.getClassByStatus(e.locationStatus) + '">' + e.name + '</div>'
      })
      content += '</div></div>'
      // 设置弹出框弹出位置
      point.popup.setLatLng(point.getLatLng())
      // 设置弹出框弹出内容
      point.popup.setContent(content)
      if (this.switch1) {
        point.popup.openOn(this.map)
      } else {
        this.popClose(point.popup)
      }
      // point.popup = popup
      point.on('click', (e) => {
@@ -630,7 +645,6 @@ export default {
        var is = true
        this.layer.personLayer.eachLayer((la) => {
          if (element.entityId == la.getAttributes().elementId) {
            debugger
            is = false
            this.map.closePopup(la.popup)
            la.popup.remove()
@@ -673,6 +687,21 @@ export default {
      })
      // this.map.setViewPort([points])
    },
    removeUnaggregated(po) { // 删除不聚合的人
      this.layer.personLayer.eachLayer((la) => {
        var e = undefined;
        if (po.entityId == la.getAttributes().elementId) {
          console.log('删除' + po.name)
          this.map.closePopup(la.popup)
          la.popup.remove()
          e = la
        }
        if (e) {
          this.map.removeLayer(e)
          this.layer.personLayer.removeLayer(e)
        }
      })
    },
    getClassByStatus(status) {
      switch (status) {
        case '060': // 救援人员 ------ 黄色