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

chenzeping

2021-04-13 200d3045c0c285c7916d58589e3b810979da7f16

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

 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>
        <div class="legend" >
            <span >正常</span>
@@ -28,6 +28,7 @@
import ECharts from './Echarts'
// import EChartsDate from './EChartsDate'
import EChartsHourWasteWater from './EChartsHourWasteWater'
import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'

export default {
  name: 'PublicChart',
@@ -36,7 +37,8 @@
    EChartsDate,
    ECharts,
    // EChartsDate
    EChartsHourWasteWater
    EChartsHourWasteWater,
    EChartsTable
  },
  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)

 src/components/LayerController/service/LayerFactory.js

@@ -21,6 +21,43 @@

        var checked = config.checked
        checked && this.load(config)
        checked && this.toggleZoomByConfnig(config)
      }
    }
  }

  /**
   * 控制显示的级别
   * @param layerConfig
   */
  initEvent (layerConfig) {
    this.map.on('zoomend ', (e) => this.toggleZoomByLayer(layerConfig))
  }

  toggleZoomByLayer (layerConfig) {
    var config = layerConfig
    if (Array.isArray(layerConfig)) {
      for (var i = 0, l = layerConfig.length; i < l; i++) {
        config = layerConfig[i]
        var layers = config.layers
        var childLayer = config.childLayer
        layers && this.toggleZoomByLayer(layers)
        childLayer && this.toggleZoomByLayer(childLayer)
        this.toggleZoomByConfnig(config)
      }
    } else {
      this.toggleZoomByConfnig(layerConfig)
    }
  }

  toggleZoomByConfnig (config) {
    const zoom = this.map.getZoom()
    var checked = config.checked
    if (checked && config.minZoom) {
      if (zoom > config.minZoom) {
        this.show(config)
      } else {
        this.hide(config)
      }
    }
  }
@@ -91,9 +128,9 @@
        this.setZIndex(layer.getLayers())
      } else {
        if (layer.feature && (layer.feature.geometry.type === 'LineString' || layer.feature.geometry.type === 'MultiLineString')) {
          layer.bringToBack()
          layer.bringToBack && layer.bringToBack()
        } else {
          layer.bringToFront()
          layer.bringToFront && layer.bringToFront()
        }
      }
    }

 src/conf/layers/LayerArea.js

@@ -13,24 +13,21 @@
      name: '公司',
      sname: '公司', // 表名
      checked: true, // 默认选中状态
      url: WFS_URL + '?TYPENAME=公司',
      minZoom: 10
      url: WFS_URL + '?TYPENAME=公司'
    },
    {
      code: 'sewersAreaMt',
      name: '码头',
      sname: '码头',
      checked: true, // 默认选中状态
      wfs: WFS_URL + '?TYPENAME=码头',
      minZoom: 10
      wfs: WFS_URL + '?TYPENAME=码头'
    },
    {
      code: 'sewersAreaZz',
      name: '装置区',
      sname: '装置区',
      checked: true, // 默认选中状态
      wfs: WFS_URL + '?TYPENAME=装置区',
      minZoom: 10
      wfs: WFS_URL + '?TYPENAME=装置区'
    }
  ]
}

 src/conf/layers/LayerBasin.js

@@ -14,32 +14,28 @@
      name: '长江流域',
      sname: '长江流域', // 表名
      checked: true, // 默认选中状态
      url: WFS_URL + '?TYPENAME=公司',
      minZoom: 10
      url: WFS_URL + '?TYPENAME=公司'
    },
    {
      code: 'basinHh',
      name: '黄河流域',
      sname: '黄河流域',
      checked: true, // 默认选中状态
      wfs: WFS_URL + '?TYPENAME=码头',
      minZoom: 10
      wfs: WFS_URL + '?TYPENAME=码头'
    },
    {
      code: 'basinBh',
      name: '渤海流域',
      sname: '渤海流域',
      checked: true, // 默认选中状态
      wfs: WFS_URL + '?TYPENAME=装置区',
      minZoom: 10
      wfs: WFS_URL + '?TYPENAME=装置区'
    },
    {
      code: 'basinQt',
      name: '其他',
      sname: '其他',
      checked: true, // 默认选中状态
      wfs: WFS_URL + '?TYPENAME=装置区',
      minZoom: 10
      wfs: WFS_URL + '?TYPENAME=装置区'
    }
  ]
}

 src/conf/layers/LayerFsss.js

@@ -2,18 +2,26 @@
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
export const LayerFsss = {
  code: 'sewersFsss',
  name: '附属设施',
  checked: false, // 默认选中状态
  layers: [
    {
      code: 'pipeSection',
      name: '管段',
      sname: '管段',
      checked: false,
      minZoom: 15,
      wfs: WFS_URL + '?TYPENAME=管段'
    },
    {
      code: 'fourlink',
      name: '四通',
      sname: '四通',
      checked: true,
      minZoom: 10,
      minZoom: 15,
      wfs: WFS_URL + '?TYPENAME=四通',
      icon: 'sewers/四通.png'
    },
@@ -22,7 +30,7 @@
      name: '三通',
      sname: '三通',
      checked: false,
      minZoom: 10,
      minZoom: 15,
      wfs: WFS_URL + '?TYPENAME=三通',
      icon: 'sewers/三通.png'
    },

 src/conf/layers/LayerHbss.js

@@ -2,7 +2,7 @@
 * 区域
 */
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
export const LayerHbss = {
  code: 'sewersHbss',
  name: '环保设施',

 src/conf/layers/LayerPipeLines.js

@@ -5,7 +5,7 @@
import { LayerFsss } from './LayerFsss'

const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'

export const LayerPipeLines = {
  code: 'sewersPipeLines',

 src/conf/layers/LayerSewers.js

@@ -1,3 +1,8 @@
/**
 * todo 准备删除此文件！！！！
 * @type {string}
 */

const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
export const LayerSewersPoint = [
  {

 src/views/MapTemplate.vue

@@ -91,7 +91,7 @@
        map: this.map
      })
      layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
      layerFactory.init(this.$store.state.map.serviceLayers.layerSewersPoint)
      layerFactory.initEvent(this.$store.state.map.serviceLayers.LayerSewersLine)
      window.layerFactory = layerFactory

      this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 初始化基础底图助手