fix:修改图标偏移，打开websocket

guoshipeng

2023-08-20 a315f8bc5864848b2f408cbad42414ef09871464

 src/views/UVA/index.vue

@@ -145,25 +145,6 @@
              <el-radio-button label="TVOC"></el-radio-button>
            </el-radio-group>
            <div class="Duo" v-if="selecttrue === 2">
              <el-select v-model="Duovalue" placeholder="其他因子" class="slee">
                <el-option
                  v-for="item in optionsduo"
                  :key="item.code"
                  :label="item.name"
                  :value="item.name"
                >
                </el-option>
              </el-select>
              <div class="spantu">
                <span>图形边长(米): </span
                ><el-input
                  class="inputtu"
                  v-model="uvasize"
                  clearable
                  placeholder="请输入内容"
                  ref="uvas"
                ></el-input>
              </div>
              <div class="spantuu">
                <span>无人机飞行高度范围(米): </span>
                <el-input
@@ -178,6 +159,48 @@
                  ref="uvas"
                ></el-input>
              </div>
              <!-- <el-select v-model="Duovalue" placeholder="其他因子" class="slee">
                <el-option
                  v-for="item in optionsduo"
                  :key="item.code"
                  :label="item.name"
                  :value="item.name"
                >
                </el-option>
              </el-select> -->
              <div class="spantu">
                <span>图形边长(米): </span
                ><el-input
                  class="inputtu"
                  v-model="uvasize"
                  clearable
                  placeholder="请输入内容"
                  ref="uvas"
                ></el-input>
              </div>
              <el-select v-model="Duovalue" placeholder="其他因子" class="slee">
                <el-option
                  v-for="item in optionsduo"
                  :key="item.code"
                  :label="item.name"
                  :value="item.name"
                >
                </el-option>
              </el-select>
              <!-- <div class="spantuu">
                <span>无人机飞行高度范围(米): </span>
                <el-input
                  class="inputtu"
                  v-model="tallone"
                  ref="uvas"
                ></el-input>
                --
                <el-input
                  class="inputtu"
                  v-model="talltwo"
                  ref="uvas"
                ></el-input>
              </div> -->
            </div>
            <div v-if="selecttrue === 1" style="margin-left: 10px">
              <el-button type="primary" @click="gengD" style="margin-top: 10px"
@@ -188,6 +211,13 @@
              v-if="selecttrue === 2"
              style="margin-left: 10px; margin-top: 10px"
            >
              <el-button
                size="medium"
                type="primary"
                icon="el-icon-setting"
                @click="dialogFormVisible = true"
                >6参设定</el-button
              >
              <el-button class="gengD" @click="shou">收起</el-button>
              <el-button type="primary" @click="selectDuo">查询</el-button>
            </div>
@@ -224,6 +254,74 @@
        <div id="map_container" v-loading="loading1" />
      </el-main>
    </el-container>
    <el-dialog title="6参设定" :visible.sync="dialogFormVisible" width="1000px">
      <el-descriptions title="国控6参" :column="3" border>
        <el-descriptions-item
          label="PM2.5 | ug/m³"
          label-class-name="my-label"
          content-class-name="my-content"
          >22</el-descriptions-item
        >
        <el-descriptions-item label="PM10 | ug/m³">34</el-descriptions-item>
        <el-descriptions-item label="SO2 | ug/m³">4</el-descriptions-item>
        <el-descriptions-item label="NO2 | ug/m³">16</el-descriptions-item>
        <el-descriptions-item label="CO | mg/m³">0.5</el-descriptions-item>
        <el-descriptions-item label="O3 | ug/m³">149</el-descriptions-item>
      </el-descriptions>
      <!-- <el-descriptions title="设备标准值"  border>
      </el-descriptions> -->
      <div
        style="
          font-size: 16px;
          font-weight: 700;
          margin: 10px 0 20px 0;
          font-size: 16px;
          font-weight: 700;
          color: #303133;
        "
      >
        设备标准值
      </div>
      <el-table :data="sensorTableData" border>
        <el-table-column prop="sensorName" label="名称" />
        <el-table-column prop="unit" label="单位" />
        <el-table-column label="一级">
          <template slot-scope="scope">
            <el-input v-model="scope.row.tab1" placeholder="请输入内容" />
            <!-- <span v-show="!scope.row.show">{{ scope.row.tab1 }}</span> -->
          </template>
        </el-table-column>
        <el-table-column label="二级">
          <template slot-scope="scope">
            <el-input v-model="scope.row.tab2" placeholder="请输入内容" />
          </template>
        </el-table-column>
        <el-table-column label="三级">
          <template slot-scope="scope">
            <el-input v-model="scope.row.tab3" placeholder="请输入内容" />
          </template>
        </el-table-column>
        <el-table-column label="四级">
          <template slot-scope="scope">
            <el-input v-model="scope.row.tab4" placeholder="请输入内容" />
          </template>
        </el-table-column>
        <el-table-column label="五级">
          <template slot-scope="scope">
            <el-input v-model="scope.row.tab5" placeholder="请输入内容" />
          </template>
        </el-table-column>
        <el-table-column label="六级">
          <template slot-scope="scope">
            <el-input v-model="scope.row.tab6" placeholder="请输入内容" />
          </template>
        </el-table-column>
      </el-table>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogFormVisible = false">取 消</el-button>
        <el-button type="primary" @click="customLevel">确 定</el-button>
      </div>
    </el-dialog>
  </div>
</template>

@@ -423,6 +521,7 @@
  },
  data() {
    return {
      dialogFormVisible: false,
      chosee: 1,
      shou1: true,
      zhanK1: 1,
@@ -523,7 +622,6 @@
      noneData: true,
      defaultData: [],
      carMac: null,
      dialogFormVisible: false,
      optionsduo: [
        { code: 'a34004', name: 'PM2.5' },
        { code: 'a34002', name: 'PM10' },
@@ -677,7 +775,7 @@
      endTime: '',
      dataDate: '',
      sensorTime: [],
      uvasize: 50,
      uvasize: 20,
      timeValue: [
        new Date(2020, 1, 1, 0, 0, 0),
        new Date(2022, 12, 31, 23, 59, 59),
@@ -685,6 +783,88 @@
      timeNums: [],
      batchs: '',
      macs: '',
      sensorTableData: [
        {
          sensorName: 'PM2.5',
          unit: 'ug/m³',
          tab1: '35',
          tab2: '75',
          tab3: '115',
          tab4: '150',
          tab5: '250',
          tab6: '350',
        },
        {
          sensorName: 'PM10',
          unit: 'ug/m³',
          tab1: '50',
          tab2: '150',
          tab3: '250',
          tab4: '350',
          tab5: '420',
          tab6: '500',
        },
        {
          sensorName: 'SO2',
          unit: 'ug/m³',
          tab1: '150',
          tab2: '500',
          tab3: '650',
          tab4: '800',
          tab5: '',
          tab6: '',
        },
        {
          sensorName: 'NO2',
          unit: 'ug/m³',
          tab1: '100',
          tab2: '200',
          tab3: '700',
          tab4: '1200',
          tab5: '2340',
          tab6: '3090',
        },
        {
          sensorName: 'CO',
          unit: 'mg/m³',
          tab1: '5',
          tab2: '10',
          tab3: '35',
          tab4: '60',
          tab5: '90',
          tab6: '120',
        },
        {
          sensorName: 'O3',
          unit: 'ug/m³',
          tab1: '160',
          tab2: '200',
          tab3: '300',
          tab4: '400',
          tab5: '800',
          tab6: '1000',
        },
        {
          sensorName: 'TVOC',
          unit: 'mg/m³',
          tab1: '0.1',
          tab2: '0.3',
          tab3: '0.5',
          tab4: '0.7',
          tab5: '0.9',
          tab6: '1',
        },
        {
          sensorName: '尘负荷',
          unit: 'ug/m³',
          tab1: '300',
          tab2: '500',
          tab3: '1000',
          tab4: '10000',
          tab5: '20000',
          tab6: '50000',
        },
      ],
    }
  },

@@ -725,10 +905,18 @@
    // this.getFlyData()
  },
  methods: {
    customLevel() {
      this.selectDuo()
      this.dialogFormVisible = false
    },
    selectDuo() {
      // console.log(2115);
      if (this.chosee === 1) {
        this.$message.warning('请先在左侧选择无人机时间')
        return
      } else {
        // console.log('132123');
        this.loading1 = true
      }
      if (this.view) {
        this.view.removeAllLayers()
@@ -736,13 +924,15 @@
      }
      this.$request({
        // url: '/uav/queryDataByBatch',
        url: '/uav/test',
        url: '/uav/getUav',
        // url: '/uav/test',
        method: 'post',
        data: {
          batch: this.batchs,
          uvasize: this.uvasize,
          height: 0,
          mac: this.macs,
          height1: this.tallone,
          height2: this.talltwo,
          // batch: '2023-06-16 16:21:21',
        },
      }).then((res) => {
@@ -785,11 +975,11 @@
      //   return
      // }
      this.selecttrue = 2
      $('.numss').css({ width: '930px' })
      $('.numss').css({ width: '1050px' })
    },
    shou() {
      this.selecttrue = 1
      $('.numss').css({ width: '690px' })
      $('.numss').css({ width: '700px' })
    },
    parseTime(time, cFormat) {
      if (arguments.length === 0 || !time) {
@@ -850,12 +1040,6 @@
      })
      return arr
    },
    // 点击列表切换走航车数据
    changeCarData(e) {
      this.carMac = e
      this.getStart()
    },
    // 请求走航车列表数据
    // 进行经纬度转换为距离的计算
    Rad(d) {
      return (d * Math.PI) / 180.0 // 经纬度转换成三角函数中度分表形式。
@@ -920,7 +1104,6 @@
        }
        this.dataType = 'history'
        // this.map = null
        this.getStart()
      }
    },
    // 获取无人机以及时间区间
@@ -971,6 +1154,7 @@
      //   this.carData.push(this.xie.date[i])
      // }
      // this.initStart(this.carData)
      this.loading1 = true
      this.asideData.activeKey = index
      this.chosee = 2
      this.batchs = item.batch
@@ -982,12 +1166,14 @@
      }
      this.$request({
        // url: '/uav/queryDataByBatch',
        url: '/uav/test',
        // url: '/uav/test',
        url: '/uav/getUav',
        method: 'post',
        data: {
          batch: item.batch,
          uvasize: this.uvasize,
          height: 0,
          height1: this.tallone,
          height2: this.talltwo,
          mac: mac,
          // batch: '2023-06-16 16:21:21',
        },
@@ -1115,10 +1301,12 @@
            if (lng < 70 || lng > 150 || lat > 60 || lat < 20) {
              return true
            }
            lng = GPS.gcj_encrypt(lat, lng).lon
            lat = GPS.gcj_encrypt(lat, lng).lat
            lng = GPS.bd_encrypt(lat, lng).lon
            lat = GPS.bd_encrypt(lat, lng).lat
            // lng = GPS.gcj_encrypt(lat, lng).lon
            // lat = GPS.gcj_encrypt(lat, lng).lat
            // lng = GPS.bd_encrypt(lat, lng).lon
            // lat = GPS.bd_encrypt(lat, lng).lat
            // lng = GPS.bd_decrypt(lat, lng).lon
            // lat = GPS.bd_decrypt(lat, lng).lat
            var point = new BMapGL.Point(lng, lat)
            point.a34004 = parseInt(value.a34004)
            point.a34002 = parseInt(value.a34002)
@@ -1178,6 +1366,7 @@
            map: that.map,
          })
          that.firstPlayFlag = false
          that.loading1 = false
        } else {
          this.view.removeAllLayers()
          this.map.clearOverlays()
@@ -1185,6 +1374,8 @@
          that.view = new mapvgl.View({
            map: that.map,
          })
          that.loading1 = false

          // that.map.centerAndZoom(that.centerPoint, 18)
        }
      }
@@ -1316,6 +1507,7 @@
            }
          }
          points.push(point1)
          // console.log(points, 'image.png')
          // if (flag) {
          //   points.push(point1)
          //   console.log(points, 'points')
@@ -1811,15 +2003,6 @@
      }
      this.initStart(this.carData)
    },
    changeCode1(index) {
      this.changeColor1 = index
      if (index === 0) {
        this.viewKey = '2D'
      } else {
        this.viewKey = '3D'
      }
      this.getStart()
    },
  },
}
</script>
@@ -2037,9 +2220,10 @@
  // background-color: white;
  // height: 40px;
  display: flex;
  margin-left: 25px;
  margin-left: 10px;
  line-height: 60px;
  font-weight: 5px;
  color: #696b6f;
  .inputtu {
    width: 40%;
    margin-left: 5px;
@@ -2048,11 +2232,12 @@
.slee {
  line-height: 60px;
  width: 100px;
  margin-left: 25px;
}
.spantuu {
  margin-left: 25px;
  width: 400px;
  line-height: 60px;
  color: #696b6f;
  .inputtu {
    width: 20%;
  }
@@ -2067,7 +2252,6 @@
.BMap_cpyCtrl {
  display: none;
}

.anchorBL {
  display: none;
}