Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-19 c7a549da66df42d4ec5c78ddf2cc138772616941

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue

@@ -1,14 +1,7 @@
<!--  小时数据  -->
<template>
    <div id="Tab">
        <div class="infomation">
          <div>
            <span class="grid-content">氮氧化物 :<i style="color: #e8ee0b">29.93</i>  标准 : 100</span>
            <span class="grid-content">二氧化硫 : <i style="color: #e8ee0b">17.34</i> 标准 : 50</span>
            <span class="grid-content">烟尘 : <i style="color: #e8ee0b">6.93</i> 标准 : 30</span>
            <span class="grid-content">废气流量 : <i style="color: #e8ee0b">120343.18</i></span>
          </div>
        </div>
      <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
        <div class="form-echrts">
            <div class="from-search">
                <div class="pickerMon">
@@ -48,9 +41,11 @@
// import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
  name: 'ECharts',
  components: {
    PublicDataStandard,
    PublicDetailedList
  },
  data () {
@@ -64,6 +59,23 @@
        timeEnd: null
      },
      myChart: null,
      dataStandard: [{
        current: { name: '氮氧化物1', val: 29.93 },
        standard: { name: '标准', val: 100 }
      },
      {
        current: { name: '二氧化硫', val: 17.34 },
        standard: { name: '标准', val: 50 }
      },
      {
        current: { name: '烟尘', val: 6.93 },
        standard: { name: '标准', val: 30 }
      },
      {
        current: { name: '废气流量', val: 120343.18 },
        standard: { name: '', val: null }
      }
      ],
      JsonCtarts: {
        id: 'mychart',
        title: '加热炉烟气',
@@ -926,21 +938,6 @@
</script>

<style scoped lang="less">
    .animation {
        .infomation {
            padding: 0.02rem 0.04rem;
            .grid-content {
                font-size: 0.08rem;
                background-color: #2e4967;
                text-align: center;
                border-radius: 0.01rem;
                height: 0.15rem;
                line-height: 0.15rem;
                margin-right: 0.04rem;
                padding:0 0.04rem
            }
        }
    }
    .form-echrts {
        width: 100%;
        border-top: 1px solid #396d83;