Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-16 7cb82d5220007f1c619b9ac76abbe975c4d212d5

Merge remote-tracking branch 'origin/develop' into develop

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

@@ -31,7 +31,7 @@
    <el-table-column
        label="烟尘">
      <el-table-column
          prop="MonItemId"
          prop="DataTypeName"
          label="监测值">
      </el-table-column>
      <el-table-column
@@ -42,11 +42,11 @@
    <el-table-column
        label="非甲烷总烃">
      <el-table-column
          prop="MonItemId"
          prop="DataTypeName"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="MonItemId"
          prop="DataTypeName"
          label="标准值">
      </el-table-column>
    </el-table-column>
@@ -54,32 +54,19 @@
</template>

<script>
// import dayjs from 'dayjs'
export default {
  name: 'EChartsTable',
  data () {
    return {
      tableData: [{
        LabMonTime: '2021-02-05 09:54',
        MonItemId: '---',
        EndMonTime: '30',
        NOMonTime: '44',
        NOEndTime: '100',
        SOMontime: '9',
        SoEndTime: '50'
      }, {
        LabMonTime: '2021-01-14 10:15',
        MonItemId: '---',
        EndMonTime: '30',
        NOMonTime: '70',
        NOEndTime: '100',
        SOMontime: '---',
        SoEndTime: '50'
      }]
      tableData: []
    }
  },
  created () {
    // this.tableData = [...this.$attrs.ManualData]
    // console.log(this.tableData)
    this.$attrs.ManualData.forEach((item, index) => {
      this.tableData.push(item)
      this.tableData[index].LabMonTime = this.tableData[index].LabMonTime.replaceAll('T', ' ')
    })
  }
}