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

徐旺旺

2021-04-15 43338db5959f96740b5bc0d81a0a13011f9584c8

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

@@ -27,16 +27,6 @@
            </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>
@@ -75,10 +65,8 @@
      myChar: null,
      value: '',
      formInline: {
        user: '',
        region: '',
        timeStart: '2021-03-14 00:00:00',
        timeEnd: '2021-04-12 00:00:00'
        timeStart: '2021-03-15 00:00:00',
        timeEnd: '2021-04-13 00:00:00'
      },
      JsonDateWater: {
        datatype: 1,
@@ -287,12 +275,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>'
@@ -305,7 +293,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
              }
@@ -319,7 +307,7 @@
            grid: { // 网格
              top: '20%',
              left: '7%',
              bottom: '10%',
              bottom: '11%',
              right: '5%'
            },
            legend: {
@@ -661,6 +649,7 @@
      padding: 0;
      border-color:#00fff6;
      text-align: center;
      z-index: 9999;
      //padding-left:20px ;
      //padding: 0!important;
    }