派生自 wuyushui/SewerAndRainNetwork

zhangshuaibao
2021-04-14 399aa27e68dae5c26ba739cf7d72dadeb3f5a6fa
修改人工数据
6个文件已修改
370 ■■■■ 已修改文件
src/components/BaseNav/PublicBounced/PublicBounced.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue 328 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/LayerController/logic/WasteWater.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -83,12 +83,10 @@
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
    setWaterData (dataWater, detailData, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getQueryOnlineMonData = hourData
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.getWasteWaterMonitoringDetails = detailData
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -77,8 +77,8 @@
      formInline: {
        user: '',
        region: '',
        timeStart: '2021-03-14 00:00:00',
        timeEnd: '2021-04-12 00:00:00'
        timeStart: '2021-03-15 00:00:00',
        timeEnd: '2021-04-13 00:00:00'
      },
      JsonDateWater: {
        datatype: 1,
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -62,7 +62,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
// import dayjs from 'dayjs'
export default {
  name: 'ECharts',
@@ -79,8 +79,8 @@
      value: '',
      formInline: {
        region: '',
        timeStart: '2021-04-12 17:00:00',
        timeEnd: '2021-04-13 16:00:00'
        timeStart: '2021-04-12 10:00:00',
        timeEnd: '2021-04-13 09:00:00'
      },
      myChart: null,
      JsonHourWater: {
@@ -138,8 +138,8 @@
    }
  },
  mounted () {
    this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
    // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    // this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
    this.onSubmit()
  },
  updated () {
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -249,16 +249,18 @@
    }
  },
  mounted () {
    // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    // this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
    // this.DrawEXHRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
    this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
    // console.log(this.formInline.timeStart)
    console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
    this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
  },
  methods: {
    onSubmit () {
      this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
    },
    DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
      this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
      this.RealTimeChart = this.$echarts.init(this.$refs.main)
      var serLists = []
      for (var i = 0; i < ydatas.length; i++) {
        // var zdcbcolor = ydatas[i].zdcbcolor
@@ -489,7 +491,7 @@
          }
        }, {
          type: 'value',
          name: '流量(m³/h)',
          name: '流量(m³/d)',
          axisLabel: {
            formatter: '{value}',
            textStyle: {
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -6,58 +6,116 @@
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <div style="width: 766px">
  <el-table
      :data="tableData"
      max-height="260px"
      style="width: 100%;height: 100%">
    <el-table-column
        prop="tableData.LabMonTime"
        prop="date"
        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 +123,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)
    // })
  }
}
src/components/LayerController/logic/WasteWater.js
@@ -71,15 +71,13 @@
      endTime: '2020-04-07',
      dataType: '1'
    }
    const hourData = await mapApi.getQueryOnlineMonData(hourValue)
    const dateData = await mapApi.getQueryOnlineMonData(dateValue)
    // console.log(dateData)
    const detailData = await mapApi.getWasteWaterMonitoringDetails(dataValue) // 明细表返回数据
    const hourData = await mapApi.getQueryOnlineMonData(hourValue) // 小时数据
    const dateData = await mapApi.getQueryOnlineMonData(dateValue) // 日数据
    // const drawback = await mapApi.getWasteWaterMonitoring()
    // console.log(drawback)
    const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
    instance.setWaterData(e.layer.options.test, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
    // console.log(e.layer.options.test)
    instance.$mount()
    document.body.appendChild(instance.$el)