定位提交

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

@@ -466,11 +466,11 @@ export default {
            .then((res) => {
              this.modal = false
              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.map.removeLayer(layer)
                this.map.closePopup()
              })
              this.load()
            })
@@ -491,11 +491,11 @@ export default {
            .then((res) => {
              console.log(res)
              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.map.removeLayer(layer)
                this.map.closePopup()
              })
              this.load()
            })

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

@@ -224,7 +224,7 @@ export default {
        currentIndex: 0
      },
      trackMap: null,
	  trackPath: null,
	    trackPath: null,
      rangeDate: '',
      rescueModal: false,
      formValidate: {
@@ -414,7 +414,7 @@ export default {
              })
            })
            this.map.addLayer(point)
            this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40])
            this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40], url)
            coreEntity.point = point
          }
        }
@@ -448,7 +448,7 @@ export default {
              businessTypeName = m.name
            }
          })
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10])
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10], '')
        }
      })
    },
@@ -517,7 +517,7 @@ export default {
                    businessTypeName = m.name
                  }
                })
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10])
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10], '')
              }
            }
          })
@@ -545,23 +545,24 @@ export default {
                })
                this.map.addLayer(point)
                var businessTypeName = '设备'
                var url
                this.toolTypes.forEach(t => {
                  if (e.coreEntityType == t.resourceToolType) {
                    url = t.iconUrl
                    businessTypeName = t.name
                  }
                })
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40])
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40], url)
                la.point = point
              }
            }
            console.log('..............')
          })
        }
      })
      // this.loadMapArea()
      // this.loadCoreEntity()
    },
    getPopup(point, positionList, type, name, offset) {
    getPopup(point, positionList, type, name, offset, url) {
      // if (point.popup) {
      //   point.popup.remove()
      //   point.popup = null
@@ -580,7 +581,11 @@ 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="top">'
        if (url) {
          content += '<div><img src="' + url + '" width="20" height="20"></div>'
        }
        content += '<div>' + name + '</div></div>'
        content += '<div class="container">'
        positionList.forEach(e => {
          content +=
@@ -638,7 +643,7 @@ export default {
        point.setAttributes({'elementId': element.entityId})
        this.layer.personLayer.addLayer(point)
        // this.map.addLayer(point)
        this.getPopup(point, [element], '', '', [0, -10])
        this.getPopup(point, [element], '', '', [0, -10], '')
      })
      // this.map.setViewPort([points])
    },
@@ -665,7 +670,7 @@ export default {
            // point.setAttributes({'elementId': element.entityId})
            // this.layer.personLayer.addLayer(point)
            // this.map.addLayer(point)
            this.getPopup(la, [element], '', '', [0, -10])
            this.getPopup(la, [element], '', '', [0, -10], '')
          }
        })
        if (is) {
@@ -684,7 +689,7 @@ export default {
          point.setAttributes({'elementId': element.entityId})
          this.layer.personLayer.addLayer(point)
          // this.map.addLayer(point)
          this.getPopup(point, [element], '', '', [0, -10])
          this.getPopup(point, [element], '', '', [0, -10], '')
        }
      })
      // this.map.setViewPort([points])
@@ -706,30 +711,22 @@ export default {
    },
    getClassByStatus(status) {
      switch (status) {
        case '060': // 救援人员 ------ 黄色
          return 'outline'
          break
        case '050': // 自动告警 ------ 红色
          return 'sos'
          break
        case '040': // 手动告警 ------ 红色
          return 'sos'
          break
        case '030': // 离线 ------ 灰色
          return 'offline'
          break
        case '060': // 救援人员 ------ 黄色
        case '020': // 进入了禁入区域 ------ 黄色
        case '015': // 在限制区域超时 ------ 黄色
          return 'outline'
          break
        case '010': // 在限制区域超时 ------ 黄色
          return 'outline'
          break
        case '010': // 进入限制区域（尚未超时） ------ 绿色
        case '000': // 正常 ------ 绿色
          return 'normal'
          break
        case '015': // 进入限制区域（尚未超时） ------ 绿色
          return 'normal'
          break
        default:
          return 'normal'
      }
@@ -946,6 +943,10 @@ export default {
      }
    },
    playback() {
      if (this.trackMap.hasLayer(this.trackPath)) {
        this.trackMap.removeLayer(this.trackPath)
        this.trackPath.hideTraceFrom(this.trackMap)
      }
      console.log(this.trackQueryCondition.currentIndex)
      var params = {}
      if (this.trackQueryCondition.currentIndex === 3) {