优化等

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

@@ -152,13 +152,10 @@ export default {
  },
  equipment: {
    EQUIPMENT_TYPE: '/equipment/loadAllResourceToolType', // 获取所有设备类型
    GET_ALL_EQUIPMENT: '/equipment/queryAllEquipmentInfo', // 查询所有设备信息
    GET_EQUIPMENT: '/equipment/queryEquipmentInfo', // 查询设备管理信息
    CREATE_EQUIPMENT: '/equipment/createEquipmentInfo', // 新增设备管理信息
    UPDATE_EQUIPMENT: '/equipment/modifyEquipmentInfo',
    DEL_EQUIPMENT: '/equipment/deleteEquipmentInfo', // 删除设备管理信息
    REPETITION_EQUIPMENT: '/equipment/verifyEquipmentInfoRepetition', // 删除设备管理信息
    GET_ONE_EQUIPMENT: '/equipment/queryOneEquipmentInfo' // 查询单个设备信息
    DEL_EQUIPMENT: '/equipment/deleteEquipmentInfo' // 删除设备管理信息
  },
  device: {
    GET_ASSOCIATINFO: '/device/queryAssociatInfo', // 关联列表信息查询

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

@@ -182,6 +182,12 @@
        text-align: left;
      }
    }
    .sos{
      color:#F5222D;
      font-size: 8px;
      height: 25px;
      line-height: 25px;
    }
  }
  .point-out{
    color: #fff;
@@ -199,4 +205,22 @@
      margin: 7.5px 10px 0 0;
    }
  }
}
.myicon-lv img{
  width: 20px;
  height: 20px;
  animation:myicon 1s ease infinite;
  -webkit-animation:myicon 1s ease infinite;
}
@keyframes myicon{
  0% {
    opacity: 0;
  }
  30% {
    opacity: 0;
  }
  100%{
    opacity: 1;
  }
}

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

@@ -38,14 +38,13 @@
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="救援人员" prop="rescue">
          <t-select v-model="formValidate.rescue" placeholder="请选择">
            <t-option>张三</t-option>
            <t-option>李四</t-option>
            <t-option v-for="(item, index) in rescuer" :key="index+'rescuer'" :value="item.ID">{{ item.NAME }}</t-option>
          </t-select>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
        <t-button class="submit-button" @click="appoint()">指派</t-button>
        <t-button class="submit-button" @click="appointSubmit()">指派</t-button>
      </div>
    </t-modal>
  </div>
@@ -54,6 +53,7 @@
import './current.scss'
import {GIS_SEA_LAYER_URL, GIS_SEA_URL} from '../../constants'
import services from '../../conf/services'
import EventBus from '../../bus'
export default {
  data() {
    return {
@@ -100,48 +100,98 @@ export default {
        rescue: [{
          required: true,
          message: '救援人员不能为空',
          trigger: 'blur'
          trigger: 'blur',
          validator(rule, value, callback) {
            console.log(value)
            if (!value) {
              callback(rule.message)
            } else {
              callback()
            }
          }
        }]
      },
      map: null,
      alarmPoint: null,
      rescuePoint: null,
      polyline: null,
      personLayer: new Ai.FeatureGroup()
      personLayer: new Ai.FeatureGroup(),
      rescuer: []
    }
  },
  mounted() {
    window.Vue = this
    this.map = new Ai.Map('current-map', {
      ak: this.$store.getters.getGisToken,
      center: [39.915599, 116.406568],
      zoom: 5
    this.loadMap()
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
      console.log(msg)
      this.changePoint(msg)
    })
    var maplayer = null
    maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
    this.map.addLayer(maplayer)
    var la = Ai.WMTSLayer(GIS_SEA_URL)
    this.map.addLayer(la)
    this.load()
  },
  methods: {
    loadMap() {
      window.Vue = this
      this.map = new Ai.Map('current-map', {
        ak: this.$store.getters.getGisToken,
        center: this.$store.getters.getMapParam.center,
        zoom: this.$store.getters.getMapParam.zoom
      })
      var maplayer = null
      maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      this.map.addLayer(maplayer)
      var la = Ai.WMTSLayer(GIS_SEA_URL)
      this.map.addLayer(la)
      this.load()
    },
    load() {
      this.personLayer = new Ai.FeatureGroup()
      this.$test
        .post(services.rescue.RESCUE_LOCATION, '')
        .then((res) => {
          console.log(res)
          res.data.dataList.forEach(element => {
            this.point(element.alarm)
            if (element.alarm) {
              var alarmPoint = this.point(element.alarm)
            }
            if (element.rescuer) {
              this.point(element.rescuer)
              var rescuerPoint = this.point(element.rescuer)
              var lineWktStr = 'LINESTRING ( ' + element.alarm.longitude + ' ' + element.alarm.latitude + ',' + element.rescuer.longitude + ' ' + element.rescuer.latitude + ')'
              console.log(lineWktStr)
              var lineLayer = new Ai.Polyline(lineWktStr, {color: 'red', opacity: 1.0})
              alarmPoint.getAttributes().lineLayer = lineLayer
              rescuerPoint.getAttributes().lineLayer = lineLayer
              alarmPoint.getAttributes().point = rescuerPoint
              rescuerPoint.getAttributes().point = alarmPoint
              this.map.addLayer(lineLayer)
            }
          })
          console.log(this.personLayer)
          this.map.addLayer(this.personLayer)
          this.map.setViewPort([this.personLayer])
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    changePoint(msg) {
      var obj = JSON.parse(msg)
      this.personLayer.eachLayer((point) => {
        if (point.getAttributes().deviceId == obj.deviceId) {
          if (obj.locationStatus === '0' || obj.locationStatus === '1' || obj.locationStatus === '2' || obj.locationStatus === '3') {
            if (point.getAttributes().point) {
              point.getAttributes().point.remove()
            }
            if (point.getAttributes().lineLayer) {
              point.getAttributes().lineLayer.remove()
            }
          } else {
            point.setLatLng([obj.latitude, obj.longitude])
            if (point.getAttributes().lineLayer) {
              var lineWktStr = 'LINESTRING ( ' + obj.longitude + ' ' + obj.latitude + ',' + point.getAttributes().point.getLng() + ' ' + point.getAttributes().point.getLat() + ')'
              point.getAttributes().lineLayer.setPoints(lineWktStr)
            }
          }
        }
      })
    },
    point(e) {
      var icon, tips
      var callHelp = ''
@@ -170,14 +220,24 @@ export default {
        icon = '/static/images/outlineworker.png'
        tips = '<div class="hand-alarm">救援人员</div>'
      }
      // var point = Ai.Point([e.latitude, e.longitude], {
      //   icon: Ai.Icon({
      //     // 设置图标URL路径
      //     iconUrl: icon,
      //     // 设置图标大小
      //     iconSize: [20, 20],
      //     // 设置点对象和图标的相对偏移量
      //     iconAnchor: [0, 0]
      //   })
      // })
      var point = Ai.Point([e.latitude, e.longitude], {
        icon: Ai.Icon({
          // 设置图标URL路径
          iconUrl: icon,
        icon: Ai.DivIcon({
          html: '<img src="' + icon + '"/>',
          className: 'myicon-lv',
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [0, 0]
          iconAnchor: [10, 20]
        })
      })
      point.setAttributes(e)
@@ -203,7 +263,8 @@ export default {
        var popup = Ai.Popup({
          minWidth: 300,
          offset: [0, -10],
          autoClose: true
          autoClose: true,
          closeButton: false
        })
        // 设置弹出框弹出位置
        popup.setLatLng(point.getLatLng())
@@ -213,6 +274,7 @@ export default {
        point.getAttributes().popup = popup
      })
      this.personLayer.addLayer(point)
      return point
    },
    showModal(item) {
      this.modal = true
@@ -220,15 +282,74 @@ export default {
    cancel() {
      this.modal = false
    },
    appoint() {
    appoint(item) { // 打开指派Modal
      console.log(item)
      this.$test
        .post(services.rescue.RESCUER_LIST, '')
        .then((res) => {
          this.modal = true
          console.log(res)
          this.appointAlarmId = item.alarmLogId
          this.rescuer = res.data.dataList
        })
        .catch((res) => {
        })
    },
    appointSubmit() { // 指派
      console.log(this.formValidate.rescue)
      this.$refs['formValidate'].validate(valid => {
        console.log(valid)
        if (valid) {
          var params = new FormData()
          params.append('data', JSON.stringify({
            alarmLogId: this.appointAlarmId,
            rescuersId: this.formValidate.rescue
          }))
          this.$test
            .post(services.rescue.ASSIGN_RESCUER, params)
            .then((res) => {
              if (res.data.result) {
                this.$Message.success('指派成功！')
                this.load()
                this.modal = false
              } else {
                this.$Message.danger('指派失败！')
                this.modal = false
              }
            })
            .catch((res) => {
            })
        }
      })
    },
    close(item) {
      this.$Confirm.confirm({
        title: '确认要关闭张三落水报警吗？',
        content: '关闭后将不再进行报警显示',
        ok: () => {
          console.log('点击了确定')
          console.log(item.alarmLogId)
          var params = new FormData()
          params.append('data', JSON.stringify({
            alarmLogId: item.alarmLogId
          }))
          this.$test
            .post(services.rescue.CLOSE_RESCUE, params)
            .then((res) => {
              console.log(res.data.result)
              if (res.data.result) {
                this.layer.personLayer.eachLayer(layer => {
                  if (layer.getAttributes().deviceId === item.deviceId) {
                    item.locationStatus = '0'
                    this.popupContent(item, layer)
                  }
                })
              }
            })
            .catch((res) => {
            })
        },
        cancel: () => {
          console.log('点击了取消')

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

@@ -283,6 +283,9 @@ background: #344979!important;
    padding-left: 20px;
    font-size: 12px;
    color: #ffffff;
    div{
      margin-right: 15px;
    }
    .user-pic{
      width: 25px;
      height: 25px;
@@ -291,6 +294,13 @@ background: #344979!important;
      background-size: 100% 100%;
      margin: 7.5px 5px 0 0;
    }
    .fengji{
      width: 25px;
      height: 25px;
      background-size: 100% 100%;
      background-image: url(/static/images/风机.png);
      margin-top: 7.5px;
    }
    .alarm{
      color: #F5222D;
      background-color: #343E6B;
@@ -372,6 +382,36 @@ background: #344979!important;
    background-color: #147BD1;
    border: 1px solid #147BD1
  }
  .container{
    display: flex;
    flex-wrap: wrap;
    padding: 10px 0 10px 12px;
    div{
      width: 25%;
      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;
@@ -383,4 +423,38 @@ background: #344979!important;
      margin: 7.5px 10px 0 0;
    }
  }
}
@keyframes pointsos{
  0% {
    opacity: 0;
  }
  30% {
    opacity: 0;
  }
  100%{
    opacity: 1;
  }
}
.person-count{
  div{
    width: 30px;
    height: 30px;
    text-align: center;
    line-height: 30px;
    border-radius: 50%;
    color: #ffffff;
  }
  .sos{
    background-color: #F5222D;
  }
  .normal{
    background-color: #19BB20;
  }
  .outline{
    background-color: #FAAD14;
  }
  .offline{
    background-color: #D9D9D9;
    color: #000000;
  }
}

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

@@ -32,7 +32,6 @@
          @click="
            () => {
              trackModal = true;
              personTrack()
            }
          "
        >轨迹</t-button
@@ -103,7 +102,7 @@
            style="width: 200px"
          ></t-input>
          <div>
            <div v-for="(item,index) in personList" :class="item.checked?'active':''" :key="index" @click="personTrack(item)">{{ item.userName }}</div>
            <div v-for="(item,index) in personList" :class="trackPerson==item.deviceId?'active':''" :key="index" @click="personTrack(item)">{{ item.userName }}</div>
          </div>
        </div>
        <div class="track-modal-right">
@@ -143,7 +142,7 @@
                <t-option>2x</t-option>
              </t-select>
            </div>
            <t-button color="success" icon="video-outline">回放</t-button>
            <t-button color="success" icon="video-outline" @click="playback()">回放</t-button>
            <t-button color="secondary" icon="upload-outline" @click="toExport"
            >导出至Excel</t-button
            >
@@ -162,7 +161,7 @@
      >
        <t-form-item label="救援人员" prop="rescue">
          <t-select v-model="formValidate.rescue" placeholder="请选择">
            <t-option v-for="(item, index) in rescuer" :key="index+'rescuer'" :value="item.id">{{ item.userName }}</t-option>
            <t-option v-for="(item, index) in rescuer" :key="index+'rescuer'" :value="item.ID">{{ item.NAME }}</t-option>
          </t-select>
        </t-form-item>
      </t-form>
@@ -337,7 +336,8 @@ export default {
      },
      personList: [],
      rescuer: [],
      appointAlarmId: ''
      appointAlarmId: '',
      trackPerson: ''
    }
  },
  mounted() {
@@ -369,220 +369,6 @@ export default {
          // 请求失败处理...
        })
    },
    changeLocation(msg) { // 修改人员信息状态等
      var obj = JSON.parse(msg)
      console.log('person' + obj)
      var flag = false
      this.layer.personLayer.eachLayer((point) => { // 遍历人员layer找到推送人员并修改
        if (point.getAttributes().deviceId == obj.deviceId) {
          flag = true
          point.setLatLng([obj.latitude, obj.longitude])
          this.popupContent(obj, point)
        }
      })
      if (!flag) {
        var point = Ai.Point([obj.latitude, obj.longitude], {
          icon: Ai.Icon({
            iconUrl: '/static/images/normalworker.png',
            // 设置图标大小
            iconSize: [20, 20],
            // 设置点对象和图标的相对偏移量
            iconAnchor: [0, 0]
          })
        })
        point.setAttributes(obj)
        this.layer.personLayer.addLayer(point)
        this.popupContent(obj, point)
      }
    },
    changeShip(msg) {
      var obj = JSON.parse(msg)
      console.log('ship' + obj)
      this.layer.equipmentLayer.eachLayer((point) => {
        if (point.getAttributes().DEVICE_NO == obj.deviceNo) {
          point.setLatLng([obj.latitude, obj.longitude])
          this.popupContentShip(obj, point)
        }
      })
    },
    popupContentShip(e, point) {
      point.on('click', (pointE) => {
        var content =
                  '<div class="tips-item"><div class="top"><div>' + e.shipName + '</div></div><div class="middle"><div class="row">' +
                  '<div>设备编号</div>' +
                  '<div>' + e.deviceNo + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.latitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.newDate + '</div>' +
                  '</div>' +
                  '</div></div>' +
                  '</div></div>'
        Ai.Popup({
          minWidth: 300,
          offset: [0, -10],
          autoClose: true
        })
        // 设置弹出框弹出位置
          .setLatLng(point.getLatLng())
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      })
    },
    popupContent(e, point) { // 修改点的信息
      window.Vue = this
      var icon, tips
      var callHelp = ''
      var other = ''
      var attributes = point.getAttributes()
      if (e.locationStatus == '0') {
        icon = '/static/images/normalworker.png'
        tips = '<div class="normal">正常</div>'
        if (attributes.locationStatus !== e.locationStatus) {
          if (attributes.locationStatus == '1') {
            this.personStatistics.normal++
            this.personStatistics.offLine--
          } else if (attributes.locationStatus == '2' || attributes.locationStatus == '3') {
            this.personStatistics.normal++
            this.personStatistics.outLine--
          } else if (attributes.locationStatus == '4' || attributes.locationStatus == '5') {
            this.personStatistics.normal++
            this.personStatistics.sos--
          }
        }
      } else if (e.locationStatus == '1') {
        icon = '/static/images/offlineworker.png'
        tips = '<div class="offline">离线</div>'
        callHelp = '<div style="display:flex;">' +
                  "<button class='point-out' onClick='window.Vue.appoint(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
        if (attributes.locationStatus !== e.locationStatus) {
          if (attributes.locationStatus == '0') {
            this.personStatistics.offLine++
            this.personStatistics.normal--
          } else if (attributes.locationStatus == '2' || attributes.locationStatus == '3') {
            this.personStatistics.offLine++
            this.personStatistics.outLine--
          } else if (attributes.locationStatus == '4' || attributes.locationStatus == '5') {
            this.personStatistics.offLine++
            this.personStatistics.sos--
          }
        }
      } else if (e.locationStatus == '2' || e.locationStatus == '3') {
        icon = '/static/images/outlineworker.png'
        tips = '<div class="outline">违规</div>'
        if (e.locationStatus == '2') {
          other = '<div class="row outline">' +
                  '<div>定点停留超时</div>' +
                  '<div>已停留' + e.fixedLong + 'min</div>' +
                  '</div>'
        } else {
          other = '<div class="row outline">' +
                  '<div>进入时间</div>' +
                  '<div>' + e.inDate + '</div>' +
                  '</div>'
        }
        if (attributes.locationStatus !== e.locationStatus) {
          if (attributes.locationStatus == '0') {
            this.personStatistics.outLine++
            this.personStatistics.normal--
          } else if (attributes.locationStatus == '1') {
            this.personStatistics.outLine++
            this.personStatistics.offLine--
          } else if (attributes.locationStatus == '4' || attributes.locationStatus == '5') {
            this.personStatistics.outLine++
            this.personStatistics.sos--
          }
        }
      } else if (e.locationStatus == '4' || e.locationStatus == '5') {
        icon = '/static/images/sosworker.png'
        other = '<div class="row sos">' +
                  '<div>求救时间</div>' +
                  '<div>' + e.alarmDate + '</div>' +
                  '</div>' + '<div class="row sos">' +
                  '<div>求救时长</div>' +
                  '<div>' + e.alarmLong + 'min</div>' +
                  '</div>'
        tips = '<div class="sos">SOS</div>'
        if (e.isNewAlarm === '1') {
          callHelp = '<div style="display:flex;">' +
                  "<button class='point-out' onClick='window.Vue.appoint(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
        } else {
          callHelp = '<div style="display:flex;justify-content: flex-end;">' +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
        }
        if (attributes.locationStatus !== e.locationStatus) {
          if (attributes.locationStatus == '0') {
            this.personStatistics.sos++
            this.personStatistics.normal--
          } else if (attributes.locationStatus == '1') {
            this.personStatistics.sos++
            this.personStatistics.offLine--
          } else if (attributes.locationStatus == '2' || attributes.locationStatus == '3') {
            this.personStatistics.sos++
            this.personStatistics.outLine--
          }
        }
      }
      if (!(e.locationStatus == '6')) {
        point.setIcon(Ai.Icon({
        // 设置图标URL路径
          iconUrl: icon,
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [0, 0]
        }))
        point.setAttributes(e)
        point.on('click', (pointE) => {
          var content =
                  '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + e.userName + '</div>' + tips + '</div><div class="middle"><div class="row">' +
                  '<div>终端编号</div>' +
                  '<div>' + e.deviceNo + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.latitude + '</div>' +
                  '</div>' + other +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.newDate + '</div>' +
                  '</div></div></div>' + callHelp +
                  '</div></div>'
          var popup = Ai.Popup({
            minWidth: 300,
            offset: [0, -10],
            autoClose: true
          })
          // 设置弹出框弹出位置
          popup.setLatLng(point.getLatLng())
          // 设置弹出框弹出内容
          popup.setContent(content)
          popup.openOn(this.map)
          point.getAttributes().popup = popup
        })
      }
      console.log(attributes.popup)
      var popup = attributes.popup
      popup.remove()
    },
    initMap() { // 加载主屏地图
      if (this.map != null && this.map != '') {
        this.map.remove()
@@ -603,230 +389,61 @@ export default {
      Ai.Scale({ position: 'bottomright' }).addTo(this.map)
      Ai.Zoom({ type: 'small' }).addTo(this.map)
      // this.polyline()
      this.polygon()
      this.loadEquipment()
      this.loadPerson()
      this.loadMapArea()
    },
    polygon() { // 加载地图围栏
      var params = new FormData()
      this.$test
        .post(services.mapTag.GET_ALL_MAP_TAG, params)
        .then((res) => {
          // 请求成功处理...
          res.data.dataList.forEach((e) => {
            if (e.MAP_TAG_TYPE === '3') { // 电子围栏
              var polygon = Ai.Polygon(e.MAP_TAG_SHAPE, {
                color: '#A74B5C',
                opacity: 1.0,
                weight: 0
              })
              polygon.setAttributes(e)
              this.layer.areaLayer.addLayer(polygon)
            } else if (e.MAP_TAG_TYPE === '2') { // 作业区域
              var polygon = Ai.Polygon(e.MAP_TAG_SHAPE, {
                color: '#438D65',
                opacity: 1.0,
                weight: 0
              })
              polygon.setAttributes(e)
              this.layer.areaLayer.addLayer(polygon)
            }
          })
          this.map.addLayer(this.layer.areaLayer)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadEquipment() { // 加载地图设备
      var params = new FormData()
      this.$test
        .post(services.equipment.GET_ALL_EQUIPMENT, params)
        .then((res) => {
          // 请求成功处理...
          console.log(res.data)
          res.data.dataList.forEach((e) => {
            if (e.LATITUDE && e.LONGITUDE) {
              var icon = ''
              if (e.FACILITY_TYPE === '001') { // 船舶
                icon = '/static/images/船舶.png'
              } else if (e.FACILITY_TYPE === '002') { // 风机
                icon = '/static/images/风机.png'
              } else if (e.FACILITY_TYPE === '003') { // 升压站
                icon = '/static/images/升压站画面.png'
              }
              var point = Ai.Point([e.LATITUDE, e.LONGITUDE], {
                icon: Ai.Icon({
                  // 设置图标URL路径
                  iconUrl: icon,
                  // 设置图标大小
                  iconSize: [20, 20],
                  // 设置点对象和图标的相对偏移量
                  iconAnchor: [0, 0]
                })
              })
              point.setAttributes(e)
              point.on('click', (pointE) => {
                var deviceContent = e.DEVICE_NO ? ('<div class="row"><div>设备编号</div><div>' + e.DEVICE_NO + '</div></div>') : ''
                var dateCOntent = e.NEW_DATE ? ('<div class="row"><div>最新定位时间</div><div>' + e.NEW_DATE + '</div></div>') : ''
                var content =
                    '<div class="tips-item"><div class="top"><div>' + e.FACILITY_NAME + '</div></div><div class="middle">' +
                    deviceContent +
                    '<div class="row">' +
                    '<div>经度</div>' +
                    '<div>' + e.LONGITUDE + '</div>' +
                    '</div>' +
                    '<div class="row">' +
                    '<div>纬度</div>' +
                    '<div>' + e.LATITUDE + '</div>' +
                    '</div>' +
                    dateCOntent +
                    '</div></div>' +
                    '</div></div>'
                Ai.Popup({
                  minWidth: 300,
                  offset: [0, -10],
                  autoClose: true
                })
                  // 设置弹出框弹出位置
                  .setLatLng(point.getLatLng())
                  // 设置弹出框弹出内容
                  .setContent(content)
                  .openOn(this.map)
              })
              if (['001', '002', '003'].indexOf(e.FACILITY_TYPE) !== -1) {
                this.layer.equipmentLayer.addLayer(point)
              }
            }
          })
          this.map.addLayer(this.layer.equipmentLayer)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    loadMapView() {
      // this.$test
      //   .post(services.mapTag.GET_MAP_PARAM, {})
      //   .then((res) => {
      //     if (res.data.success) {
      //     }
      //   })
      //   .catch((res) => {
      //     // 请求失败处理...
      //   })
    },
    loadPerson() { // 加载地图人员
      window.Vue = this
      this.personStatistics = {
        all: 0,
        offLine: 0,
        outLine: 0,
        sos: 0,
        normal: 0
      }
      var params = new FormData()
      this.$test
        .post(services.organization.PERSON_LOCATION, params)
        .then((res) => {
          this.personList = res.data.dataList
          this.personStatistics.all = res.data.dataList.length
          res.data.dataList.forEach((e) => {
            var icon, tips
            var callHelp = ''
            var other = ''
            if (e.locationStatus === '0') {
              icon = '/static/images/normalworker.png'
              tips = '<div class="normal">正常</div>'
              this.personStatistics.normal++
            } else if (e.locationStatus === '1') {
              icon = '/static/images/offlineworker.png'
              tips = '<div class="offline">离线</div>'
              callHelp = '<div style="display:flex;">' +
                 "<button class='point-out' onClick='window.Vue.appoint(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
              this.personStatistics.offLine++
            } else if (e.locationStatus === '2' || e.locationStatus === '3') {
              icon = '/static/images/outlineworker.png'
              tips = '<div class="outline">违规</div>'
              this.personStatistics.outLine++
              if (e.locationStatus == '2') {
                other = '<div class="row outline">' +
                        '<div>定点停留超时</div>' +
                        '<div>已停留' + e.fixedLong + 'min</div>' +
                        '</div>'
              } else {
                other = '<div class="row outline">' +
                        '<div>进入时间</div>' +
                        '<div>' + e.inDate + '</div>' +
                        '</div>'
              }
            } else if (e.locationStatus === '4' || e.locationStatus === '5') {
              icon = '/static/images/sosworker.png'
              tips = '<div class="sos">SOS</div>'
              other = '<div class="row sos">' +
                  '<div>求救时间</div>' +
                  '<div>' + e.alarmDate + '</div>' +
                  '</div>' + '<div class="row sos">' +
                  '<div>求救时长</div>' +
                  '<div>' + e.alarmLong + 'min</div>' +
                  '</div>'
              if (e.isNewAlarm === '1') {
                callHelp = '<div style="display:flex;">' +
                  "<button class='point-out' onClick='window.Vue.appoint(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-user-outline'></i>指派</button>" +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
              } else {
                callHelp = '<div style="display:flex;justify-content: flex-end;">' +
                  "<button class='close-confirm' onClick='window.Vue.close(" + JSON.stringify(e) + ")'><i style='font-size: 20px;' class='aidicon aidicon-close'></i>关闭</button>" +
                  '</div>'
              }
              this.personStatistics.sos++
            }
            if (!(e.locationStatus === '6')) {
              var point = Ai.Point([e.latitude, e.longitude], {
                icon: Ai.Icon({
                // 设置图标URL路径
                  iconUrl: icon,
                  // 设置图标大小
                  iconSize: [20, 20],
                  // 设置点对象和图标的相对偏移量
                  iconAnchor: [0, 0]
                })
              })
              point.setAttributes(e)
              point.on('click', (pointE) => {
                var content =
                  '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>' + e.userName + '</div>' + tips + '</div><div class="middle"><div class="row">' +
                  '<div>终端编号</div>' +
                  '<div>' + e.deviceNo + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.latitude + '</div>' +
                  '</div>' + other +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.newDate + '</div>' +
                  '</div></div></div>' + callHelp +
                  '</div></div>'
                var popup = Ai.Popup({
                  minWidth: 300,
                  offset: [0, -10],
                  autoClose: true
                })
                // 设置弹出框弹出位置
                popup.setLatLng(point.getLatLng())
                // 设置弹出框弹出内容
                popup.setContent(content)
                popup.openOn(this.map)
                point.getAttributes().popup = popup
              })
              this.layer.personLayer.addLayer(point)
            }
          })
          this.map.addLayer(this.layer.personLayer)
          console.log(this.layer.personLayer)
    loadMapArea() {
      // data.forEach(element => {
      // })
      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]
        })
        .catch((res) => {
          // 请求失败处理...
      })
      var point2 = Ai.Point([32.04533333333333, 125.4221944444444], {
        icon: Ai.Icon({
          // 设置图标URL路径
          iconUrl: '/static/images/风机.png',
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [0, 0]
        })
      })
      var layer = new Ai.FeatureGroup()
      layer.addLayer(point)
      layer.addLayer(point2)
      this.map.addLayer(layer)
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -40],
        autoClose: true,
        closeButton: false
      })
      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)
    },
    showOrHide(layer, type, arr) { // 地图设备人员围栏显示和隐藏
      layer.eachLayer((e) => {
@@ -942,7 +559,10 @@ export default {
      })
    },
    personTrack(item) {
      // item.checked = !item.checked
      console.log(item)
      this.trackPerson = item.deviceId
    },
    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]]
      var defaultOptions = {
        paused: false,
@@ -967,33 +587,8 @@ export default {
        }
      }
      var path = new Ai.DynamicPath(coords, defaultOptions)
      var coords1 = [[39.87501, 116.41937], [39.860736, 116.394740], [39.779519, 116.534789], [39.676013, 116.681703], [39.704545, 116.915117], [39.740458, 117.009856]]
      var defaultOptions1 = {
        paused: false,
        reverse: false,
        delay: 800,
        dashArray: [10, 20],
        weight: 5,
        opacity: 0.9,
        color: '#0000ff',
        pulseColor: '#FFFFFF',
        playerTrack: true,
        traceTitle: true,
        traceIcon: new Ai.Icon({
          iconUrl: 'http://192.168.74.189:9999/gisapi/images/man-or32.png',
          iconSize: [36, 36],
          iconAnchor: [18, 36]
        }),
        titleOptions: {
          className: 'trace_title',
          iconSize: null,
          iconAnchor: [48, 57]
        }
      }
      var path1 = new Ai.DynamicPath(coords1, defaultOptions1)
      this.trackMap.addLayer(path)
      path.playTraceOn(this.trackMap)
      this.trackMap.addLayer(path1)
      // path1.playTraceOn(this.trackMap)
      var params = new FormData()
      params.append('data', JSON.stringify({

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

@@ -22,18 +22,25 @@
          display: flex; 
          margin: 0 20px 16px 0;    
          line-height: 2;
          .label{
            min-width: 60px;
          }
        }
        .input-rule{
          flex: 1;
          margin:0 0 0 20px;
          width: 200px;
          .dropdown{
            width: 100%
          }
        }
      }
      .btns button{
        margin: 0 2px;
      }
      .btns{
        min-width: 330px;
        button{
          margin: 0 2px;
        }
      } 
    }
  }
  .table-pager{
@@ -88,7 +95,7 @@
    }
    .right{
      width: 1200px;
      height: 700px;
      height: 600px;
    }
  }
}

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

@@ -4,11 +4,21 @@
      <div class="search-ctn">
        <div>
          <div class="label-content">
            <div class="label">部门：</div>
            <div class="input-rule">
              <t-select-tree
                v-model="queryCondition.department"
                :node-data="cloneNodes"
                node-key="id"
              ></t-select-tree>
            </div>
          </div>
          <div class="label-content">
            <div class="label">标记名称:</div>
            <div class="input-rule">
              <t-input
                  v-model="queryCondition.userName"
                  placeholder="请输入..."
                v-model="queryCondition.userName"
                placeholder="请输入..."
              ></t-input>
            </div>
          </div>
@@ -46,16 +56,16 @@
          </template>
        </t-table-column>
        <t-table-column
            :formatter="timestampToTime"
            prop="CREATE_DATE"
            label="创建时间"
          :formatter="timestampToTime"
          prop="CREATE_DATE"
          label="创建时间"
        ></t-table-column>
        <t-table-column fixed="right" label="操作" width="120">
          <template slot-scope="scope">
            <a
                href="javascript:void(0)"
                size="sm"
                @click="handleClick(scope.row)"
              href="javascript:void(0)"
              size="sm"
              @click="handleClick(scope.row)"
            >编辑</a
            >
            <span class="mod-line">|</span>
@@ -66,37 +76,47 @@
        </t-table-column>
      </t-table>
      <t-pager
          :total="table.pager.total"
          :current.sync="table.pager.currentPage"
          :page-size.sync="table.pager.size"
          :sizer-range="[10, 20, 50]"
          class="px-24 pt-16 float-right"
          show-elevator
          show-sizer
          @on-size-change="onSizeChange"
          @on-change="onPagerChange"
        :total="table.pager.total"
        :current.sync="table.pager.currentPage"
        :page-size.sync="table.pager.size"
        :sizer-range="[10, 20, 50]"
        class="px-24 pt-16 float-right"
        show-elevator
        show-sizer
        @on-size-change="onSizeChange"
        @on-change="onPagerChange"
      >
      </t-pager>
    </div>
    <t-modal
        :visibled.sync="addMark"
        :ok="submitMark"
        :cancel="cancel"
        :mask-closable="false"
        class="modal"
        title="地图标记"
        ok-text="保存"
        width="80%"
      :visibled.sync="addMark"
      :ok="submitMark"
      :cancel="cancel"
      :mask-closable="false"
      class="modal"
      title="地图标记"
      ok-text="保存"
      width="80%"
    >
      <div class="top">
        <div>
          <div class="label">部门:</div>
          <div class="input-rule">
            <t-select-tree v-model="department"
                           :node-data="cloneNodes"
                           style="width:200px"
                           node-key="id"
            ></t-select-tree>
          </div>
        </div>
        <div>
          <div class="label">标记类型:</div>
          <div class="input-rule">
            <t-select v-model="markType" width="200" placeholder="请输入...">
            <t-select v-model="markType" style="width:100px" placeholder="请输入...">
              <t-option
                  v-for="item in markTypes"
                  :key="item.id"
                  :value="item.id"
                v-for="item in markTypes"
                :key="item.id"
                :value="item.id"
              >{{ item.type }}</t-option
              >
            </t-select>
@@ -106,9 +126,9 @@
          <div class="label">标记名称:</div>
          <div class="input-rule">
            <t-input
                v-model="markName"
                placeholder="请输入..."
                style="width: 200px"
              v-model="markName"
              placeholder="请输入..."
              style="width: 200px"
            ></t-input>
          </div>
        </div>
@@ -116,9 +136,9 @@
          <div class="label">停留时长:</div>
          <div class="input-rule">
            <t-input
                v-model="residenceTimeLength"
                placeholder="请输入..."
                style="width: 100px"
              v-model="residenceTimeLength"
              placeholder="请输入..."
              style="width: 100px"
            ></t-input>
          </div>
          <div class="label">min</div>
@@ -133,11 +153,11 @@
              >导入</a
              >
              <input
                  id="file"
                  type="file"
                  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                  style="display: none"
                  @change="handleFile($event)"
                id="file"
                type="file"
                accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                style="display: none"
                @change="handleFile($event)"
              />
              <span class="mod-line">|</span>
              <a href="javascript:void(0)" size="sm" @click="downloadTemplate()"
@@ -148,21 +168,21 @@
          <div>
            <t-table :data="modalData" size="sm" height="500">
              <t-table-column
                  align="center"
                  type="index"
                  label="坐标名称"
                align="center"
                type="index"
                label="坐标名称"
              ></t-table-column>
              <t-table-column
                  :formatter="lngOrLatFormatter"
                  align="center"
                  prop="lng"
                  label="经度"
                :formatter="lngOrLatFormatter"
                align="center"
                prop="lng"
                label="经度"
              ></t-table-column>
              <t-table-column
                  :formatter="lngOrLatFormatter"
                  align="center"
                  prop="lat"
                  label="纬度"
                :formatter="lngOrLatFormatter"
                align="center"
                prop="lat"
                label="纬度"
              ></t-table-column>
            </t-table>
          </div>
@@ -195,7 +215,9 @@ export default {
          total: 0
        }
      },
      departments: [],
      queryCondition: {
        department: '',
        userName: ''
      },
      rangeDate: '',
@@ -227,13 +249,60 @@ export default {
      polygonDrawer: null
    }
  },
  computed: {
    cloneNodes() {
      return this.departments.map((item) => {
        let obj = {
          label: item.label,
          title: item.title,
          id: item.id,
          data: item.data
        }
        if (item.pid) {
          obj.pid = item.pid
        }
        return obj
      })
    }
  },
  created() {
    this.getDepartmentsList()
    this.getList()
  },
  mounted() {
    this.loadMap()
  },
  methods: {
    getDepartmentsList() {
      this.$test
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
        .then((res) => {
          // 请求成功处理...
          // this.departments = res.data
          this.departments = []
          for (let i = 0; i < res.data.length; i++) {
            if (res.data[i].parentCode > 0) {
              this.departments.push({
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id,
                pid: res.data[i].parentCode
              })
            } else {
              this.departments.push({
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id
              })
            }
          }
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadMap() {
      this.map = new Ai.Map('modalMap', {
        ak: this.$store.getters.getGisToken,
@@ -242,8 +311,8 @@ export default {
      })
      this.map.addLayer(Ai.TileLayer(GIS_SEA_LAYER_URL))
      this.map.addLayer(Ai.WMTSLayer(
          GIS_SEA_URL,
          { opacity: 0.5 }
        GIS_SEA_URL,
        { opacity: 0.5 }
      ))
      this.loadPolygonDrawer()
    },
@@ -278,24 +347,24 @@ export default {
    getList() {
      var params = new FormData()
      params.append(
          'data',
          JSON.stringify({
            pageNum: this.table.pager.currentPage,
            pageSize: this.table.pager.size,
            mapTagName: this.queryCondition.userName
          })
        'data',
        JSON.stringify({
          pageNum: this.table.pager.currentPage,
          pageSize: this.table.pager.size,
          mapTagName: this.queryCondition.userName
        })
      )
      this.$test
          .post(services.mapTag.GET_MAP_TAG, params)
          .then((res) => {
            // 请求成功处理...
            this.table.data = res.data.dataList
            this.table.pager.total = res.data.dataNum
            // this.table.pager.currentPage = pageNum
          })
          .catch((res) => {
            // 请求失败处理...
          })
        .post(services.mapTag.GET_MAP_TAG, params)
        .then((res) => {
          // 请求成功处理...
          this.table.data = res.data.dataList
          this.table.pager.total = res.data.dataNum
          // this.table.pager.currentPage = pageNum
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onChange(value) {
      console.log('date change:' + value)
@@ -313,26 +382,26 @@ export default {
      var params = new FormData()
      var name = this.queryCondition.userName
      params.append(
          'data',
          JSON.stringify({
            params: {
              MAP_TAG_NAME: name
            }
          })
        'data',
        JSON.stringify({
          params: {
            MAP_TAG_NAME: name
          }
        })
      )
      // window.open('http://localhost:8088/ipu/ExportToExcel/exportMapTagInfoToExcel?data=' + params)
      //
      this.$test
          .post(services.excel.EXPROT_MAP_TAG, params)
          .then((res) => {
            // 请求成功处理...
            // debugger
            console.log(res)
            this.downloadDoc(res.data)
          })
          .catch((res) => {
            // 请求失败处理...
          })
        .post(services.excel.EXPROT_MAP_TAG, params)
        .then((res) => {
          // 请求成功处理...
          // debugger
          console.log(res)
          this.downloadDoc(res.data)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    downloadDoc(response) {
      // debugger
@@ -370,8 +439,8 @@ export default {
      var Y = date.getFullYear() + '-'
      var M =
          (date.getMonth() + 1 < 10
              ? '0' + (date.getMonth() + 1)
              : date.getMonth() + 1) + '-'
            ? '0' + (date.getMonth() + 1)
            : date.getMonth() + 1) + '-'
      var D = date.getDate()
      var h = date.getHours()
      var m = date.getMinutes()
@@ -415,57 +484,57 @@ export default {
      var params = new FormData()
      if (this.update) {
        params.append(
            'data',
            JSON.stringify({
              mapTagName: this.markName,
              mapTagType: this.markType,
              residenceTimeLength: this.residenceTimeLength,
              mapTagShape: arr,
              mapTagId: this.updateId
            })
          'data',
          JSON.stringify({
            mapTagName: this.markName,
            mapTagType: this.markType,
            residenceTimeLength: this.residenceTimeLength,
            mapTagShape: arr,
            mapTagId: this.updateId
          })
        )
        this.$test
            .post(services.mapTag.UPD_MAP_TAG, params)
            .then((res) => {
              // 请求成功处理...
              this.getList()
              this.polygonDrawer.disable()
              this.modalData = []
              this.markName = ''
              this.$Message.success('操作成功')
              this.map.removeLayer(this.layer)
              this.update = false
            })
            .catch((res) => {
              // 请求失败处理...
            })
          .post(services.mapTag.UPD_MAP_TAG, params)
          .then((res) => {
            // 请求成功处理...
            this.getList()
            this.polygonDrawer.disable()
            this.modalData = []
            this.markName = ''
            this.$Message.success('操作成功')
            this.map.removeLayer(this.layer)
            this.update = false
          })
          .catch((res) => {
            // 请求失败处理...
          })
      } else {
        params.append(
            'data',
            JSON.stringify({
              mapTagName: this.markName,
              mapTagType: this.markType,
              residenceTimeLength: this.residenceTimeLength,
              mapTagShape: arr
            })
          'data',
          JSON.stringify({
            mapTagName: this.markName,
            mapTagType: this.markType,
            residenceTimeLength: this.residenceTimeLength,
            mapTagShape: arr
          })
        )
        this.update = false
        this.$test
            .post(services.mapTag.ADD_MAP_TAG, params)
            .then((res) => {
              // 请求成功处理...
              this.$Message.success('操作成功')
              this.map.removeLayer(this.layer)
              this.polygonDrawer.disable()
              this.modalData = []
              this.markName = ''
              this.residenceTimeLength = ''
              this.getList()
            })
            .catch((res) => {
              // 请求失败处理...
            })
          .post(services.mapTag.ADD_MAP_TAG, params)
          .then((res) => {
            // 请求成功处理...
            this.$Message.success('操作成功')
            this.map.removeLayer(this.layer)
            this.polygonDrawer.disable()
            this.modalData = []
            this.markName = ''
            this.residenceTimeLength = ''
            this.getList()
          })
          .catch((res) => {
            // 请求失败处理...
          })
      }
    },
    getTime() {
@@ -502,47 +571,47 @@ export default {
    handleClick(row) {
      var params = new FormData()
      params.append(
          'data',
          JSON.stringify({
            mapTagId: row.MAP_TAG_ID
          })
        'data',
        JSON.stringify({
          mapTagId: row.MAP_TAG_ID
        })
      )
      this.$test
          .post(services.mapTag.GET_ONE_MAP_TAG, params)
          .then((res) => {
            // 请求成功处理...
            this.modalData = []
            var coverWktStr_blue = res.data.resultData.MAP_TAG_SHAPE
            // debugger
            // var arr = coverWktStr_blue.replace('POLYGON((','').split(',')[0].split(' ')
            // this.map.setView([arr[1], arr[0]], 10)
            console.log(res.data.resultData.MAP_TAG_SHAPE)
            var color
            if (row.MAP_TAG_TYPE == '3') {
              color = 'red'
            } else if (row.MAP_TAG_TYPE == '2') {
              color = 'green'
            } else {
              color = 'blue'
            }
            var coverLayer_blue = new Ai.Polygon(coverWktStr_blue, {color: color, opacity: 1.0})
            // this.map.addLayer(coverLayer_blue)
            // 面设为编辑状态
            coverLayer_blue.snapediting = new Ai.PolylineSnap(
                this.map,
                coverLayer_blue
            )
            coverLayer_blue.snapediting.enable()
            this.layer = coverLayer_blue
            this.map.addLayer(coverLayer_blue)
            this.polygonDrawer.editing(this.layer)
            this.modalData = coverLayer_blue._latlngs[0]
            this.polygonDrawer.disable()
            this.map.setViewPort([this.layer])
          })
          .catch((res) => {
            // 请求失败处理...
          })
        .post(services.mapTag.GET_ONE_MAP_TAG, params)
        .then((res) => {
          // 请求成功处理...
          this.modalData = []
          var coverWktStr_blue = res.data.resultData.MAP_TAG_SHAPE
          // debugger
          // var arr = coverWktStr_blue.replace('POLYGON((','').split(',')[0].split(' ')
          // this.map.setView([arr[1], arr[0]], 10)
          console.log(res.data.resultData.MAP_TAG_SHAPE)
          var color
          if (row.MAP_TAG_TYPE == '3') {
            color = 'red'
          } else if (row.MAP_TAG_TYPE == '2') {
            color = 'green'
          } else {
            color = 'blue'
          }
          var coverLayer_blue = new Ai.Polygon(coverWktStr_blue, {color: color, opacity: 1.0})
          // this.map.addLayer(coverLayer_blue)
          // 面设为编辑状态
          coverLayer_blue.snapediting = new Ai.PolylineSnap(
            this.map,
            coverLayer_blue
          )
          coverLayer_blue.snapediting.enable()
          this.layer = coverLayer_blue
          this.map.addLayer(coverLayer_blue)
          this.polygonDrawer.editing(this.layer)
          this.modalData = coverLayer_blue._latlngs[0]
          this.polygonDrawer.disable()
          this.map.setViewPort([this.layer])
        })
        .catch((res) => {
          // 请求失败处理...
        })
      this.markName = row.MAP_TAG_NAME
      this.markType = parseInt(row.MAP_TAG_TYPE)
      this.updateId = row.MAP_TAG_ID
@@ -588,7 +657,7 @@ export default {
        // console.log(workbook)
        /* 其中workbook.SheetNames[0]是表名下对应的数据 sheet数据 */
        let arr = XLSX.utils.sheet_to_json(
            workbook.Sheets[workbook.SheetNames[0]]
          workbook.Sheets[workbook.SheetNames[0]]
        )
        that.modalData = []
        var coverWktStr_blue = 'POLYGON (( '
@@ -600,14 +669,14 @@ export default {
          coverWktStr_blue += arr[i]['经度'] + ' ' + arr[i]['纬度'] + ','
        }
        that.map.setView(
            [parseFloat(arr[0]['纬度']), parseFloat(arr[0]['经度'])],
            5
          [parseFloat(arr[0]['纬度']), parseFloat(arr[0]['经度'])],
          5
        ) // 地图定位
        // that.map.center =  []
        // debugger
        coverWktStr_blue = coverWktStr_blue.substring(
            0,
            coverWktStr_blue.length - 1
          0,
          coverWktStr_blue.length - 1
        )
        coverWktStr_blue += '))'
        var coverLayer_blue = new Ai.Polygon(coverWktStr_blue, {
@@ -616,8 +685,8 @@ export default {
        that.map.addLayer(coverLayer_blue)
        // 面设为编辑状态
        coverLayer_blue.snapediting = new Ai.PolylineSnap(
            that.map,
            coverLayer_blue
          that.map,
          coverLayer_blue
        )
        coverLayer_blue.snapediting.enable()
        that.layer = coverLayer_blue
@@ -636,23 +705,23 @@ export default {
        ok: function () {
          var params = new FormData()
          params.append(
              'data',
              JSON.stringify({
                mapTagId: row.MAP_TAG_ID
              })
            'data',
            JSON.stringify({
              mapTagId: row.MAP_TAG_ID
            })
          )
          // debugger
          this.$test
              .post(services.mapTag.DEL_MAP_TAG, params)
              .then((res) => {
                // 请求成功处理...
                // debugger
                this.$Message.success('操作成功')
                that.getList()
              })
              .catch((res) => {
                // 请求失败处理...
              })
            .post(services.mapTag.DEL_MAP_TAG, params)
            .then((res) => {
              // 请求成功处理...
              // debugger
              this.$Message.success('操作成功')
              that.getList()
            })
            .catch((res) => {
              // 请求失败处理...
            })
        }
      }
      this.$Confirm.confirm(confirm)

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

@@ -16,12 +16,17 @@
      justify-content: space-between;
      >div{
        display: flex; 
        margin: 0 20px 16px 0;    
        line-height: 2;
        .label-content{
          display: flex; 
          margin: 0 20px 16px 0;    
          line-height: 2;
          .label{
            min-width: 70px;
          }
          .label-s{
            min-width: 45px;
          }
        }
        .input-rule{
          flex: 1;
@@ -31,9 +36,12 @@
          }
        }
      }
      .btns button{
        margin: 0 2px;
      }
      .btns{
        min-width: 395px;
        button{
          margin: 0 2px;
        }
      } 
    }
  }
  .table-pager{

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

@@ -4,28 +4,28 @@
      <div class="search-ctn">
        <div>
          <div class="label-content">
            <div class="label">部门：</div>
            <div class="label-s">部门：</div>
            <div class="input-rule">
              <!--              <t-select v-model="queryCondition.department" width="200" placeholder="请选择">-->
              <!--                <t-option v-for="(item, index) in departments" :key="index" :value="item.id">{{ item.userName }}</t-option>-->
              <!--              </t-select>-->
              <t-select-tree
                  v-model="queryCondition.department"
                  :node-data="cloneNodes"
                  node-key="id"
              <t-select-tree v-model="queryCondition.department"
                             :node-data="cloneNodes"
                             style="width:200px"
                             node-key="id"
              ></t-select-tree>
            </div>
          </div>
          <div class="label-content">
            <div class="label">姓名：</div>
            <div class="label-s">姓名：</div>
            <div class="input-rule">
              <t-input v-model="queryCondition.employeeName" placeholder="请输入..."></t-input>
              <t-input v-model="queryCondition.employeeName" style="width:200px" placeholder="请输入..."></t-input>
            </div>
          </div>
          <div class="label-content">
            <div class="label">员工编号：</div>
            <div class="input-rule">
              <t-input v-model="queryCondition.employeeNo" placeholder="请输入..."></t-input>
              <t-input v-model="queryCondition.employeeNo" style="width:200px" placeholder="请输入..."></t-input>
            </div>
          </div>
          <div class="btns">
@@ -54,9 +54,9 @@
        <t-table-column prop="age" label="年龄"></t-table-column>
        <t-table-column prop="mainWirelessCall" label="手机"></t-table-column>
        <t-table-column
            fixed="right"
            label="操作"
            width="240"
          fixed="right"
          label="操作"
          width="240"
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="handleClick(scope.row)">编辑</a>
@@ -84,9 +84,9 @@
        </t-form-item>
        <t-form-item label="部门" prop="department">
          <t-select-tree
              v-model="formValidate.department"
              :node-data="cloneNodes"
              node-key="id"
            v-model="formValidate.department"
            :node-data="cloneNodes"
            node-key="id"
          ></t-select-tree>
        </t-form-item>
        <t-form-item label="职务" prop="job">
@@ -98,7 +98,7 @@
        </t-form-item>
        <t-form-item label="出生年月" prop="age">
          <!--          <t-input v-model="formValidate.age" placeholder="请输入数字"></t-input>-->
          <t-date-picker style="width:250px" v-model="formValidate.age"
          <t-date-picker v-model="formValidate.age"
                         placeholder="请选择出生年月"></t-date-picker>
        </t-form-item>
        <t-form-item label="手机" prop="phone">
@@ -255,53 +255,53 @@ export default {
  methods: {
    getList: function () {
      this.$test
          .post(services.workEmployee.GET_WORK_EMPLOYEE, {
            data: {
              orgId: this.queryCondition.department,
              code: this.queryCondition.employeeNo,
              name: this.queryCondition.employeeName
            },
            pageNumber: this.table.pager.currentPage,
            pageSize: this.table.pager.size
          })
          .then((res) => {
            // 请求成功处理...
            this.table.data = res.data.data
            this.table.pager.total = res.data.total
          })
          .catch((res) => {
            // 请求失败处理...
          })
        .post(services.workEmployee.GET_WORK_EMPLOYEE, {
          data: {
            orgId: this.queryCondition.department,
            code: this.queryCondition.employeeNo,
            name: this.queryCondition.employeeName
          },
          pageNumber: this.table.pager.currentPage,
          pageSize: this.table.pager.size
        })
        .then((res) => {
          // 请求成功处理...
          this.table.data = res.data.data
          this.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    getDepartmentsList: function () {
      this.$test
          .post(services.workEmployee.GET_ALL_ORGANIZE, {})
          .then((res) => {
            // 请求成功处理...
            // this.departments = res.data
            this.departments = []
            for (let i = 0; i < res.data.length; i++) {
              if (res.data[i].parentCode > 0) {
                this.departments.push({
                  label: res.data[i].name,
                  title: res.data[i].name,
                  id: res.data[i].code,
                  data: res.data[i].id,
                  pid: res.data[i].parentCode
                })
              } else {
                this.departments.push({
                  label: res.data[i].name,
                  title: res.data[i].name,
                  id: res.data[i].code,
                  data: res.data[i].id
                })
              }
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
        .then((res) => {
          // 请求成功处理...
          // this.departments = res.data
          this.departments = []
          for (let i = 0; i < res.data.length; i++) {
            if (res.data[i].parentCode > 0) {
              this.departments.push({
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id,
                pid: res.data[i].parentCode
              })
            } else {
              this.departments.push({
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id
              })
            }
          })
          .catch((res) => {
            // 请求失败处理...
          })
          }
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onChange(value) {
      console.log('date change:' + value)
@@ -388,16 +388,16 @@ export default {
      this.$refs.formValidate.validate(valid => {
        if (valid) {
          that.$test.post(services.workEmployee.ADD_WORK_EMPLOYEE, {
                name: that.formValidate.name,
                code: that.formValidate.number,
                organizeCode: that.formValidate.department,
                mainJobPosition: that.formValidate.job.value,
                birthday: that.formValidate.age,
                // cardType: "居民身份证",
                // cardNo: "43252345455412305567X",
                // gender: "男",
                mainWirelessCall: that.formValidate.phone
              }
            name: that.formValidate.name,
            code: that.formValidate.number,
            organizeCode: that.formValidate.department,
            mainJobPosition: that.formValidate.job.value,
            birthday: that.formValidate.age,
            // cardType: "居民身份证",
            // cardNo: "43252345455412305567X",
            // gender: "男",
            mainWirelessCall: that.formValidate.phone
          }
          ).then(res => {
            // 请求成功处理...
            if (res.data) {