提交

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

@@ -68,7 +68,11 @@ export default {
    GETBYNAMESEARCHORG: '/org/queryOrg/', // 根据NAME查组织
    STAFF: '/staff', // 根据组织id新建post, 修改put，删除delete员工信息
    SEARCHSTAFF: '/staff/staffId/', // 根据组织id新建post, 修改put，删除delete员工信息
    QUERYSTAFF: '/staff/queryStaff' // 根据组织id查找员工列表
    QUERYSTAFF: '/staff/queryStaff', // 根据组织id查找员工列表
    MAP_LOCATION_VIEW: '/locationManagement/loadMapLocationView', // 初始化人员定位页面的数据
    BIND_DEVICE: '/workEmployee/queryEmployeeBindDeviceList', // 查询绑定的人员列表
    FENCE_BY_DEPARTMENT: '/mapTag/queryAllMapTagByOrg', // 按部门查询查询围栏
    EQUIPMENT_NOT_BIND: '/equipment/queryAllEquipmentNotBind' // 查询所有未绑定的设备
  },
  position: {
    POSITION: '/position/', // 新增post，修改put，删除delete岗位信息

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

@@ -11,9 +11,10 @@
      .person-info{
        display: flex;
        font-size: 16px;
        div{
        >div{
          margin-right: 10px;
          display: flex;
          min-width: 85px;
          .number{
            color: #2373D2;
            font-size: 24px;
@@ -49,6 +50,7 @@
        .time{
          font-size: 16px;
          margin-left: 50px;
          min-width: 230px;
        }
      }
      .right-content{

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

@@ -36,7 +36,7 @@
          "
        >轨迹</t-button
        >
        <div>悬浮窗<t-switch rounded></t-switch></div>
        <div style="min-width:100px">悬浮窗<t-switch rounded></t-switch></div>
      </div>
    </div>
    <div id="div1" style="height: 100%"></div>
@@ -102,7 +102,7 @@
            style="width: 200px"
          ></t-input>
          <div>
            <div v-for="(item,index) in personList" :class="trackPerson==item.deviceId?'active':''" :key="index" @click="personTrack(item)">{{ item.userName }}</div>
            <div v-for="(item,index) in personList" :class="trackPerson==item.code?'active':''" :key="index" @click="personTrack(item)">{{ item.name }}</div>
          </div>
        </div>
        <div class="track-modal-right">
@@ -127,15 +127,7 @@
              placeholder="请选择时间"
              @date-change="onChangeDate">
            </t-date-picker>
            <!-- <t-date-picker
              :class="trackQueryCondition.currentIndex === 3?'':'hidden'"
              v-model="rangeDate"
              style="width: 250px"
              type="dateRange"
              placeholder="请选择时间"
              @date-change="onChangeDate"
            ></t-date-picker> -->
            <div style="display: flex;line-height:32.5px">
            <div style="display: flex;line-height:32.5px;width: 120px;">
              <div>速度</div>
              <t-select>
                <t-option>1x</t-option>
@@ -177,7 +169,7 @@
import './orientation.scss'
import services from '../../conf/services'
import EventBus from '../../bus'
import { GIS_SEA_LAYER_URL, GIS_SEA_URL } from '@/constants'
import { GIS_SEA_LAYER_URL, GIS_SEA_URL } from '../../constants'
export default {
  filters: {
    dateFormat(value) {
@@ -337,7 +329,8 @@ export default {
      personList: [],
      rescuer: [],
      appointAlarmId: '',
      trackPerson: ''
      trackPerson: '',
      orgId: ''
    }
  },
  mounted() {
@@ -378,29 +371,64 @@ export default {
        center: this.$store.getters.getMapParam.center,
        zoom: this.$store.getters.getMapParam.zoom
      })
      var maplayer
      maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      this.map.addLayer(maplayer)
      var la = Ai.WMTSLayer(
        GIS_SEA_URL,
        { opacity: 0.5 }
      )
      this.map.addLayer(maplayer)
      this.map.addLayer(la)
      Ai.Scale({ position: 'bottomright' }).addTo(this.map)
      Ai.Zoom({ type: 'small' }).addTo(this.map)
      this.loadMapArea()
      this.loadMapView()
    },
    loadMapView() {
      // this.$test
      //   .post(services.mapTag.GET_MAP_PARAM, {})
      //   .then((res) => {
      //     if (res.data.success) {
      //     }
      //   })
      //   .catch((res) => {
      //     // 请求失败处理...
      //   })
      this.$test
        .post(services.organization.MAP_LOCATION_VIEW, {})
        .then((res) => {
          console.log(res)
          this.loadUnaggregated(res.data.unaggregatedEntityPositionList)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadUnaggregated(dataList) { // 加载不聚合的人
      var points = []
      dataList.forEach(element => {
        var point = Ai.Point([element.latitude, element.longitude], {
          icon: Ai.DivIcon({
            html: '<div class="sos">1人</div>',
            className: 'person-count',
            // 设置图标大小
            // iconSize: [20, 20],
            // 设置点对象和图标的相对偏移量
            iconAnchor: [15, 15]
          })
        })
        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.map.setViewPort([points])
    },
    loadAggregated(dataList) {
    },
    loadMapArea() {
      // data.forEach(element => {
@@ -422,7 +450,7 @@ export default {
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [0, 0]
          iconAnchor: [100, 100]
        })
      })
      var layer = new Ai.FeatureGroup()
@@ -432,7 +460,7 @@ export default {
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -40],
        autoClose: true,
        autoClose: false,
        closeButton: false
      })
      var content =
@@ -469,14 +497,49 @@ export default {
        ak: this.$store.getters.getGisToken,
        center: [39.915599, 122.406568]
      })
      var maplayer = null
      maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var la = Ai.WMTSLayer(GIS_SEA_URL, {opacity: 0.5})
      this.trackMap.addLayer(maplayer)
      this.trackMap.addLayer(la)
      Ai.Scale({position: 'bottomright'}).addTo(this.trackMap)
      Ai.Zoom({type: 'small'}).addTo(this.trackMap)
      this.loadBindDevicePerson()
      this.loadNotBindEquipment()
    },
    loadBindDevicePerson() {
      this.$test
        .post(services.organization.BIND_DEVICE, {})
        .then((res) => {
          console.log(res)
          this.personList = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadNotBindEquipment() {
      this.$test
        .post(services.organization.EQUIPMENT_NOT_BIND, {})
        .then((res) => {
          console.log(res)
          res.data.forEach(e => {
            var point = Ai.Point([e.latitude, e.longitude], {
              icon: Ai.Icon({
                // 设置图标URL路径
                iconUrl: '/static/images/风机.png',
                // 设置图标大小
                iconSize: [20, 20],
                // 设置点对象和图标的相对偏移量
                iconAnchor: [0, 0]
              })
            })
            this.trackMap.addLayer(point)
          })
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onChangeDate() { // 轨迹时间选择
    },
@@ -560,7 +623,25 @@ export default {
    },
    personTrack(item) {
      console.log(item)
      this.trackPerson = item.deviceId
      this.trackPerson = item.code
      if (this.orgId !== item.orgId) {
        this.$test
          .post(services.organization.FENCE_BY_DEPARTMENT, {entityId: item.orgId})
          .then((res) => {
            this.orgId = item.orgId
            console.log(res)
            var la = new Ai.FeatureGroup()
            res.data.forEach(e => {
              var wktstr = e.mapAreaContent
              var polygon = Ai.Polygon(wktstr, {color: 'red'})
              la.addLayer(polygon)
            })
            this.trackMap.addLayer(la)
          })
          .catch((res) => {
          // 请求失败处理...
          })
      }
    },
    playback() {
      var coords = [[40.026037, 116.323928, '1'], [40.017886, 116.328048], [40.00763, 116.336631], [39.99132, 116.338348], [39.97527, 116.341094], [39.96685, 116.346244], [39.96633, 116.354827], [39.96580, 116.37233], [39.96659, 116.38538], [39.96685, 116.40048], [39.96685, 116.41834], [39.96028, 116.419029], [39.95501, 116.41937], [39.92501, 116.41937], [39.91501, 116.41937], [39.90501, 116.41937], [39.87501, 116.41937]]

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

@@ -44,7 +44,6 @@
  }
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

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

@@ -47,7 +47,6 @@
  }
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

ebc-middle-platform/src/modules/system-management/terminal-management.scss

@@ -92,7 +92,6 @@
  color: #ffffff;
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}