From 82732610befafe88ae9512c9ac37e6a4bcf291c7 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 22:59:44 +0800
Subject: [PATCH] 废气小时数据、日数据、人工数据接口替换；增加点位id、检测项id查询；无数据提示；UI优化。
---
src/components/base-page/WasteWater/WasteWaterHoursChart.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/src/components/base-page/WasteWater/WasteWaterHoursChart.vue b/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
index 1fb3164..3b8c74b 100644
--- a/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
+++ b/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
@@ -1,5 +1,5 @@
<template>
- <div class="echarts-box">
+ <div id="wasteWaterHoursChartBox" class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
</div>
@@ -9,7 +9,7 @@
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
<el-date-picker v-model="formData.endTime" value-format="yyyy-MM-dd HH" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
+ <el-select class="selectBox" 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>
@@ -19,7 +19,7 @@
popper-class="popoverBoxStyle"
trigger="click">
<dynamic-table :tableData="tableData" :tableHeader="tableConfig" v-if="tableData"></dynamic-table>
- <el-button slot="reference">鏄庣粏琛�</el-button>
+ <el-button slot="reference" id="mingxiBtn">鏄庣粏琛�</el-button>
</el-popover>
</div>
<div class="echarts-chart">
@@ -153,8 +153,15 @@
]
}
},
+ props: {
+ OnlineMonEmissPointId: {
+ type: Number
+ }
+ },
mounted () {
- this.draw24Chart()
+ this.$nextTick(() => {
+ this.draw24Chart()
+ })
},
methods: {
// 鐐瑰嚮鏌ヨ鍔熻兘
@@ -182,7 +189,6 @@
if (result.length > 0) {
this.dataStandard = []
this.tableData = this.analysisResult(result) // 灏忔椂鏄庣粏琛ㄨВ鏋愮粨鏋�
- console.log(this.tableData)
const d = result
const nameList = [] // 瀛樻斁鍥句緥
const dateList = [] // 瀛樻斁鏃堕棿
@@ -542,12 +548,15 @@
saveAsImage: {}
}
},
- grid: { // 缃戞牸
- top: '20%'
- // left: '15%'
- },
legend: {
data: legend
+ },
+ grid: {
+ // 涓庣粷瀵瑰畾浣嶇浉浼硷紝top锛宭eft锛宺ight锛宐ottom 璁惧畾鏄牴鎹笂绾х洅瀛愬楂樻潵璁＄畻
+ top: '20%',
+ left: '6%',
+ right: '6%',
+ bottom: '12%'
},
dataZoom: [{
type: 'inside',
@@ -698,7 +707,30 @@
}
}
</script>
-
-<style scoped lang="less">
-
+<style>
+#wasteWaterHoursChartBox .echarts-form .el-input__inner {
+ background-color: rgba(0, 0, 0, 0);
+ height: .13rem;
+ border-color: #336fa4;
+}
+#wasteWaterHoursChartBox .echarts-form .el-input__icon{
+ height: .13rem;
+ top: -.02rem;
+ right: -0.03rem;
+ position: absolute;
+ color: #00d0f9;
+}
+#wasteWaterHoursChartBox .echarts-form .selectBox .el-input__icon:last-child{
+ top: .02rem;
+}
+#wasteWaterHoursChartBox .echarts-form .selectBox .is-reverse{
+ top: -.02rem !important;
+}
+#wasteWaterHoursChartBox .echarts-form .el-button{
+ background-color: rgba(0, 0, 0, 0);
+ height: .13rem;
+}
+#mingxiBtn{
+ margin-left: -.02rem;
+}
</style>
--
Gitblit v1.8.0