fix:1、无人机页面修改六参设定 2、监测因子趋势五分钟报

guoshipeng

2023-08-04 464f6b39668b153af0fec399dc6aab76c46bbf8d

fix:1、无人机页面修改六参设定
    2、监测因子趋势五分钟报

 src/components/Form/HourPicker1.vue

@@ -10,7 +10,7 @@
    type="datetimerange"
    range-separator="至"
    start-placeholder="开始日期"
    value-format="yyyy-MM-dd HH"
    value-format="yyyy-MM-dd HH:mm:ss"
    end-placeholder="结束日期"
    :picker-options="pickerOptions"
  >

 src/views/UVA/index.vue

@@ -211,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>
@@ -247,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>

@@ -446,6 +521,7 @@
  },
  data() {
    return {
      dialogFormVisible: false,
      chosee: 1,
      shou1: true,
      zhanK1: 1,
@@ -546,7 +622,6 @@
      noneData: true,
      defaultData: [],
      carMac: null,
      dialogFormVisible: false,
      optionsduo: [
        { code: 'a34004', name: 'PM2.5' },
        { code: 'a34002', name: 'PM10' },
@@ -708,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',
        },
      ],
    }
  },

@@ -748,6 +905,10 @@
    // this.getFlyData()
  },
  methods: {
    customLevel() {
      this.selectDuo()
      this.dialogFormVisible = false
    },
    selectDuo() {
      // console.log(2115);
      if (this.chosee === 1) {
@@ -763,7 +924,8 @@
      }
      this.$request({
        // url: '/uav/queryDataByBatch',
        url: '/uav/test',
        url: '/uav/getUav',
        // url: '/uav/test',
        method: 'post',
        data: {
          batch: this.batchs,
@@ -813,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) {
@@ -878,12 +1040,6 @@
      })
      return arr
    },
    // 点击列表切换走航车数据
    changeCarData(e) {
      this.carMac = e
      this.getStart()
    },
    // 请求走航车列表数据
    // 进行经纬度转换为距离的计算
    Rad(d) {
      return (d * Math.PI) / 180.0 // 经纬度转换成三角函数中度分表形式。
@@ -948,7 +1104,6 @@
        }
        this.dataType = 'history'
        // this.map = null
        this.getStart()
      }
    },
    // 获取无人机以及时间区间
@@ -1011,7 +1166,8 @@
      }
      this.$request({
        // url: '/uav/queryDataByBatch',
        url: '/uav/test',
        // url: '/uav/test',
        url: '/uav/getUav',
        method: 'post',
        data: {
          batch: item.batch,
@@ -1846,15 +2002,6 @@
          break
      }
      this.initStart(this.carData)
    },
    changeCode1(index) {
      this.changeColor1 = index
      if (index === 0) {
        this.viewKey = '2D'
      } else {
        this.viewKey = '3D'
      }
      this.getStart()
    },
  },
}

 src/views/charts/index.vue

@@ -145,6 +145,10 @@
          value: '小时报',
        },
        {
          label: '五分钟报',
          value: '五分钟报',
        },
        {
          label: '日报',
          value: '日报',
        },
@@ -183,6 +187,9 @@
      } else if (nv === '小时报') {
        this.dataType = 'HourPicker1'
        this.unit = 'hour'
      } else if (nv === '五分钟报') {
        this.dataType = 'HourPicker1'
        this.unit = 'FiveMinute'
      } else {
        this.dataType = 'CustomPicker'
        this.unit = 'hour'
@@ -280,6 +287,7 @@
                if (lockLength < data[i].deviceData.length) {
                  newLineChartData.series.push({
                    data: [],
                    // large: true,
                    name: '',
                    type: 'line',
                    label: {
@@ -292,6 +300,7 @@
                newLineChartData.series.push({
                  data: [],
                  name: '',
                  // large: true,
                  type: 'line',
                })
              }