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

wangqi

2021-04-14 2e0c26ba23e3b8ebdaed0b38e87526cce94bf215

 src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue

@@ -6,58 +6,117 @@
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <div style="width: 755px">
  <el-table
      :data="tableData"
      max-height="255px"
      style="width: 100%;height: 100%">
    <el-table-column
        prop="tableData.LabMonTime"
        prop="date"
        width="130"
        label="检测时间">
    </el-table-column>
    <el-table-column
        label="BOD5">
      <el-table-column
          prop="codWatch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="codTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="COD">
      <el-table-column
          prop="tableData.MonItemId"
          prop="phWatch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="codTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="PH">
      <el-table-column
          prop="tableData.MonItemId"
          prop="bod5Watch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="BOD5">
      <el-table-column
          prop="tableData.MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="bod5Time"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="氨氮">
      <el-table-column
          prop="tableData.MonItemId"
          prop="adWatch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="adTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="挥发酚">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="氟离子">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="硫化物">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="石油类">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="悬浮物">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
  </el-table>
  </div>
</template>

<script>
@@ -65,71 +124,181 @@
  name: 'EChartsTable',
  data () {
    return {
      // tableLabel: [
      //   {
      //     label: '检测时间',
      //     prop: 'StoragePlaceId'
      //   },
      //   {
      //     label: '二氧化硫',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   },
      //   {
      //     label: '氮氧化物',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   },
      //   {
      //     label: '烟尘',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   },
      //   {
      //     label: '黑度',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   }
      // ],
      tableData: []
      tableData: [{
        date: '2016-05-03 12:00:00',
        codWatch: '1',
        codTime: '-',
        phWatch: '1',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:00:15',
        codWatch: '-',
        codTime: '2',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '2',
        adWatch: '1',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:00:30',
        codWatch: '1',
        codTime: '2',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:01:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:01:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:02:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:02:30',
        codWatch: '-',
        codTime: '-',
        phWatch: '2',
        phTime: '-',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:03:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:03:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '1'
      },
      {
        date: '2016-05-03 12:04:15',
        codWatch: '-',
        codTime: '-',
        phWatch: '1',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:04:30',
        codWatch: '-',
        codTime: '1',
        phWatch: '2',
        phTime: '-',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:05:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:05:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '1'
      },
      {
        date: '2016-05-03 12:06:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:06:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '1'
      }]
    }
  },
  created () {
    this.$nextTick(() => {
      this.$attrs.ManualData.forEach(item => {
        this.tableData = [...item]
      })
      this.tableData.LabMonTime = 100
      console.log(this.tableData)
    })
    // this.$nextTick(() => {
    //   this.$attrs.ManualData.forEach(item => {
    //     this.tableData = [...item]
    //   })
    //   this.tableData.LabMonTime = 100
    //   console.log(this.tableData)
    // })
  }
}