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

wangqi

2021-04-16 b0cb4ea7d287fffe598b42f189e6d6e6f06f3d40

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

@@ -27,22 +27,11 @@
                      </span>
                    </div>
                </div>
<!--                <div>-->
<!--                    采样点数:-->
<!--                    <el-select v-model="formInline.region">-->
<!--                        <el-option label="0" value="0"></el-option>-->
<!--                        <el-option label="25" value="25"></el-option>-->
<!--                        <el-option label="50" value="50"></el-option>-->
<!--                        <el-option label="75" value="75"></el-option>-->
<!--                        <el-option label="100" value="100"></el-option>-->
<!--                    </el-select>-->
<!--                </div>-->
                <div class="detailbtn"  @click="onSubmit">查询</div>
                <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 +60,6 @@
  },
  data () {
    return {
      value1: '',
      value2: '',
      watchData: [],
      dialogVisible: false,
      myChar: null,
@@ -138,6 +125,7 @@
    }
  },
  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()
@@ -296,12 +284,12 @@
            var seriesName = params[i].seriesName
            // 值
            var value = params[i].value
            var valueFliter
            if (value === 'NaN') {
              valueFliter = ''
            } else {
              // valueFliter = formatter(value)
            }
            // var valueFliter
            // if (value === 'NaN') {
            //   valueFliter = ''
            // } else {
            //   // valueFliter = formatter(value)
            // }
            var maker = params[i].marker
            if (seriesName === 'COD') {
              maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -314,7 +302,7 @@
            } else {
              maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
            }
            s += maker + seriesName + ':' + valueFliter + '<br />'
            s += maker + seriesName + ':' + value + '<br />'
          }
          return s
        }
@@ -652,6 +640,7 @@
            padding: 0;
            border-color:#00fff6;
            text-align: center;
            z-index: 9999;
            //padding-left:20px ;
            //padding: 0!important;
        }