首页修改提交

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

@@ -36,7 +36,7 @@
          "
        >轨迹</t-button
        >
        <div style="min-width:100px">悬浮窗<t-switch rounded></t-switch></div>
        <div style="min-width:100px">悬浮窗<t-switch v-model="switch1" rounded @change="switchChange"></t-switch></div>
      </div>
    </div>
    <div id="div1" style="height: 100%"></div>
@@ -193,9 +193,11 @@ export default {
  data() {
    return {
      map: null,
      switch1: true,
      pointsarr: null,
      markTypes: [],
      toolTypes: [],
      popups: [],
      aggregatedMapAreaList: {
        mapAreas: [], // 围栏集合
        coreEntitys: [] // 聚合设备集合
@@ -406,20 +408,66 @@ export default {
      this.$test.post(services.organization.INIT_LOCATION_DETAILS, {}
      ).then(res => {
        // 请求成功处理...
        this.loadUnaggregated(res.data.unaggregatedEntityPositionList)
        res.data.aggregatedMapAreaList.forEach(e => {
          if (e.businessType) {
          if (e.mapAreaContent) {
            this.aggregatedMapAreaList.mapAreas.push(e)
          } else {
            this.aggregatedMapAreaList.coreEntitys.push(e)
          }
        })
        this.map.on('popupclose', this.popClose)
        this.map.on('popupopen', this.popOpen)
        this.loadMapArea()
        this.loadCoreEntity()
        this.loadMapView()
        // this.loadMapView()
      }).catch(res => {
        // 请求失败处理...
      })
    },
    loadCoreEntity() {
      this.map.addLayer(this.layer.equipmentLayer)
      this.aggregatedMapAreaList.coreEntitys.forEach(e => {
        if (e.latitude) {
          var url = '/static/images/ship.png'
          var businessTypeName = '设备'
          this.toolTypes.forEach(t => {
            if (e.coreEntityType == t.resourceToolType) {
              url = t.iconUrl
              businessTypeName = t.name
            }
          })
          if (e.employeeCount > 0) {
            var classStr = this.getClassByStatus(e.locationStatus)
            var point = Ai.Point([e.latitude, e.longitude], {
              icon: Ai.DivIcon({
                html: '<div class="' + classStr + '">' + e.employeeCount + '人</div>',
                className: 'person-count',
                // 设置图标大小
                // iconSize: [20, 20],
                // 设置点对象和图标的相对偏移量
                iconAnchor: [15, 50]
              })
            })
            point.setAttributes({'resourceToolType': ''})
            this.layer.equipmentLayer.addLayer(point)
            this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40])
          }
          var coreEntity = Ai.Point([e.latitude, e.longitude], {
            icon: Ai.Icon({
              // 设置图标URL路径
              iconUrl: url,
              // 设置图标大小
              iconSize: [20, 20],
              // 设置点对象和图标的相对偏移量
              iconAnchor: [100, 100]
            })
          })
          coreEntity.setAttributes({'resourceToolType': '002'})
          this.layer.equipmentLayer.addLayer(coreEntity)
        }
      })
    },
    loadMapArea() {
      this.map.addLayer(this.layer.areaLayer)
      this.aggregatedMapAreaList.mapAreas.forEach(e => {
@@ -447,8 +495,8 @@ export default {
              businessTypeName = m.name
            }
          })
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName)
          point.setAttributes({'mapAreaBusinessType': e.businessType})
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10])
          point.setAttributes({'mapAreaBusinessType': ''})
        }
      })
    },
@@ -490,14 +538,30 @@ export default {
          return 'normal'
      }
    },
    getPopup(point, positionList, type, name) {
    switchChange(status) {
      console.log(status)
      if (status) {
        this.popups.forEach(e => {
          e.openOn(this.map)
        })
      } else {
        this.popups.forEach(e => {
          this.map.closePopup(e)
        })
      }
    },
    getPopup(point, positionList, type, name, offset) {
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -10],
        // autoClose: true,
        offset: offset,
        autoClose: false,
        autoPan: false,
        closeButton: true
      })
      var content = '<div class="tips-item"><div class="top"><div>' + type + ':</div><div>' + name + '</div></div><div class="container">'
      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>'
@@ -510,27 +574,28 @@ export default {
      popup.openOn(this.map)
      point.popup = popup
      point.on('click', (e) => {
        point.popup.openOn(this.map)
        if (point.popup.openo) {
          this.map.closePopup(point.popup)
        } else {
          point.popup.openOn(this.map)
        }
      })
      this.popups.push(popup)
      popup.openo = true
      return popup
    },
    loadMapView() {
      this.$test
        .post(services.organization.MAP_LOCATION_VIEW, {})
        .then((res) => {
          console.log(res)
          this.loadUnaggregated(res.data.unaggregatedEntityPositionList)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    popClose(e) {
      e.popup.openo = false
    },
    popOpen(e) {
      e.popup.openo = true
    },
    loadUnaggregated(dataList) { // 加载不聚合的人
      var points = []
      dataList.forEach(element => {
        var classStr = this.getClassByStatus(element.locationStatus)
        var point = Ai.Point([element.latitude, element.longitude], {
          icon: Ai.DivIcon({
            html: '<div class="sos">1人</div>',
            html: '<div class="' + classStr + '">1人</div>',
            className: 'person-count',
            // 设置图标大小
            // iconSize: [20, 20],
@@ -539,81 +604,18 @@ export default {
          })
        })
        this.map.addLayer(point)
        var popup = Ai.Popup({
          minWidth: 100,
          offset: [0, -10],
          autoClose: false,
          closeButton: false
        })
        var content =
                  '<div class="tips-item"><div class="container">' +
                  '<div class="sos">' + element.name + '</div>' +
                 '</div></div>'
        // 设置弹出框弹出位置
        popup.setLatLng(point.getLatLng())
        // 设置弹出框弹出内容
        popup.setContent(content)
        popup.openOn(this.map)
        points.push(point)
        this.getPopup(point, [element], '', '', [0, -10])
      })
      this.map.setViewPort([points])
      // this.map.setViewPort([points])
    },
    loadAggregated(dataList) {
    },
    loadCoreEntity() {
      var point = Ai.Point([32.04533333333333, 125.4221944444444], {
        icon: Ai.DivIcon({
          html: '<div class="sos">4人</div>',
          className: 'person-count',
          // 设置图标大小
          // iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [15, 50]
        })
      })
      var point2 = Ai.Point([32.04533333333333, 125.4221944444444], {
        icon: Ai.Icon({
          // 设置图标URL路径
          iconUrl: '/static/images/fan.png',
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [100, 100]
        })
      })
      point.setAttributes({'resourceToolType': '002'})
      point2.setAttributes({'resourceToolType': '002'})
      var layer = this.layer.equipmentLayer
      layer.addLayer(point)
      layer.addLayer(point2)
      this.map.addLayer(layer)
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -40],
        // autoClose: true,
        closeButton: true
      })
      var content =
                  '<div class="tips-item"><div class="top"><div class="fengji"></div><div>风机</div><div>FJ001</div></div><div class="container">' +
                  '<div class="sos">张三</div><div class="normal">张三</div><div class="outline">张三</div><div class="offline">张三</div><div class="sos">张三</div>' +
                 '</div></div>'
      // 设置弹出框弹出位置
      popup.setLatLng(point.getLatLng())
      // 设置弹出框弹出内容
      popup.setContent(content)
      popup.openOn(this.map)
      this.popup = popup
      point.on('click', (e) => {
        this.popup.openOn(this.map)
      })
    },
    showOrHide(layer, item) { // 地图设备人员围栏显示和隐藏
      item.show = !item.show
      layer.eachLayer((e) => {
        if ((e.getAttributes().resourceToolType == item.resourceToolType && item.resourceToolType != undefined) || (e.getAttributes().mapAreaBusinessType == item.mapAreaBusinessType && item.mapAreaBusinessType != undefined)) {
          if (this.map.hasLayer(e)) {
            this.map.removeLayer(e)
            debugger
            if (e.popup) {
              this.map.closePopup(e.popup)
            }

ebc-middle-platform/src/modules/system-management/equipment-management.vue

@@ -237,11 +237,6 @@ export default {
        ],
        radius: [
          {
            required: true,
            message: '半径不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
@@ -327,11 +322,6 @@ export default {
        ],
        radius: [
          {
            required: true,
            message: '半径不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {