From 8f327155ec6a3d5ad1f1ff4e170ed85747439373 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 17:49:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 325d981..abb6f38 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -27,16 +27,6 @@
</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>
@@ -75,8 +65,6 @@
myChar: null,
value: '',
formInline: {
- user: '',
- region: '',
timeStart: '2021-03-15 00:00:00',
timeEnd: '2021-04-13 00:00:00'
},
@@ -287,12 +275,12 @@
var seriesName = params[i].seriesName
// 鍊�
var value = params[i].value
- var valueFliter
- if (value === 'NaN') {
- valueFliter = ''
- } else {
- // valueFliter = formatter(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>'
@@ -305,7 +293,7 @@
} 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 />'
+ s += maker + seriesName + ':' + value + '<br />'
}
return s
}
@@ -661,6 +649,7 @@
padding: 0;
border-color:#00fff6;
text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
--
Gitblit v1.8.0