Merge branch 'feature_1.0'

quanyawei

2023-10-09 739ddb59b6e59102a7d4d1c1c0c6eafa0b9e2e17

 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
@@ -887,7 +883,10 @@
  },

  mounted() {
    this.initStart()
    this.$nextTick(() => {
      this.initStart()
    })

    // this.$refs.datePick.focus()
    // this.getDate()
    // this.flyData()
@@ -1224,7 +1223,7 @@
      const that = this
      if (!res) {
        that.map = new BMapGL.Map('map_container')
        console.log('BMap', BMap)
        console.log('BMapGL', BMapGL)
        console.log('BMapGL', BMapGL)
        console.log('window', window.BMapGL)
        that.map.enableScrollWheelZoom(true) // 开启鼠标滚轮，地图可以进行放大、缩小s
@@ -1327,7 +1326,7 @@
        // 已有地图，避免再次请求
        // if (!that.showPoints) {
        //   console.log(111)
        //   that.map = new BMapGL.Map('map_container')
        //   that.map = new window.BMapGL.Map('map_container')
        // }
        // that.map.enableScrollWheelZoom(true) // 开启鼠标滚轮，地图可以进行放大、缩小s
        // that.map.setMapType(BMAP_EARTH_MAP) // 设置地图类型为地球模式
@@ -1348,7 +1347,7 @@
        //   building: true, // 不显示建筑物
        //   poiText: false, // 显示poi文字
        // })
        // that.map.addControl(new BMapGL.NavigationControl3D()) // 添加3d控件
        // that.map.addControl(new window.BMapGL.NavigationControl3D()) // 添加3d控件
        if (this.responseJSON.length === 0) {
          showNoPoints()
        }
@@ -2005,7 +2004,22 @@
}
</script>

<style  lang="scss" >
<style  lang="scss" scoped>
.main-container {
    display: -webkit-box;
    display: -ms-flexbox;
    display: flex;
    -webkit-box-orient: vertical;
    -webkit-box-direction: normal;
    -ms-flex-flow: column;
    flex-flow: column;
    min-height: 100%;
    -webkit-transition: margin-left .28s;
    transition: margin-left .28s;
    margin-left: 210px;
    position: relative;
    height: 100%;
}
/deep/.BMap_cpyCtrl {
  display: none;
}