chenxr3 4 lat temu
rodzic
commit
c65072f9be

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

466
            .then((res) => {
466
            .then((res) => {
467
              this.modal = false
467
              this.modal = false
468
              this.personLayer.eachLayer(layer => {
468
              this.personLayer.eachLayer(layer => {
469
                this.map.removeLayer(layer)
470
                this.map.closePopup()
471
                if (layer.lineLayer && this.map.hasLayer(layer.lineLayer)) {
469
                if (layer.lineLayer && this.map.hasLayer(layer.lineLayer)) {
472
                  this.map.removeLayer(layer.lineLayer)
470
                  this.map.removeLayer(layer.lineLayer)
473
                }
471
                }
472
                this.map.removeLayer(layer)
473
                this.map.closePopup()
474
              })
474
              })
475
              this.load()
475
              this.load()
476
            })
476
            })
491
            .then((res) => {
491
            .then((res) => {
492
              console.log(res)
492
              console.log(res)
493
              this.personLayer.eachLayer(layer => {
493
              this.personLayer.eachLayer(layer => {
494
                this.map.removeLayer(layer)
495
                this.map.closePopup()
496
                if (layer.lineLayer && this.map.hasLayer(layer.lineLayer)) {
494
                if (layer.lineLayer && this.map.hasLayer(layer.lineLayer)) {
497
                  this.map.removeLayer(layer.lineLayer)
495
                  this.map.removeLayer(layer.lineLayer)
498
                }
496
                }
497
                this.map.removeLayer(layer)
498
                this.map.closePopup()
499
              })
499
              })
500
              this.load()
500
              this.load()
501
            })
501
            })

+ 23 - 22
ebc-middle-platform/src/modules/orientation/orientation.vue

224
        currentIndex: 0
224
        currentIndex: 0
225
      },
225
      },
226
      trackMap: null,
226
      trackMap: null,
227
	  trackPath: null,
227
	    trackPath: null,
228
      rangeDate: '',
228
      rangeDate: '',
229
      rescueModal: false,
229
      rescueModal: false,
230
      formValidate: {
230
      formValidate: {
414
              })
414
              })
415
            })
415
            })
416
            this.map.addLayer(point)
416
            this.map.addLayer(point)
417
            this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40])
417
            this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40], url)
418
            coreEntity.point = point
418
            coreEntity.point = point
419
          }
419
          }
420
        }
420
        }
448
              businessTypeName = m.name
448
              businessTypeName = m.name
449
            }
449
            }
450
          })
450
          })
451
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10])
451
          this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10], '')
452
        }
452
        }
453
      })
453
      })
454
    },
454
    },
517
                    businessTypeName = m.name
517
                    businessTypeName = m.name
518
                  }
518
                  }
519
                })
519
                })
520
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10])
520
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -10], '')
521
              }
521
              }
522
            }
522
            }
523
          })
523
          })
545
                })
545
                })
546
                this.map.addLayer(point)
546
                this.map.addLayer(point)
547
                var businessTypeName = '设备'
547
                var businessTypeName = '设备'
548
                var url
548
                this.toolTypes.forEach(t => {
549
                this.toolTypes.forEach(t => {
549
                  if (e.coreEntityType == t.resourceToolType) {
550
                  if (e.coreEntityType == t.resourceToolType) {
551
                    url = t.iconUrl
550
                    businessTypeName = t.name
552
                    businessTypeName = t.name
551
                  }
553
                  }
552
                })
554
                })
553
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40])
555
                this.getPopup(point, e.ebcEntityPositionList, businessTypeName, e.mapAreaName, [0, -40], url)
554
                la.point = point
556
                la.point = point
555
              }
557
              }
556
            }
558
            }
557
            console.log('..............')
558
          })
559
          })
559
        }
560
        }
560
      })
561
      })
561
      // this.loadMapArea()
562
      // this.loadMapArea()
562
      // this.loadCoreEntity()
563
      // this.loadCoreEntity()
563
    },
564
    },
564
    getPopup(point, positionList, type, name, offset) {
565
    getPopup(point, positionList, type, name, offset, url) {
565
      // if (point.popup) {
566
      // if (point.popup) {
566
      //   point.popup.remove()
567
      //   point.popup.remove()
567
      //   point.popup = null
568
      //   point.popup = null
580
      })
581
      })
581
      var content = '<div class="tips-item">'
582
      var content = '<div class="tips-item">'
582
      if (type) {
583
      if (type) {
583
        content += '<div class="top"><div><b>' + type + '</b></div><div>' + name + '</div></div>'
584
        content += '<div class="top">'
585
        if (url) {
586
          content += '<div><img src="' + url + '" width="20" height="20"></div>'
587
        }
588
        content += '<div>' + name + '</div></div>'
584
        content += '<div class="container">'
589
        content += '<div class="container">'
585
        positionList.forEach(e => {
590
        positionList.forEach(e => {
586
          content +=
591
          content +=
638
        point.setAttributes({'elementId': element.entityId})
643
        point.setAttributes({'elementId': element.entityId})
639
        this.layer.personLayer.addLayer(point)
644
        this.layer.personLayer.addLayer(point)
640
        // this.map.addLayer(point)
645
        // this.map.addLayer(point)
641
        this.getPopup(point, [element], '', '', [0, -10])
646
        this.getPopup(point, [element], '', '', [0, -10], '')
642
      })
647
      })
643
      // this.map.setViewPort([points])
648
      // this.map.setViewPort([points])
644
    },
649
    },
665
            // point.setAttributes({'elementId': element.entityId})
670
            // point.setAttributes({'elementId': element.entityId})
666
            // this.layer.personLayer.addLayer(point)
671
            // this.layer.personLayer.addLayer(point)
667
            // this.map.addLayer(point)
672
            // this.map.addLayer(point)
668
            this.getPopup(la, [element], '', '', [0, -10])
673
            this.getPopup(la, [element], '', '', [0, -10], '')
669
          }
674
          }
670
        })
675
        })
671
        if (is) {
676
        if (is) {
684
          point.setAttributes({'elementId': element.entityId})
689
          point.setAttributes({'elementId': element.entityId})
685
          this.layer.personLayer.addLayer(point)
690
          this.layer.personLayer.addLayer(point)
686
          // this.map.addLayer(point)
691
          // this.map.addLayer(point)
687
          this.getPopup(point, [element], '', '', [0, -10])
692
          this.getPopup(point, [element], '', '', [0, -10], '')
688
        }
693
        }
689
      })
694
      })
690
      // this.map.setViewPort([points])
695
      // this.map.setViewPort([points])
706
    },
711
    },
707
    getClassByStatus(status) {
712
    getClassByStatus(status) {
708
      switch (status) {
713
      switch (status) {
709
        case '060': // 救援人员 ------ 黄色
710
          return 'outline'
711
          break
712
        case '050': // 自动告警 ------ 红色
714
        case '050': // 自动告警 ------ 红色
713
          return 'sos'
714
          break
715
        case '040': // 手动告警 ------ 红色
715
        case '040': // 手动告警 ------ 红色
716
          return 'sos'
716
          return 'sos'
717
          break
717
          break
718
        case '030': // 离线 ------ 灰色
718
        case '030': // 离线 ------ 灰色
719
          return 'offline'
719
          return 'offline'
720
          break
720
          break
721
        case '060': // 救援人员 ------ 黄色
721
        case '020': // 进入了禁入区域 ------ 黄色
722
        case '020': // 进入了禁入区域 ------ 黄色
723
        case '015': // 在限制区域超时 ------ 黄色
722
          return 'outline'
724
          return 'outline'
723
          break
725
          break
724
        case '010': // 限制区域超时 ------ 
725
          return 'outline'
726
          break
726
        case '010': // 进入限制区域(尚未超时 ------ 绿
727
        case '000': // 正常 ------ 绿色
727
        case '000': // 正常 ------ 绿色
728
          return 'normal'
728
          return 'normal'
729
          break
729
          break
730
        case '015': // 进入限制区域(尚未超时) ------ 绿色
731
          return 'normal'
732
          break
733
        default:
730
        default:
734
          return 'normal'
731
          return 'normal'
735
      }
732
      }
946
      }
943
      }
947
    },
944
    },
948
    playback() {
945
    playback() {
946
      if (this.trackMap.hasLayer(this.trackPath)) {
947
        this.trackMap.removeLayer(this.trackPath)
948
        this.trackPath.hideTraceFrom(this.trackMap)
949
      }
949
      console.log(this.trackQueryCondition.currentIndex)
950
      console.log(this.trackQueryCondition.currentIndex)
950
      var params = {}
951
      var params = {}
951
      if (this.trackQueryCondition.currentIndex === 3) {
952
      if (this.trackQueryCondition.currentIndex === 3) {