From c77abda3614ba5c0a317b92eef29edbb39501d8f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:52:14 +0800
Subject: [PATCH] echarts的数据显示功能
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 9
public/assets/images/map/wastewater/fs_bright_greens.png | 0
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 2
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 1
src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue | 678 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/assets/images/map/wastewater/fs_bright_green.png | 0
6 files changed, 685 insertions(+), 5 deletions(-)
diff --git a/public/assets/images/map/wastewater/fs_bright_green.png b/public/assets/images/map/wastewater/fs_bright_green.png
index 9d6dae8..cb30683 100644
--- a/public/assets/images/map/wastewater/fs_bright_green.png
+++ b/public/assets/images/map/wastewater/fs_bright_green.png
Binary files differ
diff --git a/public/assets/images/map/wastewater/fs_bright_greens.png b/public/assets/images/map/wastewater/fs_bright_greens.png
new file mode 100644
index 0000000..9d6dae8
--- /dev/null
+++ b/public/assets/images/map/wastewater/fs_bright_greens.png
Binary files differ
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 0844f9f..0790c3b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -58,7 +58,6 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
-// import dayjs from 'dayjs'
export default {
name: 'ECharts',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index d613182..d3af27b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -146,6 +146,8 @@
console.log(1)
// const date = [this.value1, this.value2, this.formInline.region]
+ // if (this.$attrs.)
+ // console.log(this.$attrs.)
this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
// console.log(date)
// if (date) {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
new file mode 100644
index 0000000..3a14a98
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
@@ -0,0 +1,678 @@
+<!-- 灏忔椂鏁版嵁 -->
+<template>
+ <div id="Tab">
+ <div class="infomation">
+ <div>
+ <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+ </div>
+ </div>
+ <div class="form-echrts">
+ <div class="from-search">
+ <div class="pickerMon">
+ <div class="pickerData">
+ <span> 寮�濮嬫椂闂�:</span>
+ <span class="pickerTable">
+ <el-date-picker type="datetime" v-model="formInline.timeStart">
+ </el-date-picker>
+ </span>
+ </div>
+ <div class="pickerData">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
+ <el-date-picker
+ type="datetime"
+ v-model="formInline.timeEnd"
+ >
+ </el-date-picker>
+ </span>
+ </div>
+ </div>
+ <div>
+ 閲囨牱鐐规暟:
+ <el-select v-model="formInline.region">
+ <el-option label="0" value="0"></el-option>
+ <el-option label="25" value="25"></el-option>
+ <el-option label="50" value="50"></el-option>
+ <el-option label="75" value="75"></el-option>
+ <el-option label="100" value="100"></el-option>
+ </el-select>
+ </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>
+
+<script>
+import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+
+export default {
+ name: 'ECharts',
+ components: {
+ PublicDetailedList
+ },
+ data () {
+ return {
+ value1: '',
+ value2: '',
+ watchData: [],
+ dialogVisible: false,
+ myChar: null,
+ value: '',
+ formInline: {
+ region: '',
+ timeStart: '',
+ timeEnd: ''
+ },
+ myChart: null,
+ JsonWater: {
+ id: 'mycharteff',
+ title: '',
+ datatype: 2,
+ jcdID: '1020',
+ legend: [
+ {
+ icon: 'image://../assets/imgs/legend/SO2.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: 'COD',
+ testStyle: {
+ color: '#ccc'
+ }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/NOX.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '姘ㄦ爱',
+ testStyle: {
+ color: '#ccc'
+ }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/VOCs.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '搴熸按娴侀噺',
+ testStyle: {
+ color: '#ccc'
+ }
+ }
+ ],
+ xdata: ['17鏃�', '18鏃�', '19鏃�', '20鏃�', '21鏃�', '22鏃�', '23鏃�', '0鏃�', '1鏃�', '2鏃�', '3鏃�', '4鏃�', '5鏃�', '6鏃�', '7鏃�', '8鏃�', '9鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�', '14鏃�', '15鏃�', '16鏃�'],
+ ydatas: [
+ { name: 'COD', data: [5.602, 5.617, 5.612, 5.647, 5.652, 5.673, 5.665, 5.702, 5.69, 5.722, 5.729, 5.755, 5.754, 5.784, 8.593, 12.826, 11.125, 8.582, 8.047, 7.325, 6.452, 5.175, 5.522, 6.039], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 80 },
+ { name: '姘ㄦ爱', data: [0.196, 0.184, 0.189, 0.193, 0.199, 0.201, 0.21, 0.211, 0.214, 0.213, 0.214, 0.214, 0.214, 0.214, 0.214, 0.214, 0.213, 0.195, 0.183, 0.183, 0.183, 0.204, 0.223, 0.38], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 25 },
+ { name: '搴熸按娴侀噺', data: [226.766998, 223.709, 104.838997, 259.417999, 292.963989, 282.291992, 293.272003, 182.985992, 174.287003, 175.011993, 174.307007, 187.044998, 252.026001, 250.365005, 155.317993, 164.723007, 243.785995, 135.520996, 98.18, 185.481995, 226.473999, 215.171005, 250.393005, 254.643997], zdcbcolor: 'red', zxcolor: '#9ACD32', bzz: null }
+ ],
+ yname: '娴撳害(mg/l)'
+ }
+ }
+ },
+ methods: {
+ onSubmit () {
+ console.log(1)
+
+ // const date = [this.value1, this.value2, this.formInline.region]
+ this.effChartShow(this.JsonWater.id, this.JsonWater.title, this.JsonWater.legend, this.JsonWater.xdata, this.JsonWater.ydatas, this.JsonWater.yname, this.JsonWater.id, this.JsonWater.datatype)
+ // console.log(date)
+ // if (date) {
+ // var date1 = new Date(date)
+ // date1 = new Date(date1.getTime() - (8 * 3600000))
+ // console.log(date1)
+ // var dateUtil = new DateUtil()
+ // var datePkg = dateUtil.getTowDate(date1, "a", 24 * 3600000 - 1);
+ // var datatype = 2;
+ },
+ effChartShow: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
+ this.myChart = this.$echarts.init(this.$refs.main)
+ this.myChart.clear()
+ var dataUnit = ''
+ if (datatype === 1) {
+ dataUnit = '娴侀噺(m鲁/d)'
+ } else {
+ dataUnit = '娴侀噺(m鲁/h)'
+ }
+
+ var serLists = []
+ for (var j = 0; j < ydatas.length; j++) {
+ var len = ydatas[j].data.length
+ for (var k = 0; k < len; k++) {
+ var it = ydatas[j].data[k]
+ var it2 = parseFloat(it).toFixed(2)
+ ydatas[j].data[k] = it2
+ }
+ }
+ for (var i = 0; i < ydatas.length; i++) {
+ // var zdcbcolor = ydatas[i].zdcbcolor
+ var bz = ydatas[i].bzz
+ var obj
+ if (bz) {
+ obj = {
+ name: ydatas[i].name,
+ symbol: 'circle', // 鎶樼偣褰㈢姸
+ symbolSize: 10, // 澶у皬
+ smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ /* var biaozhuiz
+ for (var i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name == c.seriesName) {
+ biaozhuiz = bzzList[i].bzhui
+ }
+ }
+ if (c.value > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value > biaozhuiz * 0.9) {
+ return '#FFA500'
+ } else {
+ return '#33c95f'
+ } */
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 5
+ },
+ borderColor: 'black', // 鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+
+ },
+ type: 'line',
+ data: ydatas[i].data,
+ markLine: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
+ symbol: 'none',
+ data: [{
+ label: {
+ normal: {
+ position: 'end',
+ formatter: '' // ydatas[i].name+'鏍囧噯鍊�' //+'{c}'
+ }
+ },
+ name: '鏍囧噯鍊�',
+ yAxis: bz,
+ lineStyle: {
+ color: ydatas[i].zxcolor,
+ type: 'dashed',
+ width: 2
+ }
+ }
+ ]
+ }
+ }
+ } else {
+ obj = {
+ name: ydatas[i].name,
+ symbol: 'circle', // 鎶樼偣褰㈢姸
+ symbolSize: 10, // 澶у皬
+ smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
+ yAxisIndex: 1,
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ /* var biaozhuiz
+ for (var i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name == c.seriesName) {
+ biaozhuiz = bzzList[i].bzhui
+ }
+ }
+ if (c.value > 9999999) {
+ return zdcbcolor
+ } else {
+ return '#33c95f'
+ } */
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 5
+ },
+ borderColor: 'black', // 鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
+ type: 'line',
+ data: ydatas[i].data
+ }
+ }
+ serLists.push(obj)
+ }
+ var option =
+ {
+ /* title: {
+ text: title,
+ }, */
+ tooltip: { // 鎻愮ず妗�
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ label: {
+ color: '#1a4245'
+ }
+ },
+ formatter: function (params) {
+ var s = params[0].name + '<br />'
+ for (var i = 0; i < params.length; i++) {
+ // var name = params[i].name
+ // 鍥捐〃title鍚嶇О
+ var seriesName = params[i].seriesName
+ // 鍊�
+ var value = params[i].value
+ var valueFliter
+ if (value === 'NaN') {
+ valueFliter = ''
+ } else {
+ // valueFliter = formatter(value)
+ }
+ var maker = params[i].marker
+ if (seriesName === 'COD') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
+ } else if (seriesName === '姘ㄦ爱') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#00B0F0;"></span>'
+ } else if (seriesName === '鎬荤７') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
+ } else if (seriesName === '鎬绘爱') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#d9f2f4;"></span>'
+ } else {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
+ }
+ s += maker + seriesName + ':' + valueFliter + '<br />'
+ }
+ return s
+ }
+ },
+ toolbox: { // 鎵撳嵃绛夊伐鍏�
+ show: false,
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ grid: { // 缃戞牸
+ top: '20%',
+ left: '5%'
+ },
+ legend: {
+ data: legend
+ },
+ 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
+ }
+ }],
+ xAxis: { // x 杞磋缃�
+ type: 'category',
+ boundaryGap: false,
+ 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// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ }
+ },
+ data: xdata
+ },
+ yAxis: [{
+ type: 'value',
+ name: yname,
+ /* max: function (value) {
+ var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ if (bzzList && bzzList.length > 0) {
+ $.each(bzzList, function (index, item) {
+ max_val_list.push(item.bzhui)
+ })
+ }
+ max_val_list = max_val_list.sort(function (a, b) {
+ return a - b
+ }) // 鎺掑簭
+ var ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1]
+ return parseInt(ma)
+ }, */
+ axisLabel: {
+ formatter: '{value}',
+ textStyle: {
+ color: '#fff'
+ }
+ },
+ axisPointer: {
+ snap: true
+ },
+ splitLine: {
+ show: false
+ }, // y杞� 缃戞牸绾夸笉鏄剧ず,
+ axisLine: {
+ lineStyle: {
+ color: '#FFFFFF',
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ }
+ }
+ }, {
+ type: 'value',
+ name: dataUnit,
+ axisLabel: {
+ formatter: '{value}',
+ textStyle: {
+ color: '#fff'
+ }
+ },
+ axisPointer: {
+ snap: true
+ },
+ splitLine: {
+ show: false
+ }, // y杞� 缃戞牸绾夸笉鏄剧ず,
+ // inverse: true,
+ // nameLocation: 'start',
+ // max:500,
+ axisLine: {
+ lineStyle: {
+ color: '#FFFFFF',
+ width: 1// 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ }
+ }
+ }],
+ series: serLists
+ }
+ this.myChart.setOption(option)
+ /*
+ myChart.on('legendselectchanged', function (params) {
+ // console.log(params);
+ var StdVal = null
+ var op = { yAxis: {} }
+ if (params.selected.COD) {
+ if (bzzList && bzzList.length > 0) {
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name == 'COD') {
+ StdVal = bzzList[i].bzhui
+ }
+ }
+ }
+
+ op.yAxis.max = function (value) {
+ var ma
+ if (value.max < StdVal) {
+ ma = StdVal
+ } else {
+ ma = Math.ceil(value.max)
+ }
+ return ma
+ }
+ } else if (params.selected['鎬绘爱']) {
+ if (bzzList && bzzList.length > 0) {
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name == '鎬绘爱') {
+ StdVal = bzzList[i].bzhui
+ }
+ }
+ }
+ op.yAxis.max = function (value) {
+ var ma
+ if (value.max < StdVal) {
+ ma = StdVal
+ } else {
+ ma = Math.ceil(value.max)
+ }
+ return ma
+ }
+ } else if (params.selected['姘ㄦ爱']) {
+ if (bzzList && bzzList.length > 0) {
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name == '姘ㄦ爱') {
+ StdVal = bzzList[i].bzhui
+ }
+ }
+ }
+ op.yAxis.max = function (value) {
+ var ma
+ if (value.max < StdVal) {
+ ma = StdVal
+ } else {
+ ma = Math.ceil(value.max)
+ }
+ return ma
+ }
+ } else if (params.selected['鎬荤７']) {
+ if (bzzList && bzzList.length > 0) {
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name == '鎬荤７') {
+ StdVal = bzzList[i].bzhui
+ }
+ }
+ }
+ op.yAxis.max = function (value) {
+ var ma
+ if (value.max < StdVal) {
+ ma = StdVal
+ } else {
+ ma = Math.ceil(value.max)
+ }
+ return ma
+ }
+ }
+ myChart.setOption(op)
+ })
+ */
+
+ /**
+ * 瑙ｅ喅myChart.on('click',function(){...})浜嬩欢閲嶅瑙﹀彂鐨勯棶棰�
+ * Date: 20200720
+ */
+ this.myChart.off('click')
+
+ /**
+ * 鍥炬爣鐐瑰嚮浜嬩欢
+ * 20190426 add
+ * */
+ /* myChart.on('click', function (params) {
+ // console.log('[鐩戞祴鐐筰d=%s]',jcdID)
+
+ // 鑾峰彇褰撳墠鏃堕棿锛屽皬鏃�
+ var nowHours = new Date().Format('hh')
+ // console.log('[褰撳墠灏忔椂鏄細%s]',nowHours);
+
+ // 鐐瑰嚮鎶樼嚎鍥炬姌鐐瑰搴旂殑鏃堕棿
+ // 闇�瑕佷紶鐨勬椂闂翠负
+ var _date = null
+ if (params.name.indexOf('鏃�') != -1) {
+ var hours = params.name.substring(0, params.name.indexOf('鏃�'))
+ // console.log('[鍧愭爣杞村搴旂殑鏃堕棿涓�%s]',hours);
+
+ if (parseInt(hours) < parseInt(nowHours)) {
+ _date = new Date().Format('yyyy-MM-dd') + ' ' + hours + ':00:00'
+ } else {
+ var currentDate = new Date()
+ // 24灏忔椂涔嬪墠鏃堕棿
+ var stringDate = new Date(currentDate.getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+
+ _date = stringDate + ' ' + hours + ':00:00'
+ }
+
+ // console.log('[闇�瑕佷紶閫掔殑鏃堕棿涓猴細%s]',_date);
+ } else if (params.name.indexOf('鏃�') != -1) {
+ var day = params.name.substring(0, params.name.indexOf('鏃�') - 1)
+ _date = new Date().Format('yyyy-MM') + '-' + day.trim()
+ }
+
+ // todo 璋冩帴鍙� 鏌ュ嚟璇�
+
+ if (params.color != 'red') {
+ var poltMtrlId
+ var monItemId = 28
+ for (var i = 0; i < wrwIDS.length; i++) {
+ if (params.seriesName == wrwIDS[i].name) {
+ poltMtrlId = wrwIDS[i].id
+ }
+ }
+
+ getCBMX(jcdID, poltMtrlId, monItemId, _date, function (res) {
+ createDivByMouse(res, params.event)
+ })
+ }
+ // createDivByMouse("s",params.event);
+ }) */
+ },
+ drawChart: function () {
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ this.myChart.getDom().style.height = 3 + 'rem'
+ this.myChart.getDom().style.width = 6 + 'rem'
+ } else {
+ this.myChart.getDom().style.height = 3 + 'rem'
+ this.myChart.getDom().style.width = 6 + 'rem'
+ }
+ this.myChart.resize()
+ }
+ }
+
+ }
+
+}
+</script>
+
+<style scoped lang="less">
+.grid-content{
+ font-size: 8px;
+ background-color: #2e4967;
+ text-align: center;
+ border-radius: 2px;
+ margin-right: 10px;
+ padding:0 10px
+}
+.infomation {
+ padding: 5px 10px;
+}
+
+.form-echrts {
+ width: 100%;
+ border-top: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .from-search{
+ 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: 3px;
+ }
+ }
+ }
+ /deep/.el-date-editor--datetime{
+ width: 100%;
+ }
+ /deep/.el-input__inner{
+ position: relative;
+ width:140px;
+ background-color: #2e4967;
+ color: #ffffff;
+ font-size: 12px;
+ height: 24px;
+ padding: 0;
+ border-color:#00fff6;
+ text-align: center;
+ //padding-left:20px ;
+ //padding: 0!important;
+ }
+ /deep/.el-input__icon{
+ display: block;
+ width: 140px;
+ height: 22px;
+ line-height: 22px;
+ cursor: pointer;
+ font-size: 0;
+ }
+ .echatsInput{
+ color: #00ffff;
+ background-color: #2e4967;
+ border: none;
+ border-radius: 6px;
+ width: 80px;
+ height: 22px;
+ text-align: center;
+ }
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
+ .detailbtn{
+ background-color:#2e4967;
+ text-align: center;
+ padding: 0 7px;
+ line-height: 24px;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ .detailbtn:hover{
+ box-shadow: 0 0 0.03rem #fff700 !important;
+ color:#fff700 !important;
+ cursor: pointer;
+ }
+ }
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ }
+}
+</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index efb16e4..a05e603 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -7,7 +7,7 @@
<ul class="tab">
<li @click='tabTaggle("Echarts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsHourWasteWater")'>鏃ユ暟鎹�</li>
<li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
@@ -24,13 +24,15 @@
<script>
import EChartsHour from './EChartsHour'
-import EChartsDate from './EChartsDate'
+// import EChartsDate from './EChartsDate'
+import EChartsHourWasteWater from './EChartsHourWasteWater'
export default {
name: 'PublicChart',
components: {
EChartsHour,
- EChartsDate
+ // EChartsDate
+ EChartsHourWasteWater
},
data () {
return {
@@ -40,7 +42,6 @@
methods: {
tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
- // debugger
}
}
}
--
Gitblit v1.8.0