Merge branch 'feature_1.0'

quanyawei

2023-10-09 b760e4eea2fc4f56347ac26ca8bde97b15e164e5

Merge branch 'feature_1.0'

# Conflicts:
#	src/views/UVA/index.vue

 src/views/UVA/index.vue

@@ -45,8 +45,6 @@
          <el-collapse
            v-show="shou1 === true"
            v-loading="loading"
            accordion
            style="box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)"
          >
            <el-collapse-item
              style="text-indent: 2em; position: relative; padding-botton: 10px"
@@ -146,8 +144,6 @@
                <span>无人机飞行高度范围(米): </span>
                <el-input
                  ref="uvas"
                  v-model="tallone"
                  class="inputtu"
                />
                --
                <el-input
@@ -885,13 +881,6 @@
    deep: true,
    immediate: true
  },

  mounted() {
    this.initStart()
    // this.$refs.datePick.focus()
    // this.getDate()
    // this.flyData()
  },
  created() {
    this.newTime(this.timeValue)
    this.newDate()
@@ -1223,7 +1212,10 @@
      this.abc += 1
      const that = this
      if (!res) {
        that.map = new window.window.BMapGL.Map('map_container')
        that.map = new BMap.Map('map_container')
        console.log('BMap', BMap)
        console.log('BMapGL', BMapGL)
        console.log('window', window.BMapGL)
        that.map.enableScrollWheelZoom(true) // 开启鼠标滚轮，地图可以进行放大、缩小s
        that.map.setMapType(BMAP_EARTH_MAP) // 设置地图类型为地球模式
        that.map.setDisplayOptions({
@@ -1415,10 +1407,10 @@
          var color = getColorAndLevel(sensor, data).color
          var polygon = new window.BMapGL.Polygon(
            [
              new window.BMapGL.Point(sw.lng, sw.lat), // 左下角
              new window.BMapGL.Point(ne.lng, sw.lat), // 左上角
              new window.BMapGL.Point(ne.lng, ne.lat), // 右上角
              new window.BMapGL.Point(sw.lng, ne.lat) // 右下角
              new BMapGL.Point(sw.lng, sw.lat), // 左下角
              new BMapGL.Point(ne.lng, sw.lat), // 左上角
              new BMapGL.Point(ne.lng, ne.lat), // 右上角
              new BMapGL.Point(sw.lng, ne.lat) // 右下角
            ],
            {
              strokeWeight: 0.1, // 边框线的宽度,以像素为单位
@@ -1443,7 +1435,7 @@
        )
        var startMark = new window.BMapGL.Marker(that.showPoints[0], {
          icon: startIcon,
          offset: new window.BMapGL.Size(0, -20)
          offset: new BMapGL.Size(0, -20)
        })
        that.map.addOverlay(startMark)
        var endIcon = new window.BMapGL.Icon(
@@ -1454,7 +1446,7 @@
          that.showPoints[that.showPoints.length - 1],
          {
            icon: endIcon,
            offset: new window.BMapGL.Size(0, -20)
            offset: new BMapGL.Size(0, -20)
          }
        )
        that.map.addOverlay(endMark)
@@ -1888,7 +1880,7 @@
        var label = new window.BMapGL.Label(
          "<span class='my-maptip'>" + content + '<br /><span>', // 为lable填写内容
          {
            offset: new window.BMapGL.Size(-8, -10), // label的偏移量，为了让label的中心显示在点上
            offset: new BMapGL.Size(-8, -10), // label的偏移量，为了让label的中心显示在点上
            position: point
          } // label的位置
        )

 vue.config.js

@@ -28,9 +28,6 @@
  productionSourceMap: false,
  devServer: {
    port: port,
    client: {
      webSocketURL: 'ws://0.0.0.0:8080/ws'
    },
    open: false,
    overlay: {
      warnings: false,