修改提交

ebc-middle-platform/.aid/aid.js

@@ -55,5 +55,7 @@ module.exports = {
    }
    return result
  },
  imagePrefix: '/energy/',
  staticPrefix: '/energy/',
  outputPrefix: '/energy/' // 构建后index.html中资源路径的前缀
}

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

@@ -70,6 +70,8 @@ export default {
    SEARCHSTAFF: '/staff/staffId/', // 根据组织id新建post, 修改put，删除delete员工信息
    QUERYSTAFF: '/staff/queryStaff', // 根据组织id查找员工列表
    MAP_LOCATION_VIEW: '/locationManagement/loadMapLocationView', // 初始化人员定位页面的数据
    INIT_STATUS_COUNT: '/locationManagement/loadEmployeeStatusCount', // 初始化顶部状态人数统计
    INIT_LOCATION_DETAILS: '/locationManagement/loadLocationDetails', // 位置信息,围栏数据的初始化
    BIND_DEVICE: '/workEmployee/queryEmployeeBindDeviceList', // 查询绑定的人员列表
    FENCE_BY_DEPARTMENT: '/mapTag/queryAllMapTagByOrg', // 按部门查询查询围栏
    EQUIPMENT_NOT_BIND: '/equipment/queryAllEquipmentNotBind' // 查询所有未绑定的设备

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

@@ -1,8 +1,8 @@
.orientation-container{
    width: 100%;
    height: 88%;
    padding-left: 40px;
    padding-right: 40px;
    height: 90%;
    padding-left: 0px;
    padding-right: 0px;
    box-sizing: border-box;
    .top-container{
      display: flex;
@@ -27,25 +27,25 @@
            height: 10px;
            margin-top: 15px;
            background-color: #19BB20;
          }  
          }
          .off-line{
            width: 10px;
            height: 10px;
            margin-top: 15px;
            background-color: #2B3944;
          } 
          }
          .out-line{
            width: 10px;
            height: 10px;
            margin-top: 15px;
            background-color: #FAAD14;
          } 
          }
          .sos{
            width: 10px;
            height: 10px;
            margin-top: 15px;
            background-color:#F5222D;
          } 
          }
        }
        .time{
          font-size: 16px;
@@ -77,7 +77,7 @@
    .label{
      position: absolute;
      z-index: 10;
      right: 150px;
      right: 50px;
      bottom: 77px;
      background-color: #59748A;
      font-size: 12px;
@@ -123,7 +123,7 @@
            width: 10px;
            height: 10px;
            background-size: 100% 100%;
            background-image: url('/static/images/风机.png');
            background-image: url('/static/images/fan.png');
            margin-top: 10px;
            margin-right: 5px;
          }
@@ -131,7 +131,7 @@
            width: 10px;
            height: 10px;
            background-size: 100% 100%;
            background-image: url('/static/images/升压站画面.png');
            background-image: url('/static/images/booster.png');
            margin-top: 10px;
            margin-right: 5px;
          }
@@ -139,7 +139,6 @@
            width: 10px;
            height: 10px;
            background-size: 100% 100%;
            background-image: url('/static/images/船舶.png');
            margin-top: 10px;
            margin-right: 5px;
          }
@@ -153,7 +152,6 @@
          .dzwl{
            width: 10px;
            height: 10px;
            background-color: #A74B5C;
            margin-top: 10px;
            margin-right: 5px;
          }
@@ -238,7 +236,7 @@ background: #344979!important;
.aimap-popup-tip{
  background-color: #344979;
}
} 
}
.point-out{
  color: #fff;
  background-color: #147BD1;
@@ -300,7 +298,7 @@ background: #344979!important;
      width: 25px;
      height: 25px;
      background-size: 100% 100%;
      background-image: url(/static/images/风机.png);
      background-image: url(/static/images/fan.png);
      margin-top: 7.5px;
    }
    .alarm{
@@ -459,4 +457,4 @@ background: #344979!important;
    background-color: #D9D9D9;
    color: #000000;
  }
}
}

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

@@ -2,22 +2,22 @@
  <div class="orientation-container">
    <div class="top-container">
      <div class="person-info">
        <div>全部<span class="number">{{ personStatistics.all }}</span>人</div>
        <div>全部<span class="number">{{ personStatistics.allNum }}</span>人</div>
        <div>
          <div class="normal"></div>
          正常<span class="number">{{ personStatistics.normal }}</span>人
          正常<span class="number">{{ personStatistics.normalNum }}</span>人
        </div>
        <div>
          <div class="off-line"></div>
          离线<span class="number">{{ personStatistics.offLine }}</span>人
          离线<span class="number">{{ personStatistics.offlineNum }}</span>人
        </div>
        <div>
          <div class="out-line"></div>
          违规<span class="number">{{ personStatistics.outLine }}</span>人
          违规<span class="number">{{ personStatistics.violationNum }}</span>人
        </div>
        <div>
          <div class="sos"></div>
          SOS<span class="number">{{ personStatistics.sos }}</span>人
          SOS<span class="number">{{ personStatistics.sosNum }}</span>人
        </div>
        <div class="time">当前时间：{{ nowDate | dateFormat }}</div>
      </div>
@@ -42,45 +42,33 @@
    <div id="div1" style="height: 100%"></div>
    <div class="label">
      <div class="item">
        <div :class="mapShow.sos?'':'cancel'" @click="showOrHide(layer.personLayer,'sos',['4','5'])">
        <div :class="mapShow.sos?'':'cancel'">
          <div class="sos"></div>
          <div>SOS</div>
        </div>
        <div :class="mapShow.offLine?'':'cancel'" @click="showOrHide(layer.personLayer,'offLine',['1'])">
        <div :class="mapShow.offLine?'':'cancel'">
          <div class="offline"></div>
          <div>离线</div>
        </div>
        <div :class="mapShow.outLine?'':'cancel'" @click="showOrHide(layer.personLayer,'outLine',['2','3'])">
        <div :class="mapShow.outLine?'':'cancel'">
          <div class="outline"></div>
          <div>违规</div>
        </div>
        <div :class="mapShow.normal?'':'cancel'" @click="showOrHide(layer.personLayer,'normal',['0'])">
        <div :class="mapShow.normal?'':'cancel'">
          <div class="normal"></div>
          <div>正常</div>
        </div>
      </div>
      <div class="item">
        <div :class="mapShow.fenji?'':'cancel'" @click="showOrHide(layer.equipmentLayer,'fenji',['002'])">
          <div class="fenji"></div>
          <div>风机</div>
        </div>
        <div :class="mapShow.shengyazhan?'':'cancel'" @click="showOrHide(layer.equipmentLayer,'shengyazhan',['003'])">
          <div class="shengyazhan"></div>
          <div>升压站</div>
        </div>
        <div :class="mapShow.chuanbo?'':'cancel'" @click="showOrHide(layer.equipmentLayer,'chuanbo',['001'])">
          <div class="chuanbo"></div>
          <div>船舶</div>
        <div v-for="(item, index) in toolTypes" :key="index" :class="item.show?'':'cancel'" @click="showOrHide(layer.equipmentLayer,item)">
          <div :style="{ 'background-image': 'url('+item.iconUrl+')' }" class="chuanbo"></div>
          <div>{{ item.name }}</div>
        </div>
      </div>
      <div class="item">
        <div :class="mapShow.zyqy?'':'cancel'" @click="showOrHide(layer.areaLayer,'zyqy',['2'])">
          <div class="zyqy"></div>
          <div>作业区域</div>
        </div>
        <div :class="mapShow.dzwl?'':'cancel'" @click="showOrHide(layer.areaLayer,'dzwl',['3'])">
          <div class="dzwl"></div>
          <div>电子围栏</div>
        <div v-for="(item, index) in markTypes" :key="index" :class="item.show?'':'cancel'" @click="showOrHide(layer.areaLayer,item)">
          <div :style="{ background: item.color}" class="dzwl"></div>
          <div>{{ item.name }}</div>
        </div>
      </div>
    </div>
@@ -206,6 +194,12 @@ export default {
    return {
      map: null,
      pointsarr: null,
      markTypes: [],
      toolTypes: [],
      aggregatedMapAreaList: {
        mapAreas: [], // 围栏集合
        coreEntitys: [] // 聚合设备集合
      },
      personStatistics: {
        all: 0,
        offLine: 0,
@@ -334,9 +328,12 @@ export default {
    }
  },
  mounted() {
    this.getTagType()
    this.getToolType()
    this.getGisToken().then(() => { // 获取gistoken后加载地图
      this.initMap()
      this.initTrackMap()
      this.initStatusCount()
    })
    setInterval(() => { // 当前时间
      this.nowDate = new Date()
@@ -362,6 +359,32 @@ export default {
          // 请求失败处理...
        })
    },
    getTagType: function () {
      this.$test
        .post(services.mapTag.MAP_TAG_TYPE, {})
        .then((res) => {
          // 请求成功处理...
          this.markTypes = res.data
          this.markTypes.forEach(e => {
            e.show = true
          })
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    getToolType: function () {
      this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        this.toolTypes = res.data
        this.toolTypes.forEach(e => {
          e.show = true
        })
      }).catch(res => {
        // 请求失败处理...
      })
    },
    initMap() { // 加载主屏地图
      if (this.map != null && this.map != '') {
        this.map.remove()
@@ -378,11 +401,118 @@ export default {
        { opacity: 0.5 }
      )
      this.map.addLayer(la)
      Ai.Scale({ position: 'bottomright' }).addTo(this.map)
      Ai.Zoom({ type: 'small' }).addTo(this.map)
      this.loadMapArea()
      this.loadMapView()
      this.$test.post(services.organization.INIT_LOCATION_DETAILS, {}
      ).then(res => {
        // 请求成功处理...
        res.data.aggregatedMapAreaList.forEach(e => {
          if (e.businessType) {
            this.aggregatedMapAreaList.mapAreas.push(e)
          } else {
            this.aggregatedMapAreaList.coreEntitys.push(e)
          }
        })
        this.loadMapArea()
        this.loadCoreEntity()
        this.loadMapView()
      }).catch(res => {
        // 请求失败处理...
      })
    },
    loadMapArea() {
      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})
        coverLayer.setAttributes({'mapAreaBusinessType': e.businessType})
        this.layer.areaLayer.addLayer(coverLayer)
        if (e.ebcEntityPositionList.length > 0) {
          var la = coverLayer.getCenter()
          var classStr = this.getClassByStatus(e.locationStatus)
          var point = Ai.Point(la, {
            icon: Ai.DivIcon({
              html: '<div class="' + classStr + '">' + e.ebcEntityPositionList.length + '人</div>',
              className: 'person-count',
              // 设置图标大小
              // iconSize: [20, 20],
              // 设置点对象和图标的相对偏移量
              iconAnchor: [15, 15]
            })
          })
          this.layer.areaLayer.addLayer(point)
          var businessTypeName
          this.markTypes.forEach(m => {
            if (m.mapAreaBusinessType == e.businessType) {
              businessTypeName = m.name
            }
          })
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName)
          point.setAttributes({'mapAreaBusinessType': e.businessType})
        }
      })
    },
    getClassByStatus(status) {
      // "060";  // 救援人员 ------ 黄色
      // "050";  // 自动告警 ------ 红色
      // "040";  // 手动告警 ------ 红色
      // "030";  // 离线 ------ 灰色
      // "020";  // 进入了禁入区域 ------ 黄色
      // "010";  // 在限制区域超时 ------ 黄色
      // "015";  // 进入限制区域（尚未超时） ------ 绿色
      // "000";  // 正常 ------ 绿色
      switch (status) {
        case '060':
          return 'outline'
          break
        case '050':
          return 'sso'
          break
        case '040':
          return 'sso'
          break
        case '030':
          return 'offline'
          break
        case '020':
          return 'outline'
          break
        case '010':
          return 'outline'
          break
        case '000':
          return 'normal'
          break
        case '015':
          return 'normal'
          break
        default:
          return 'normal'
      }
    },
    getPopup(point, positionList, type, name) {
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -10],
        // autoClose: true,
        closeButton: true
      })
      var content = '<div class="tips-item"><div class="top"><div>' + type + ':</div><div>' + name + '</div></div><div class="container">'
      positionList.forEach(e => {
        content +=
            '<div class="' + this.getClassByStatus(e.locationStatus) + '">' + e.name + '</div>'
      })
      content += '</div></div>'
      // 设置弹出框弹出位置
      popup.setLatLng(point.getLatLng())
      // 设置弹出框弹出内容
      popup.setContent(content)
      popup.openOn(this.map)
      point.popup = popup
      point.on('click', (e) => {
        point.popup.openOn(this.map)
      })
      return popup
    },
    loadMapView() {
      this.$test
@@ -430,9 +560,7 @@ export default {
    },
    loadAggregated(dataList) {
    },
    loadMapArea() {
      // data.forEach(element => {
      // })
    loadCoreEntity() {
      var point = Ai.Point([32.04533333333333, 125.4221944444444], {
        icon: Ai.DivIcon({
          html: '<div class="sos">4人</div>',
@@ -446,22 +574,24 @@ export default {
      var point2 = Ai.Point([32.04533333333333, 125.4221944444444], {
        icon: Ai.Icon({
          // 设置图标URL路径
          iconUrl: '/static/images/风机.png',
          iconUrl: '/static/images/fan.png',
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [100, 100]
        })
      })
      var layer = new Ai.FeatureGroup()
      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: false,
        closeButton: false
        // 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">' +
@@ -472,16 +602,26 @@ export default {
      // 设置弹出框弹出内容
      popup.setContent(content)
      popup.openOn(this.map)
      this.popup = popup
      point.on('click', (e) => {
        this.popup.openOn(this.map)
      })
    },
    showOrHide(layer, type, arr) { // 地图设备人员围栏显示和隐藏
    showOrHide(layer, item) { // 地图设备人员围栏显示和隐藏
      item.show = !item.show
      layer.eachLayer((e) => {
        if (arr.indexOf(e.getAttributes().locationStatus) != -1 || arr.indexOf(e.getAttributes().FACILITY_TYPE) != -1 || arr.indexOf(e.getAttributes().MAP_TAG_TYPE) != -1) {
        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)
            this.mapShow[type] = false
            debugger
            if (e.popup) {
              this.map.closePopup(e.popup)
            }
          } else {
            this.map.addLayer(e)
            this.mapShow[type] = true
            if (e.popup) {
              e.popup.openOn(this.map)
            }
          }
        }
      })
@@ -518,6 +658,16 @@ export default {
          // 请求失败处理...
        })
    },
    initStatusCount() {
      this.$test
        .post(services.organization.INIT_STATUS_COUNT, {})
        .then((res) => {
          this.personStatistics = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadNotBindEquipment() {
      this.$test
        .post(services.organization.EQUIPMENT_NOT_BIND, {})
@@ -527,7 +677,7 @@ export default {
            var point = Ai.Point([e.latitude, e.longitude], {
              icon: Ai.Icon({
                // 设置图标URL路径
                iconUrl: '/static/images/风机.png',
                iconUrl: '/static/images/fan.png',
                // 设置图标大小
                iconSize: [20, 20],
                // 设置点对象和图标的相对偏移量

ebc-middle-platform/src/modules/system-management/map-mark.vue

@@ -134,7 +134,7 @@
            ></t-input>
          </div>
        </div>
        <div v-show="markType == 4">
        <div v-show="markType == 'LIM'">
          <div class="label">停留时长:</div>
          <div class="input-rule">
            <t-input