From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 105 ++++++++++++++++++----------------------------------
1 files changed, 36 insertions(+), 69 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index e719096..dc58543 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -35,8 +35,8 @@
<!-- <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 class="detailbtn hover-bottom" @click="onSubmit">鏌ヨ</div>
+ <div class="detailbtn hover-bottom" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
<div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
</div>
@@ -160,9 +160,9 @@
this.mychartDay.clear()
var dataUnit = ''
if (datatype === 1) {
- dataUnit = '姘旈噺(m鲁/d)'
+ dataUnit = '搴熸皵姘旈噺(m鲁/d)'
} else {
- dataUnit = '姘旈噺(m鲁/h)'
+ dataUnit = '搴熸皵姘旈噺(m鲁/h)'
}
var serLists = []
@@ -304,12 +304,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 = this.formatter(value)
+ // }
var maker = params[i].marker
if (seriesName === '浜屾哀鍖栫～') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -322,7 +322,7 @@
} else {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
}
- s += maker + seriesName + ':' + valueFliter + '<br />'
+ s += maker + seriesName + ':' + value + '<br />'
}
return s
}
@@ -683,42 +683,20 @@
</script>
<style scoped lang="less">
-//.animation{
-// padding: 0 1rem;
-// overflow: hidden;
-// //width: 1rem;
-// .infomation{
-// display: flex;
-// //margin: 0 1rem;
-// overflow: hidden;
-// animation: move 1s linear 0s infinite;
-// @keyframes move {
-// 0% {
-// }
-// 100% {
-// transform: translateX(-10%);
-// }
-// }
-// /* 榧犳爣缁忚繃marquee 灏卞仠姝㈠姩鐢� */
-// &:hover {
-// //z-index: 9999999;
-// animation-play-state: paused;
-// }
-// }
-//}
- .grid-content {
- font-size: 8px;
- background-color: #2e4967;
- text-align: center;
- border-radius: 2px;
- margin-right: 10px;
- padding:0 10px
- }
+
.animation {
- //width: 600px;
- //height: 0.06rem;
.infomation {
- padding: 5px 10px;
+ padding: 0.02rem 0.04rem;
+ .grid-content {
+ font-size: 0.08rem;
+ background-color: #2e4967;
+ text-align: center;
+ border-radius: 0.01rem;
+ height: 0.15rem;
+ line-height: 0.15rem;
+ margin-right: 0.04rem;
+ padding:0 0.04rem
+ }
}
}
.form-echrts {
@@ -727,7 +705,7 @@
//margin: 10px 10px 10px 10px;
.from-search{
display: flex;
- padding:5px;
+ padding:0.02rem;
>div{margin-left: 10px}
.pickerMon{
display: flex;
@@ -748,33 +726,27 @@
}
/deep/.el-input__inner{
position: relative;
- width:140px;
+ width:1rem;
background-color: #2e4967;
color: #fff;
- font-size: 12px;
- height: 24px;
+ font-size: 0.08rem;
+ height: 0.15rem;
padding: 0;
- border-color:#00fff6;
- text-align: center;
+ border:none;
+ text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
/deep/.el-input__icon{
display: block;
- width: 140px;
- height: 22px;
- line-height: 22px;
+ width:1rem;
+ height: 0.15rem;
+ line-height: 0.15rem;
cursor: pointer;
font-size: 0;
}
- .echatsInput{
- color: #00ffff;
- background-color: #2e4967;
- border: none;
- border-radius: 6px;
- width: 80px;
- height: 22px;
- }
+
input::-webkit-calendar-picker-indicator {
opacity: 100;
}
@@ -782,23 +754,18 @@
background-color:#2e4967;
text-align: center;
padding: 0 7px;
- line-height: 20px;
+ height: 0.15rem;
+ line-height: 0.15rem;
border-radius: 4px;
margin-right: 6px;
}
}
.el-dialog-div {
- //height: 50vh!important;
overflow: auto;
- //overflow: hidden;
}
-
#echarts {
margin: 0;
padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
}
}
</style>
--
Gitblit v1.8.0