Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

QibolinCzp

2021-05-14 6a6e940cc87ad0813998f89ac83447c3d6915d29

 src/components/BaseNav/WasteWater/Detail.vue

@@ -1,61 +1,22 @@
<template>
  <div class="detail" style="width: 5.5rem">
    <div class="tab-scroll">
      <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
      <span class="time-select">{{ timeStart }}——{{ timeEnd }}</span>
    </div>
    <el-table
        :data="tableData"
        style="width: 100%;"
        height="280px"
    >
      <el-table-column
          prop="LabMonTime"
          label="检测时间">
  <div class="detail" style="width: 5rem">
    <el-table :data="tableData" style="width: 100%;" height="2.07rem">
      <el-table-column prop="LabMonTime" label="检测时间"></el-table-column>
      <el-table-column label="COD">
        <el-table-column prop="LabMonValue" label="监测值" width="80"></el-table-column>
        <el-table-column prop="LabMonValue" label="标准值" width="80"></el-table-column>
      </el-table-column>
      <el-table-column
          label="COD">
        <el-table-column
            prop="LabMonValue"
            label="监测值">
        </el-table-column>
        <el-table-column
            prop="StdValue"
            label="标准值">
        </el-table-column>
      <el-table-column label="氨氮">
        <el-table-column prop="LabMonValue" label="监测值" width="80"></el-table-column>
        <el-table-column prop="LabMonValue" label="标准值" width="80"></el-table-column>
      </el-table-column>
      <el-table-column
          label="氨氮">
        <el-table-column
            prop="LabMonValue"
            label="监测值">
        </el-table-column>
        <el-table-column
            prop="StdValue"
            label="标准值">
        </el-table-column>
      <el-table-column label="总磷">
        <el-table-column prop="LabMonValue" label="监测值" width="80"></el-table-column>
        <el-table-column prop="LabMonValue" label="标准值" width="80"></el-table-column>
      </el-table-column>
      <el-table-column
          label="总磷">
        <el-table-column
            prop="LabMonValue"
            label="监测值">
        </el-table-column>
        <el-table-column
            prop="StdValue"
            label="标准值">
        </el-table-column>
      </el-table-column>
      <el-table-column
          label="总氮">
        <el-table-column
            prop="LabMonValue"
            label="监测值">
        </el-table-column>
        <el-table-column
            prop="StdValue"
            label="标准值">
        </el-table-column>
      <el-table-column label="总氮">
        <el-table-column prop="LabMonValue" label="监测值" width="80"></el-table-column>
        <el-table-column prop="LabMonValue" label="标准值" width="80"></el-table-column>
      </el-table-column>
      <!--      <el-table-column-->
      <!--          fixed="right"-->
@@ -77,61 +38,20 @@

<script>

import PublicDataStandard from '../PublicDataStandard'
import mapApi from '@/api/mapApi'
// import PublicDataStandard from '../PublicDataStandard'
// import mapApi from '@/api/mapApi'
import mapApi from '../../../api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'

export default {
  name: 'Detail',
  components: {
    PublicDataStandard
    // PublicDataStandard
  },
  data () {
    return {
      tableData: [],
      // tab栏传递接收数据
      dataStandard: [
        {
          current: {
            name: '氮氧化物',
            val: 29.93
          },
          standard: {
            name: '标准',
            val: 100
          }
        },
        {
          current: {
            name: '二氧化硫',
            val: 17.34
          },
          standard: {
            name: '标准',
            val: 50
          }
        },
        {
          current: {
            name: '烟尘',
            val: 6.93
          },
          standard: {
            name: '标准',
            val: 30
          }
        },
        {
          current: {
            name: '废气流量',
            val: 120
          },
          standard: {
            name: '',
            val: null
          }
        }],
      timeEnd: dayjs().format('YYYY-MM-DD HH:mm:ss'),
      timeStart: dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
    }
@@ -152,6 +72,12 @@
      const result = (await mapApi.getQueryLabMonData(data)).Result.DataInfo
      // console.log(result)
      this.tableData = result
      for (let i = 0; i < result.length; i++) {
        console.log(result[i].LabMonValue)
        if (result[i].LabMonValue === '0') {
          return '-'
        }
      }
    }
  }
}
@@ -166,21 +92,4 @@
/*/deep/ .el-table {*/
/*  border: none !important;*/
/*}*/

.tab-scroll {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

.time-select {
  cursor: pointer;
  padding: 5px;
  border: 1px solid #2b87c8;
  border-radius: 4px;
  text-align: center;
  color: #fff;
  font-size: 11px;
  width: 280px;
}
</style>