~xingchuan/SewerAndRainNetwork.git

			@@ -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>
			<!-- 明细弹框 -->
			@@ -53,7 +52,7 @@
			center
			v-dialogDrag
			>
			<div class="el-dialog-div" style="height: 260px">
			<div class="el-dialog-div" style="height: 500px">
			<public-detailed-list v-bind="$attrs"></public-detailed-list>
			</div>
			</el-dialog>
			@@ -62,6 +61,7 @@

			<script>
			import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
			// import dayjs from 'dayjs'

			export default {
			name: 'ECharts',
			@@ -70,16 +70,14 @@
			},
			data () {
			return {
			value1: '',
			value2: '',
			watchData: [],
			dialogVisible: false,
			myChar: null,
			value: '',
			formInline: {
			region: '',
			timeStart: '2021-04-12 17:00:00',
			timeEnd: '2021-04-13 16:00:00'
			timeStart: '2021-04-12 10:00:00',
			timeEnd: '2021-04-13 09:00:00'
			},
			myChart: null,
			JsonHourWater: {
			@@ -137,6 +135,12 @@
			}
			},
			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()
			},
			updated () {
			this.onSubmit()
			},
			methods: {
			@@ -322,7 +326,8 @@
			grid: { // 网格
			top: '20%',
			left: '7%',
			bottom: '10%'
			bottom: '10%',
			right: '5%'
			},
			legend: {
			data: legend,
			@@ -683,9 +688,7 @@
			}
			}
			.el-dialog-div {
			//height: 50vh!important;
			overflow: auto;
			//overflow: hidden;
			}

			#echarts {