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

yangdelong

2021-04-07 e8692ebf024715c922ca0e10f90dc3a1219862b0

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

@@ -11,6 +11,7 @@
          <el-button size="mini" round @click="dialogVisible = true">明细表</el-button>
          <el-dialog  :visible.sync="dialogVisible"
                      :append-to-body="true"
                   :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
                      width="68%"
                      center
                      v-dialogDrag
@@ -20,7 +21,7 @@
            </div>
          </el-dialog>
        </div>
        <div style="width:750px;height:260px;" id="echarts" ref="main">
      <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
        </div>
      </div>
    </div>
@@ -28,6 +29,7 @@

<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'

export default {
  name: 'ECharts',
  components: {
@@ -203,13 +205,15 @@
    }
  },
  mounted () {
    this.$nextTick(() => {
    this.drawChart()
    const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
    console.log(dataWatch)
      // console.log(dataWatch)
    for (var i = 0; i < dataWatch.length; i++) {
      this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
    }
    console.log(this.dataDate)
      // console.log(this.dataDate)
    })
  }
}
</script>
@@ -217,6 +221,7 @@
<style scoped lang="less">
    .Infomation {
        margin-left: 10px;
  height: 0.2rem;
    }

    .el-tag {
@@ -229,19 +234,22 @@
        border: none;
        padding: 0 15px;
    }

    .form-echrts{
      width: 100%;
      height: 100%;
      border: 1px solid #396d83;
  height: 1rem;
  border-top: 1px solid #396d83;
      //margin: 10px 10px 10px 10px;
      .el-dialog-div{
        //height: 50vh!important;
        overflow: auto;
        //overflow: hidden;
      }

      #echarts {
        margin: 0;
        padding: 0;
    //height: 3rem;
        //border: 1px solid #396d83;
        //margin: 10px 10px 10px 10px;
    }