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

zhangshuaibao

2021-04-13 dc109551277dd40494a03a84e8a0bb8b9073e38c

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


 Conflicts:

	src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue

 public/assets/imgs/legend/NOX.png

 public/assets/imgs/legend/SO2.png

 public/assets/imgs/legend/VOCs.png

 public/assets/imgs/legend/WenDu.png

 public/assets/imgs/legend/YanChen.png

 public/assets/imgs/legend/blue.png

 public/assets/imgs/legend/cqj.png

 public/assets/imgs/legend/cyj.png

 public/assets/imgs/legend/gray.png

 public/assets/imgs/legend/green.png

 public/assets/imgs/legend/green_airquality.png

 public/assets/imgs/legend/green_airquality_2.png

 public/assets/imgs/legend/green_airquality_3.png

 public/assets/imgs/legend/grn.png

 public/assets/imgs/legend/gwtl.png

 public/assets/imgs/legend/gwtl2.png

 public/assets/imgs/legend/gwtl3.png

 public/assets/imgs/legend/gwtl4.png

 public/assets/imgs/legend/image12.gif

 public/assets/imgs/legend/image15.gif

 public/assets/imgs/legend/image9.gif

 public/assets/imgs/legend/marker_p_1.png

 public/assets/imgs/legend/marker_p_2.png

 public/assets/imgs/legend/orange.png

 public/assets/imgs/legend/orange_airquality.png

 public/assets/imgs/legend/purple.png

 public/assets/imgs/legend/red.png

 public/assets/imgs/legend/red_airquality.png

 public/assets/imgs/legend/yellow.png

 public/assets/imgs/legend/yellow_airquality.png

 public/assets/imgs/legend/zlj.png

 public/assets/imgs/legend/zongdan.png

 public/assets/imgs/legend/zsj.png

 src/api/mapApi.js

@@ -40,6 +40,10 @@
  getWasteGasMonData (data) {
    return axios.get(mapUrl.getWasteGasMonData, data)
  },
  // 废气人工数据
  getWasteGasManualData (data) {
    return axios.get(mapUrl.getWasteGasManualData, data)
  },
  // 废水点
  getWasteWater (data) {
    return axios.get(mapUrl.getWasteWater, data)

 src/api/mapUrl.js

@@ -14,6 +14,7 @@
export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
export const DataItems = $HOST + '/wasteWater/RTDB/DataItems'
export const getWasteGasMonData = $HOST + '/wasteGas/QueryOnlineMonData'
export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'

export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 废水点信息
export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 废水监测数据

 src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue

New file
@@ -0,0 +1,140 @@
<template>
<!--  <el-table :data="tableData" style="width:730px" height="200px">-->
<!--    <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
<!--                     :label="item.label">-->
<!--       <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <el-table
      :data="tableData"
      style="width: 100%;height: 100%">
    <el-table-column
        prop="tableData.LabMonTime"
        label="检测时间">
    </el-table-column>
    <el-table-column
        label="氮氧化物">
      <el-table-column
          prop="tableData.MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="二氧化硫">
      <el-table-column
          prop="tableData.MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="烟尘">
      <el-table-column
          prop="tableData.MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="黑度">
      <el-table-column
          prop="tableData.MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
  </el-table>
</template>

<script>
export default {
  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: []
    }
  },
  created () {
    this.$nextTick(() => {
      this.$attrs.ManualData.forEach(item => {
        this.tableData = [...item]
      })
      this.tableData.LabMonTime = 100
      console.log(this.tableData)
    })
  }
}

</script>

<style scoped>

</style>

 src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue

@@ -8,7 +8,7 @@
            <li @click='tabTaggle("ECharts")'>实时数据</li>
            <li @click='tabTaggle("EChartsHour")'>小时数据</li>
            <li @click='tabTaggle("EChartsDate")'>日数据</li>
            <li @click='tabTaggle("EChartsDate")'>人工数据</li>
            <li @click='tabTaggle("EChartsTable")'>人工数据</li>
        </ul>
        <ul class="tab" v-else>
            <li @click='tabTaggle("EChartsRealWasteWater")'>实时数据</li>
@@ -29,9 +29,11 @@
</template>

<script>
  import ECharts from './Echarts'
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
import ECharts from './Echarts'
import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'

import EChartsRealWasteWater from './EChartsRealWasteWater'
import EChartsHourWasteWater from './EChartsHourWasteWater'
import EChartsDateWasteWater from './EChartsDateWasteWater'
@@ -42,9 +44,11 @@
    EChartsHour,
    EChartsDate,
    ECharts,
    EChartsTable,
    EChartsHourWasteWater,
    EChartsDateWasteWater,
    EChartsRealWasteWater

  },
  data () {
    return {

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -15,6 +15,7 @@
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
@@ -54,7 +55,8 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getQueryOnlineMonData: []
      getQueryOnlineMonData: [],
      ManualData: []
      // getGasQueryOnlineMonData: []
    }
  },
@@ -79,10 +81,11 @@
      this.flag = true
      this.value = value
    },
    setGasData (data, dataDetails, GasHourData, value) {
    setGasData (data, dataDetails, GasHourData, ManualData, value) {
      this.setWasteGasdata = data
      this.getWasteGasDetails = dataDetails
      this.getQueryOnlineMonData = GasHourData
      this.ManualData = ManualData
      console.log(this.getQueryOnlineMonData)
      this.displayContentTitle = data.Name
      this.flag = true

 src/components/LayerController/logic/WasteGas.js

@@ -68,13 +68,21 @@
      endTime: '2020-04-07 15:13:20',
      dataType: '1'
    }
    const GasManualData = {
      companyId: '3900100145',
      labMonPointId: '219',
      beginTime: '2020-04-06 15:13:20',
      endTime: ' 2020-04-07 15:13:20'
    }
    const ManualData = await mapApi.getWasteGasManualData(GasManualData)
    console.log(ManualData)
    const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
    console.log(Mondata)
    // console.log(Mondata)
    const result = await mapApi.getWasteGasDetails(dataValue)
    // console.log(result.Result.DataInfo)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, 'feiqi')
    instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
    // console.log(e.layer.options.test)
    instance.$mount()
    document.body.appendChild(instance.$el)