From 2a3368dfd32f564f37f22c9df5865f52bc4ee3db Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 13:53:06 +0800
Subject: [PATCH] 弹框修改问题
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 30 +++++++-------
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 19 +--------
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 46 ++++++++++-------------
3 files changed, 37 insertions(+), 58 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index d4654b2..d80b3ae 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -4,17 +4,11 @@
<div class="border_corner border_corner_right_top"></div>
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
- <ul class="tab" v-show="this.$attrs.value === 'feiqi'">
+ <ul class="tab">
<li :class="active==0?'hover':''" @click='tabTaggle("ECharts",0)'>瀹炴椂鏁版嵁</li>
<li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
<li :class="active==2?'hover':''" @click='tabTaggle("EChartsDate",2)'>鏃ユ暟鎹�</li>
<li :class="active==3?'hover':''" @click='tabTaggle("EChartsTable",3)'>浜哄伐鏁版嵁</li>
- </ul>
- <ul class="tab" v-show="this.$attrs.value !== 'feiqi'">
- <li :class="active==0?'hover':''" @click='tabTaggle("EChartsRealWasteWater",0)'>瀹炴椂鏁版嵁</li>
- <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHourWasteWater",1)'>灏忔椂鏁版嵁</li>
- <li :class="active==2?'hover':''" @click='tabTaggle("EChartsDateWasteWater",2)'>鏃ユ暟鎹�</li>
- <li :class="active==3?'hover':''" @click='tabTaggle("EChartsWasteWaterTable",3)'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -34,22 +28,13 @@
import EChartsDate from './echarts/EChartsDate'
import EChartsTable from './echarts/EChartsTable'
-import EChartsRealWasteWater from './echarts/EChartsRealWasteWater'
-import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
-import EChartsDateWasteWater from './echarts/EChartsDateWasteWater'
-import EChartsWasteWaterTable from './echarts/EChartsWasteWaterTable'
-
export default {
name: 'PublicChart',
components: {
EChartsHour,
EChartsDate,
ECharts,
- EChartsTable,
- EChartsRealWasteWater,
- EChartsHourWasteWater,
- EChartsDateWasteWater,
- EChartsWasteWaterTable
+ EChartsTable
},
data () {
return {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index 8965122..438dcd0 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -34,32 +34,32 @@
<div style="width:5rem;height:1.5rem;" 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>
+<!-- <!– 鏄庣粏寮规 –>-->
+<!-- <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 mapApi from '@/api/mapApi'
-import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
components: {
- PublicDataStandard,
- PublicDetailedList
+ PublicDataStandard
+ // PublicDetailedList
},
data () {
return {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 1cad629..7a7d07e 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -1,6 +1,13 @@
<template>
<div id="Tab">
- <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
+ <div class="animation">
+ <div class="infomation">
+ <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">5.23</i></span>
+ </div>
+ </div>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -19,7 +26,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <el-select v-model="formInline.region" placeholder="50" class="">
+ <el-select v-model="formInline.region" placeholder="50">
<el-option label="0" value="0"></el-option>
<el-option label="25" value="25"></el-option>
<el-option label="50" value="50"></el-option>
@@ -29,9 +36,9 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:1.5rem;" ref="echarts"> </div>
- </div>
+ <div style="width:5rem;height:1.5rem;" ref="echarts"> </div>
</div>
+ </div>
</template>
<script>
@@ -39,13 +46,9 @@
// import mapApi from '@/api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
-import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
- components: {
- PublicDataStandard
- },
data () {
return {
days: dayjs(new Date()).format('YYYYMMDDHHmmss'),
@@ -59,23 +62,6 @@
timeEnd: ''
},
RealTimeChart: null,
- dataStandard: [{
- current: { name: '姘哀鍖栫墿1', val: 29.93 },
- standard: { name: '鏍囧噯', val: 100 }
- },
- {
- current: { name: '浜屾哀鍖栫～', val: 17.34 },
- standard: { name: '鏍囧噯', val: 50 }
- },
- {
- current: { name: '鐑熷皹', val: 6.93 },
- standard: { name: '鏍囧噯', val: 30 }
- },
- {
- current: { name: '搴熸皵娴侀噺', val: 120343.18 },
- standard: { name: '', val: null }
- }
- ],
JsonTimeCtarts: {
id: 'mychart_ss ',
title: '鐑熷皹',
@@ -1024,6 +1010,7 @@
this.IntervalEXHRealTimeDate()
}, 15000)
}
+
}
}
</script>
@@ -1038,6 +1025,13 @@
padding:0 10px
>i{
color: #ffffff;
+ }
+}
+.animation {
+ //width: 600px;
+ //height: 0.06rem;
+ .infomation {
+ padding: 5px 10px;
}
}
.form-echrts {
@@ -1067,7 +1061,7 @@
}
/deep/.el-input__inner{
position: relative;
- //width:140px;
+ width:140px;
background-color: #2e4967;
color: #fff;
font-size: 12px;
--
Gitblit v1.8.0