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

chenyabin

2021-05-14 de32f49313e2c7534009758193c41be61517f1d5

 src/components/BaseNav/WasteWater/WasteWaterDayChart.vue

@@ -1,25 +1,34 @@
<template>
  <div class="echarts-box">
    <div class="tab-scroll">
      <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
    <div class="echarts-box">
        <div class="tab-scroll">
            <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
            <span class="time-select">{{ formData.timeStart }}日—{{ formData.timeEnd }}日</span>
        </div>
        <div class="echarts-form">
            <span class="demonstration">开始时间：</span>
            <el-date-picker
                    v-model="formData.timeStart"
                    value-format="yyyy-MM-dd"
                    type="datetime">
            </el-date-picker>
            <span class="demonstration">结束时间：</span>
            <el-date-picker
                    v-model="formData.timeEnd"
                    value-format="yyyy-MM-dd"
                    type="datetime">
            </el-date-picker>
            <span class="demonstration">采样点数：</span>
            <el-select v-model="formData.region" placeholder="请选择" style="width: 80px">
                <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item"
                           :value="item"></el-option>
            </el-select>
            <el-button @click="querySearch()">查询</el-button>
            <el-button>明细表</el-button>
        </div>
        <div class="echarts-chart">
            <div style="width:5rem;height:1.5rem;" ref="echartsDay"></div>
        </div>
    </div>
    <div class="echarts-form">
      <span class="demonstration">开始时间：</span>
      <el-date-picker v-model="formData.timeStart" value-format="yyyy-MM-dd" type="datetime" size="mini"></el-date-picker>
      <span class="demonstration">结束时间：</span>
      <el-date-picker v-model="formData.timeEnd" value-format="yyyy-MM-dd" type="datetime" size="mini"></el-date-picker>
      <span class="demonstration">采样点数：</span>
      <el-select v-model="formData.region" placeholder="请选择" size="mini">
        <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
      </el-select>
      <el-button @click="querySearch()">查询</el-button>
      <el-button>明细表</el-button>
    </div>
    <div class="echarts-chart">
      <div ref="echartsDay"></div>
    </div>
    <span class="time-select">{{ formData.timeStart }}日—{{ formData.timeEnd }}日</span>
  </div>
</template>

<script>
@@ -96,7 +105,7 @@
  },
  methods: {
    querySearch () {

      this.draw24Chart()
    },
    async draw24Chart () {
      const data = {
@@ -381,8 +390,8 @@
      }
      const option = {
        /*  title: {
          text: title,
      }, */
            text: title,
        }, */
        tooltip: { // 提示框
          trigger: 'axis',
          axisPointer: {