From c63be1d20dd038dcabfba6b44a885894642cf93e Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 08 四月 2021 11:03:33 +0800
Subject: [PATCH] 小时数据的添加
---
/dev/null | 253 ------------------------------------------
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 12 -
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 92 +++++++--------
3 files changed, 48 insertions(+), 309 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/DateECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/DateECharts.vue
deleted file mode 100644
index 31f16b7..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/DateECharts.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<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>
- </div>
- <div class="form-echrts">
- <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
- <div>
- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
- <el-dialog :visible.sync="dialogVisible"
- :append-to-body="true"
- 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 style="width:750px;height:260px;" id="echarts" ref="main">
- </div>
- </div>
- </div>
-</template>
-
-<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
-
-export default {
- name: 'ECharts',
- components: {
- PublicDetailedList
- },
- data () {
- return {
- watchData: [],
- dialogVisible: false,
- dataDate: [],
- options: {
- title: {
- // text: '鎶樼嚎鍥惧爢鍙�'
- },
- color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'cross',
- label: {
- color: '#1a4245'
- }
- }
- },
- legend: {
- x: '200px',
- y: '30px',
- data: [{
- name: '姘哀鍖栫墿',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '浜屾哀鍖栫～',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '鐑熷皹',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '搴熸皵娴侀噺',
- textStyle: {
- color: '#00d0f9'
- }
- }]
- // pageTextStyle: {
- // color: '#fff'
- // }
- },
- grid: {
- left: '3%',
- right: '3%',
- bottom: '3%',
- // top: '1%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- // 鍥炬爣缂╂斁璁剧疆
- dataZoom: [{
- type: 'inside',
- start: 0,
- end: 100
- }, {
- start: 0,
- end: 100,
- show: false,
- // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
- handleSize: '80%',
- handleStyle: {
- color: '#fff',
- shadowBlur: 3,
- shadowColor: 'rgba(0, 0, 0, 0.6)',
- shadowOffsetX: 2,
- shadowOffsetY: 2
- }
- }],
- // x杞寸殑璁剧疆
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['3-26', '3-27', '3-28', '3-29', '3-30', '3-31', '4-1'],
- axisLabel: { // x杞村叏閮ㄦ樉绀�
- rotate: 20,
- interval: 0,
- textStyle: {
- color: '#fff'
- }
- },
- splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
- show: true,
- lineStyle: {
- type: 'dashed'
- }
- },
- axisTick: { // x 杞村埢搴︽樉绀�
- show: false
- },
- axisLine: {
- lineStyle: {
- color: '#FFFFFF',
- width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
- }
- }
- },
- // Y 杞寸殑璁剧疆
- yAxis: [{
- type: 'value',
- // position: 'left', // 澶� Y 杞翠娇鐢�
- // name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
- name: '娴撳害(mg/m鲁)',
- axisLabel: {
- formatter: '{value}',
- textStyle: {
- color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
- }
- },
- axisPointer: {
- snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
- },
- splitLine: {
- show: false // y杞� 缃戞牸绾夸笉鏄剧ず
- },
- axisLine: {
- lineStyle: {
- color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
- width: 1
- }
- }
- }],
- series: [
- {
- name: '姘哀鍖栫墿',
- type: 'line',
- stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '浜屾哀鍖栫～',
- type: 'line',
- stack: '鎬婚噺',
- data: [150, 232, 201, 154, 190, 330, 410]
- },
- {
- name: '鐑熷皹',
- type: 'line',
- stack: '鎬婚噺',
- data: [320, 332, 301, 334, 390, 330, 320]
- },
- {
- name: '搴熸皵娴侀噺',
- type: 'line',
- stack: '鎬婚噺',
- data: [820, 932, 901, 934, 1290, 1330, 1320]
- }
- ]
- }
- }
- },
- methods: {
- drawChart: function () {
- const myChart = this.$echarts.init(this.$refs.main)
- myChart.setOption(this.options)
- }
- },
- mounted () {
- this.drawChart()
- // const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
- // console.log(dataWatch)
- // for (var i = 0; i < dataWatch.length; i++) {
- // this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
- // }
- // console.log(this.dataDate)
- }
-}
-</script>
-
-<style scoped lang="less">
- .Infomation {
- margin-left: 10px;
- }
-
- .el-tag {
- height: 25px;
- 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%;
- height: 100%;
- border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .el-dialog-div {
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
- }
-
- #echarts {
- margin: 0;
- padding: 0;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
- }
-</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
similarity index 70%
rename from src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 3173f9c..d7f9953 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -1,3 +1,4 @@
+<!-- 灏忔椂鏁版嵁 -->
<template>
<div id="Tab">
<div class="infomation">
@@ -8,47 +9,47 @@
</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-form-item label="瀹℃壒浜�">-->
-<!-- <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>-->
+<!-- <div class="from-search">-->
+<!-- <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-->
+<!-- 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>-->
- <div class="block">
- <el-date-picker
- 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>
- <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>
- </div>
+<!-- <el-form-item>-->
+<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <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>-->
+<!-- </div>-->
<div style="width:750px;height:260px;" id="echarts" ref="main">
</div>
</div>
@@ -56,11 +57,11 @@
</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 {
@@ -109,21 +110,14 @@
color: '#00d0f9'
}
}]
- // pageTextStyle: {
- // color: '#fff'
- // }
},
grid: {
left: '3%',
right: '1%',
bottom: '3%',
- // top: '1%',
containLabel: true
},
toolbox: {
- feature: {
- saveAsImage: {}
- }
},
// 鍥炬爣缂╂斁璁剧疆
dataZoom: [{
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 72d34f6..42ad235 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -6,8 +6,8 @@
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
<li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("DateECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
<li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
</ul>
<component :is="currentTab" v-bind="$attrs"></component>
@@ -15,18 +15,16 @@
</template>
<script>
-import ECharts from './ECharts'
-import DateECharts from './DateECharts'
+import EChartsHour from './EChartsHour'
export default {
name: 'PublicChart',
components: {
- ECharts,
- DateECharts
+ EChartsHour
},
data () {
return {
- currentTab: 'ECharts'
+ currentTab: 'EChartsHour'
}
},
methods: {
--
Gitblit v1.8.0