From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 310 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 227 insertions(+), 83 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 27d814e..03d5345 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -2,64 +2,120 @@
<template>
<div id="Tab">
<div class="infomation">
- <el-tag>姘哀鍖栫墿:29.93 鏍囧噯:100</el-tag>
- <el-tag>浜屾哀鍖栫～:17.34 鏍囧噯:50</el-tag>
- <el-tag>鐑熷皹:6.93 鏍囧噯:30</el-tag>
- <el-tag>搴熸皵娴侀噺:120343.18</el-tag>
+<!-- <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>-->
+<!-- <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>-->
+<!-- <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>-->
+<!-- <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>-->
+ <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-col :span="6"><div class="grid-content bg-purple"></div></el-col>-->
+ </el-row>
</div>
<div class="form-echrts">
+ <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
<div class="from-search">
- <el-form :inline="true" :model="formInline" class="demo-form-inline">
- <el-date-picker
- class="date"
- v-model="value"
- type="datetimerange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
- <el-form-item label="閲囨牱鐐规暟" class="text-size">
- <el-select v-model="formInline.region" placeholder="0">
- <el-option label="0" value="shanghai"></el-option>
- <el-option label="25" value="beijing"></el-option>
- <el-option label="50" value="beijing"></el-option>
- <el-option label="75" value="beijing"></el-option>
- <el-option label="100" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
- </el-form-item>
- <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
- >
- <div class="el-dialog-div" style="height: 500px">
- <public-detailed-list v-bind="$attrs"></public-detailed-list>
- </div>
- </el-dialog>
- </el-form>
+<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">-->
+<!-- <el-form-item label="瀹℃壒浜�">-->
+<!-- <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <div class="block">-->
+<!-- <el-date-picker-->
+<!-- size="'mini"-->
+<!-- class="date"-->
+<!-- v-model="value"-->
+<!-- type="datetimerange"-->
+<!-- range-separator="鑷�"-->
+<!-- start-placeholder="寮�濮嬫棩鏈�"-->
+<!-- end-placeholder="缁撴潫鏃ユ湡">-->
+<!-- </el-date-picker>-->
+<!-- </div>-->
+<!-- <el-form-item label="閲囨牱鐐规暟" class="text-size">-->
+<!-- <el-select v-model="formInline.region" placeholder="0">-->
+<!-- <el-option label="0" value="shanghai"></el-option>-->
+<!-- <el-option label="25" value="beijing"></el-option>-->
+<!-- <el-option label="50" value="beijing"></el-option>-->
+<!-- <el-option label="75" value="beijing"></el-option>-->
+<!-- <el-option label="100" value="beijing"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
+<!-- </el-form-item>-->
+
+<!-- </el-form>-->
+ <div class="layoutFrom">
+ <div class="pickerMon">
+ <div class="pickerData pickerDataLeft">
+ <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">
+ <el-date-picker
+ type="datetime"
+ v-model="value2"
+ >
+ </el-date-picker>
+ </span>
+ </div>
+ </div>
+ <div class="sampling">
+ <span>
+ 閲囨牱鐐规暟:
+ </span>
+ <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="InquiryBtn">
+ <div>鏌ヨ</div>
+ </div>
+ <div class="detailBox">
+ <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>
+ </div>
+ </div>
</div>
- <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
+ <div style="width:5rem;height:2rem;" id="echarts" ref="main">
</div>
</div>
</div>
</template>
<script>
-// import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
export default {
name: 'ECharts',
components: {
- // PublicDetailedList
+ PublicDetailedList
},
data () {
return {
+ value1: '',
+ value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
@@ -126,7 +182,7 @@
},
grid: {
left: '3%',
- right: '6%',
+ right: '3%',
bottom: '3%',
containLabel: true
},
@@ -253,10 +309,30 @@
return options
}
},
+ // methods: {
+ // // onSubmit () {
+ // // console.log('submit!')
+ // // },
+ // drawChart: function () {
+ // const myChart = this.$echarts.init(this.$refs.main)
+ // myChart.setOption(this.options)
+ // window.onresize = function () {
+ // var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ // if (h1 > 700) {
+ // myChart.getDom().style.height = 3 + 'rem'
+ // myChart.getDom().style.width = 6 + 'rem'
+ // } else {
+ // myChart.getDom().style.height = 3 + 'rem'
+ // myChart.getDom().style.width = 6 + 'rem'
+ // }
+ // myChart.resize()
+ // }
+ // }
+ // },
mounted () {
this.$nextTick(() => {
this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonData))
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonData)).reverse()
console.log(dataWatch)
var dataValue1 = []
var dataValue2 = []
@@ -283,50 +359,118 @@
</script>
<style scoped lang="less">
- .infomation {
- height: 0.2rem;
+.grid-content{
+ font-size: 8px!important;
+ background-color:#2e4967;
+ text-align: center;
+ margin: 0 2px 4px 2px;
+ border-radius: 2px;
+}
+.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;
+ .layoutFrom{
+ display: flex;
+ .sampling{
+ margin-left: 100px;
+ >span{
+ margin-right: 10px;
+ }
+ }
+ .InquiryBtn{
+ margin-left: 30px;
+ width: 36px;
+ height: 20px;
+ font-size: 8px;
+ background-color:#2e4967 ;
+ text-align: center;
+ border-radius: 3px;
+ }
+ .detailBox{
+ margin-left: 30px;
+ }
+ .pickerMon{
display: flex;
- justify-content: space-around;
- margin-bottom: 5px;
- }
-
- .el-tag {
- height: 25px;
- line-height: 25px;
- background-color: rgba(0, 255, 246, 0.14);
- color: #00d0f9;
- border: none;
- }
-
- .form-echrts {
- height: 1rem;
- border-top: 1px solid #396d83;
-
- .el-dialog-div {
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
+ .pickerDataLeft{
+ margin-left: 10px;
+ margin-right: 90px;
}
+ .pickerData{
+ flex: 1;
+ display: flex;
+ >span{
+ margin-right: 15px;
+ }
+ .pickerTable{
+ margin-left: 6px;
+ width: 40px;
- .from-search {
- background-color: red;
- .date{
- width: 200px;
- height: 30px;
- padding: 0;
- border: none;
- .el-icon-time{
- line-height: 30px;
- }
+ /deep/.el-input__icon {
+ width: 1rem;
+ font-size: 0;
}
+ }
}
-
- #echarts {
- margin: 0;
- padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
+ }
}
+ /deep/.el-input__inner{
+ position: relative;
+ width: 0.9rem!important;
+ height: 0.125rem!important;
+ background-color: #2e4967;
+ color: #ffffff;
+ font-size: 8px;
+ padding: 0;
+ //padding-left:20px ;
+ //padding: 0!important;
+ }
+ .echatsInput{
+ color: #00ffff;
+ background-color: #2e4967;
+ border: none;
+ border-radius: 6px;
+ width: 40px;
+ }
+ .detailbtn{
+ background-color:#2e4967;
+ text-align: center;
+ padding: 0 7px;
+ line-height: 20px;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ }
+ .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;
+ }
+}
</style>
--
Gitblit v1.8.0