From 81e426e19db140e630f45409c1569fe16dbcc33f Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 18 五月 2021 15:25:19 +0800
Subject: [PATCH] 修复点击弹窗bug
---
src/components/BaseNav/WasteGas/WasteGasRealChart.vue | 78 +++++++++++++--------------------------
1 files changed, 26 insertions(+), 52 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/WasteGasRealChart.vue b/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
index 1991563..d8de3cf 100644
--- a/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
@@ -2,36 +2,28 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.startTime }}鈥攞{ formData.endTime }}</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.startTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini" ></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.endTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch">鏌ヨ</el-button>
- <el-button>鏄庣粏琛�</el-button>
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="echarts"></div>
+ <div ref="echarts"></div>
+ <span class="time-select">{{ formData.startTime }}鈥攞{ formData.endTime }}</span>
+ <!-- <public-chart :propsData="propsData"></public-chart>-->
</div>
</div>
</template>
<script>
-
+// import PublicChart from '../PublicChart'
import PublicDataStandard from '../PublicDataStandard'
import mapApi from '../../../api/mapApi'
import 'dayjs/locale/es'
@@ -40,6 +32,7 @@
export default {
name: 'WasteGasRealChart',
components: {
+ // PublicChart,
PublicDataStandard
},
data () {
@@ -86,6 +79,7 @@
val: null
}
}],
+ propsData: {},
// 寮�濮� /缁撴潫 鏃堕棿 鍜岄噰鏍风偣鍊肩殑缁戝畾鍊兼暟鎹�
formData: {
@@ -148,9 +142,9 @@
const nameListTemp = [
{
'TJIP45.y2h508CEMS01NOX': '姘哀鍖栫墿',
- 'TJIP45.y2h508CEMS01SO2': '鐑熷皹',
- 'TJIP45.y2h508CEMS01F': '浜屾哀鍖栫７',
- 'TJIP45.y2h508CEMS01PM': 'ph'
+ 'TJIP45.y2h508CEMS01SO2': '姘у惈閲�',
+ 'TJIP45.y2h508CEMS01F': '娓╁害',
+ 'TJIP45.y2h508CEMS01PM': '搴熸皵娴侀噺'
// 'TJIP45.lscl2tb552AI10710': '浜屾哀鍖栫⒊'
}
]
@@ -223,15 +217,15 @@
for (let l = 0; l < nameList.length; l++) {
let obj
let iconUrl
- if (nameList[l] === 'ph') {
+ if (nameList[l] === '娓╁害') {
iconUrl = 'image://../assets/imgs/legend/WenDu.png'
} else if (nameList[l] === '姘哀鍖栫墿') {
iconUrl = 'image://../assets/imgs/legend/NOX.png'
} else if (nameList[l] === '鐑熷皹') {
iconUrl = 'image://../assets/imgs/legend/zongdan.png'
- } else if (nameList[l] === '浜屾哀鍖栫７') {
- iconUrl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (nameList[l] === '浜屾哀鍖栫⒊') {
+ } else if (nameList[l] === '姘у惈閲�') {
+ iconUrl = 'image://../assets/imgs/legend/VOCs.png'
+ } else if (nameList[l] === '搴熸皵娴侀噺') {
iconUrl = 'image://../assets/imgs/legend/VOCs.png'
}
@@ -265,7 +259,7 @@
for (let j = 0; j < nameList.length; j++) {
let zdcbcolor, zxcolor
- if (nameList[j] === 'ph') {
+ if (nameList[j] === '娓╁害') {
zdcbcolor = 'red'
zxcolor = '#f206ff'
} else if (nameList[j] === '鐑熷皹') {
@@ -274,12 +268,12 @@
} else if (nameList[j] === '姘哀鍖栫墿') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
- } else if (nameList[j] === '浜屾哀鍖栫⒊') {
+ } else if (nameList[j] === '搴熸皵娴侀噺') {
zdcbcolor = 'red'
zxcolor = '#9ACD32'
- } else if (nameList[j] === '浜屾哀鍖栫７') {
+ } else if (nameList[j] === '姘у惈閲�') {
zdcbcolor = 'red'
- zxcolor = '#f48183'
+ zxcolor = '#008000'
}
let ydata
// 涓存椂鏁版嵁
@@ -471,7 +465,7 @@
let maker = params[i].marker
let colo = ''
switch (seriesName) {
- case 'ph':
+ case '娓╁害':
colo = '#f206ff'
break
case '姘哀鍖栫墿':
@@ -480,11 +474,11 @@
case '鐑熷皹':
colo = '#e0ffff'
break
- case '浜屾哀鍖栫⒊':
+ case '搴熸皵娴侀噺':
colo = '#9ACD32'
break
- case '浜屾哀鍖栫７':
- colo = '#f48183'
+ case '姘у惈閲�':
+ colo = '#008000'
break
default:
colo = ''
@@ -503,8 +497,8 @@
}
},
grid: {
- top: '20%',
- bottom: '15%'
+ top: '40px',
+ bottom: '30px'
},
legend: {
data: legend
@@ -610,27 +604,7 @@
<style scoped lang="less">
.echarts-box {
- .tab-scroll {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .time-select {
- cursor: pointer;
- padding: 5px;
- border: 1px solid #2b87c8;
- border-radius: 4px;
- text-align: center;
- color: #fff;
- font-size: 11px;
- width: 280px;
- }
- }
-
.echarts-form {
- height: 0.3rem;
- line-height: 0.3rem;
-
.demonstration {
color: #00fff6;
font-size: 12px;
--
Gitblit v1.8.0