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

wangqi

2021-04-01 5f11301d71a65ecdef658618aeba6c7a2207263a

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


 Conflicts:

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

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

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,10 +1,18 @@
<template>
    <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
    <div id="Tab">
        <div class="Infomation">
            <el-tag>氮氧化物 : 29.93 标准 : 100</el-tag>
            <el-tag>二氧化硫 : 17.34 标准 : 50</el-tag>
            <el-tag>烟尘 : 6.93 标准 : 30</el-tag>
            <el-tag>废气流量 : 120343.18</el-tag>
        </div>
        <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
    </div>
</template>

<script>
export default {
  name: 'GasECharts',
  name: 'ECharts',
  methods: {
    drawChart: function () {
      const myChart = this.$echarts.init(this.$refs.main)
@@ -88,7 +96,7 @@
        xAxis: {
          type: 'category',
          boundaryGap: false,
          data: ['12:00:01', '12:00:02', '12:00:03', '12:00:04', '12:00:05', '12:00:06', '12:00:07'],
          data: ['2021.01.01', '2021.01.02', '2021.01.03', '2021.01.04', '2021.01.05', '2021.01.06', '2021.01.07'],
          axisLabel: { // x轴全部显示
            rotate: 20,
            interval: 0,
@@ -174,10 +182,22 @@
</script>

<style scoped lang="less">
    .Infomation{
        margin-left: 10px;
    }
    .el-tag{
        height: 25px;
        line-height: 25px;
        margin-right: 10px;
        font-size: 10px;
        background-color: rgba(0, 255, 246, 0.14);
        color: #00d0f9;
        border: none;
    }
  #echarts{
    margin: 0;
    padding: 0;
    border: 1px solid #396d83;
    /*margin: 10px 10px 10px 10px;*/
    margin: 10px 10px 10px 10px;
  }
</style>

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

File was deleted

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

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -5,30 +5,27 @@
        <div class="border_corner border_corner_left_bottom"></div>
        <div class="border_corner border_corner_right_bottom"></div>
        <el-tabs type="card" v-model="activeName">
            <el-tab-pane label="实试数据" name="first">
                <EchartsTab></EchartsTab>
                <GasECharts></GasECharts>
            <el-tab-pane label="实试数据" name="first"></el-tab-pane>
            <el-tab-pane label="日数据" name="second">
                <ECharts></ECharts>
            </el-tab-pane>
            <el-tab-pane label="日数据" name="second"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
            <el-tab-pane label="月数据" name="third"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
            <el-tab-pane label="人工数据" name="fourth"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
            <el-tab-pane label="月数据" name="third"></el-tab-pane>
            <el-tab-pane label="人工数据" name="fourth"></el-tab-pane>
        </el-tabs>
    </div>
</template>

<script>
import GasECharts from './GasECharts'
import EchartsTab from './EchartsTab'
import ECharts from './ECharts'

export default {
  name: 'GasTabs',
  name: 'PublicChart',
  components: {
    GasECharts,
    EchartsTab
    ECharts
  },
  data () {
    return {
      activeName: 'first'
      activeName: 'second'
    }
  },
  methods: {

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

@@ -32,6 +32,18 @@
           <el-col :span="8">内/外排口:{{ displayContentTab2.StorageDate }}</el-col>
         </el-row>
       </div>
        <div else-if="value == 'feishui'">
          <el-row type="flex" class="row-bg row-item-one" justify="space-around">
            <el-col :span="8">监测点名称:{{ displayContentTab2.StoragePlaceName }}</el-col>
            <el-col :span="8">生产单位:{{ displayContentTab2.StoragePlaceName }}</el-col>
            <el-col :span="8">排放类型加载:{{ displayContentTab2.DesignFloorArea }}</el-col>
          </el-row>
          <el-row type="flex" class="row-bg" justify="space-around">
            <el-col :span="8">排放去向:{{ displayContentTab2.StorageQty }}</el-col>
            <el-col :span="8">控制级别名称:{{ displayContentTab2.SurplusFloorArea }}</el-col>
            <el-col :span="8">内/外排口:{{ displayContentTab2.StorageDate }}</el-col>
          </el-row>
        </div>
      </div>
    </div>
  </div>

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -9,7 +9,7 @@
        <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'"></PublicTable>
          <GasTabs v-else></GasTabs>
          <PublicChart v-else></PublicChart>
        </div>
      </div>
      <div class="public-bounced-content-right">
@@ -25,14 +25,14 @@
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
import PublicChart from './GasComponents/PublicChart'

export default {
  name: 'PublicBounced',
  components: {
    GasTabs,
    PublicTabs,
    PublicTable,
    PublicChart,
    PublicVideo
  },
  data () {

 src/components/LayerController/logic/WasteWater.js

@@ -56,9 +56,10 @@
      StoragePlaceId: e.layer.options.test.StoragePlaceId
    }
    const result = await mapApi.getWasteWater(dataValue)
    // console.log(result)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setData(result)
    instance.setGasData(result, 'feishui')
    instance.$mount()
    document.body.appendChild(instance.$el)
  }