~xingchuan/SewerAndRainNetwork.git

			@@ -12,59 +12,54 @@
			</div>
			<div class="form-echrts">
			<div class="from-search">
			<el-row type="flex">
			<el-col :span="14">
			<div class="pickerMon">
			<div class="pickerMon">
			<div class="pickerData">
			<span> 开始时间:</span>
			<span class="pickerTable"><el-date-picker
			type="datetime"
			v-model="value1">
			</el-date-picker></span>
			<span> 开始时间:</span>
			<span class="pickerTable">
			<el-date-picker type="datetime" v-model="value1">
			</el-date-picker>
			</span>
			</div>
			<div class="pickerData">
			<span >结束时间:</span>
			<span class="pickerTable">
			<span >结束时间:</span>
			<span class="pickerTable">
			<el-date-picker
			type="datetime"
			v-model="value2"
			type="datetime"
			v-model="value2"
			>
			</el-date-picker>
			</span>
			</div>
			</div>
			</el-col>
			<el-col :span="5">
			采样点数:
			<input list="source" id="ipt" class="echatsInput">
			<datalist id="source">
			<option value="0" />
			<option value="25" />
			<option value="50" />
			<option value="75" />
			<option value="100" />
			</datalist>
			</el-col>
			<el-col class="detailbtn" :span="2" @click="onSubmit">查询</el-col>
			<el-col :span="3">
			<div class="detailbtn" @click="dialogVisible = true" >明细表</div>
			<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
			>
			<div class="el-dialog-div" style="height: 500px">
			<public-detailed-list v-bind="$attrs"></public-detailed-list>
			</div>
			</el-dialog>
			</el-col>
			</el-row>
			</div>
			</div>
			<div>
			采样点数:
			<input list="source" id="ipt" class="echatsInput">
			<datalist id="source">
			<option value="0" />
			<option value="25" />
			<option value="50" />
			<option value="75" />
			<option value="100" />
			</datalist>
			</div>
			<div class="detailbtn" @click="onSubmit">查询</div>
			<div class="detailbtn" @click="dialogVisible = true" >明细表</div>
			</div>
			<div style="width:5rem;height:2rem;" id="echarts" ref="main">
			</div>
			</div>
			<!-- 明细弹框 -->
			<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
			>
			<div class="el-dialog-div" style="height: 500px">
			<public-detailed-list v-bind="$attrs"></public-detailed-list>
			</div>
			</el-dialog>
			</div>
			</template>

			@@ -317,19 +312,25 @@
			border-top: 1px solid #396d83;
			//margin: 10px 10px 10px 10px;
			.from-search{
			margin-top: 6px;
			display: flex;
			padding:5px;
			>div{margin-left: 10px}
			.pickerMon{
			display: flex;
			>div:first-child{
			margin-right: 10px;
			}
			.pickerData{
			flex: 1;
			display: flex;
			>span{line-height: 22px}
			.pickerTable{
			margin-left: 6px;
			width: 40px;

			/deep/.el-input__prefix{
			}
			/deep/.el-input__icon {
			width: 0.9rem;
			font-size: 0;
			font-size: 0;
			width: 100%;
			}
			}
			}
			@@ -339,11 +340,10 @@
			}
			/deep/.el-input__inner{
			position: relative;
			width: 0.9rem!important;
			height: 0.125rem!important;
			background-color: #2e4967;
			color: #ffffff;
			font-size: 8px;
			font-size: 12px;
			height: 24px;
			padding: 0;
			//padding-left:20px ;
			//padding: 0!important;
			@@ -353,7 +353,8 @@
			background-color: #2e4967;
			border: none;
			border-radius: 6px;
			width: 40px;
			width: 80px;
			height: 22px;
			}
			.detailbtn{
			background-color:#2e4967;
			@@ -361,7 +362,6 @@
			padding: 0 7px;
			line-height: 20px;
			border-radius: 4px;
			margin-right: 6px;
			}
			}
			.el-dialog-div {