~xingchuan/SewerAndRainNetwork.git

			@@ -1,28 +1,23 @@
			<!-- 日数据 -->
			<template>
			<div id="Tab">
			<div class="animation">
			<div class="infomation">
			<ul>
			<li></li>
			</ul>
			<el-row>
			<el-col :span="6"><div class="grid-content bg-purple">氮氧化物:29.93标准:100</div></el-col>
			<el-col :span="6"><div class="grid-content bg-purple">二氧化硫:17.34标准:50</div></el-col>
			<el-col :span="6"><div class="grid-content bg-purple">烟尘:6.93 标准:30</div></el-col>
			<el-col :span="6"><div class="grid-content bg-purple">废气流量:120343.18</div></el-col>
			</el-row>
			<span class="grid-content">氮氧化物 : 29.93 标准 : 100</span>
			<span class="grid-content">二氧化硫 : 17.34 标准 : 50</span>
			<span class="grid-content">烟尘 : 6.93 标准 : 30</span>
			<span class="grid-content">废气流量 : 120343.18</span>
			</div>
			</div>
			<div class="form-echrts">
			<div class="from-search">
			<el-row type="flex">
			<el-col :span="14">
			<div class="pickerMon">
			<div class="pickerData">
			<span> 开始时间:</span>
			<span class="pickerTable"><el-date-picker
			type="datetime"
			v-model="value1">
			</el-date-picker></span>
			<span class="pickerTable">
			<el-date-picker type="datetime" v-model="value1">
			</el-date-picker>
			</span>
			</div>
			<div class="pickerData">
			<span >结束时间:</span>
			@@ -35,21 +30,24 @@
			</span>
			</div>
			</div>
			</el-col>
			<el-col :span="5">
			<div>
			采样点数:
			<input list="source" id="ipt" class="echatsInput">
			<datalist id="source">
			<input list="source" id="ipt" class="echatsInput" @change="datalistBtn">
			<datalist id="source" @click="datalistBtn">
			<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>
			<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"
			@@ -57,16 +55,10 @@
			center
			v-dialogDrag
			>
			<div class="el-dialog-div">
			<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 style="width:5rem;height:2rem;" id="echarts" ref="main">
			</div>
			</div>
			</div>
			</template>

			@@ -282,12 +274,7 @@
			data: data[k]
			})
			}
			// --------------------------
			var arr = []
			for (var x = 0; x < dataWatch.length; x++) {
			arr.push(dataWatch[x].MonTimeStr)
			}
			console.log(arr)
			console.log(series)
			const opitons = this.initOptions(dateDate, series)
			this.myChart = this.$echarts.init(this.$refs.main)
			this.myChart.setOption(opitons)
			@@ -297,6 +284,29 @@
			</script>

			<style scoped lang="less">
			//.animation{
			// padding: 0 1rem;
			// overflow: hidden;
			// //width: 1rem;
			// .infomation{
			// display: flex;
			// //margin: 0 1rem;
			// overflow: hidden;
			// animation: move 1s linear 0s infinite;
			// @keyframes move {
			// 0% {
			// }
			// 100% {
			// transform: translateX(-10%);
			// }
			// }
			// /* 鼠标经过marquee 就停止动画 */
			// &:hover {
			// //z-index: 9999999;
			// animation-play-state: paused;
			// }
			// }
			//}
			.grid-content{
			font-size: 8px!important;
			background-color:#2e4967;
			@@ -304,39 +314,40 @@
			margin: 0 2px 4px 2px;
			border-radius: 2px;
			}
			.animation {
			//width: 600px;
			//height: 0.06rem;
			.Infomation {
			margin-left: 10px;
			}

			.el-tag {
			height: 25px;
			width: 140px;
			line-height: 25px;
			margin-right: 10px;
			font-size: 10px;
			background-color: rgba(0, 255, 246, 0.14);
			color: #00d0f9;
			border: none;
			padding: 0 15px;
			}

			.form-echrts {
			width: 100%;
			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{
			font-size: 0px;
			.el-input__prefix{
			width: 100%;
			}
			}
			/deep/.el-input__icon {
			width: 0.9rem;
			width: 100%;
			font-size: 0;
			}
			}
			@@ -351,7 +362,8 @@
			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;
			@@ -361,7 +373,11 @@
			background-color: #2e4967;
			border: none;
			border-radius: 6px;
			width: 40px;
			width: 80px;
			height: 22px;
			}
			input::-webkit-calendar-picker-indicator {
			opacity: 100;
			}
			.detailbtn{
			background-color:#2e4967;