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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

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

@@ -41,8 +41,7 @@
                <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
             </div>
            <div class="boxChart">
                <div style="width: 5rem;height:1.5rem;" id="popChart" ref="main">
                </div>
                <div style="width: 5rem;height:1.5rem;" id="echarts" ref="main"></div>
            </div>
        </div>
        <!-- 明细弹框 -->
@@ -71,8 +70,6 @@
  },
  data () {
    return {
      value1: '',
      value2: '',
      watchData: [],
      dialogVisible: false,
      myChar: null,
@@ -138,9 +135,10 @@
    }
  },
  mounted () {
    this.onSubmit()
    // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    // this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
    this.onSubmit()
    // this.onSubmit()
  },
  updated () {
    this.onSubmit()