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

zhangshuaibao

2021-04-01 bbf61cf01df2752311d2fedc7c539b4e69b297f2

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


 Conflicts:

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

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

@@ -1,5 +1,5 @@
<template>
    <div id="echarts" style="width: 670px;height: 260px;" ref="main"></div>
    <div style="width:670px;height:260px;" id="echarts" ref="main"></div>
</template>

<script>
@@ -175,6 +175,9 @@

<style scoped lang="less">
  #echarts{
    width: 670px!important;
    height: 260px!important;
    //position: relative;
    margin: 0;
    padding: 0;
    border: 1px solid #396d83;