派生自 wuyushui/SewerAndRainNetwork

chenzeping
2021-04-07 cb59b61953181889c6b1479a75c23de9e061d788
Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

 Conflicts:
 src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
1个文件已添加
3个文件已修改
29 ■■■■ 已修改文件
public/assets/images/map/exhaust/fq_green_new.png 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/LayerController/logic/WasteGas.js 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/images/map/exhaust/fq_green_new.png
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -7,7 +7,6 @@
      <el-tag>废气流量 : 120343.18</el-tag>
    </div>
    <div class="form-echrts">
      <!--          :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName"-->
      <div>
        <el-button size="mini" round @click="dialogVisible = true">明细表</el-button>
        <el-dialog :visible.sync="dialogVisible"
@@ -29,7 +28,6 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
export default {
  name: 'ECharts',
  components: {
@@ -231,7 +229,6 @@
  border: none;
  padding: 0 15px;
}
.form-echrts {
  width: 100%;
  height: 100%;
@@ -242,7 +239,6 @@
    overflow: auto;
    //overflow: hidden;
  }
  #echarts {
    margin: 0;
    padding: 0;
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,12 +37,15 @@
    }
  },
  mounted () {
    if (this.$attrs.getWasteGasDetails) {
    this.tableData = this.$attrs.getWasteGasDetails
    // console.log(this.$attrs.getWasteGasDetails)
      console.log(this.$attrs.getWasteGasDetails)
    } else if (this.$attrs.getWasteWaterMonitoringDetails) {
    this.tableData = this.$attrs.getWasteWaterMonitoringDetails
    console.log(this.$attrs.getWasteWaterMonitoringDetails)
  }
}
}
</script>
src/components/LayerController/logic/WasteGas.js
@@ -5,10 +5,10 @@
// const AjaxUtils = require('../../../utils/AjaxUtils').default
// 区分不同类型 使用不同img
const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
const ImagGreen = '/assets/images/map/exhaust/fq_green.png'
const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
// const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
// const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
const ImagGreen = '/assets/images/map/exhaust/fq_green_new.png'
// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
@@ -66,15 +66,17 @@
  // 不同类型图片加载
  this.differentTypes = (ContrLevel) => {
    var effectOfChange
    /*
    if (ContrLevel === 1) {
      effectOfChange = ImgBlue
    } else if (ContrLevel === 2) {
    */
      effectOfChange = ImagGreen
    } else if (ContrLevel === 3) {
      effectOfChange = ImagBright
    } else {
      effectOfChange = ImgGray
    }
    // } else if (ContrLevel === 3) {
    //   effectOfChange = ImagBright
    // } else {
    //   effectOfChange = ImgGray
    // }
    return effectOfChange
  }
  this.setPanTo = (pos, value) => {