From 3d987417414022bcef8dbee7b165e2c4a36ad6aa Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 12:34:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 8e0f659..994a8be 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -15,19 +15,14 @@
<div class="pickerData">
<span> 寮�濮嬫椂闂�:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="value1">
- </el-date-picker>
- </span>
+ <el-date-picker type="datetime" v-model="value1"></el-date-picker>
+ </span>
</div>
<div class="pickerData">
<span >缁撴潫鏃堕棿:</span>
<span class="pickerTable">
- <el-date-picker
- type="datetime"
- v-model="value2"
- >
- </el-date-picker>
- </span>
+ <el-date-picker type="datetime" v-model="value2"></el-date-picker>
+ </span>
</div>
</div>
<div>
@@ -308,17 +303,18 @@
// }
//}
.grid-content {
- font-size: 8px !important;
+ font-size: 8px;
background-color: #2e4967;
text-align: center;
- margin: 0 2px 4px 2px;
border-radius: 2px;
+ margin-right: 10px;
+ padding:0 10px
}
.animation {
//width: 600px;
//height: 0.06rem;
- .Infomation {
- margin-left: 10px;
+ .infomation {
+ padding: 5px 10px;
}
}
.form-echrts {
@@ -338,18 +334,8 @@
flex: 1;
display: flex;
>span{line-height: 22px}
- .pickerTable{
- margin-left: 6px;
- /deep/.el-input{
- font-size: 0px;
- .el-input__prefix{
- width: 100%;
- }
- }
- /deep/.el-input__icon {
- width: 100%;
- font-size: 0;
- }
+ .pickerTable {
+ margin-left: 3px;
}
}
}
@@ -358,8 +344,8 @@
}
/deep/.el-input__inner{
position: relative;
- width: 0.9rem!important;
- height: 0.125rem!important;
+ width:140px;
+ height:22px;
background-color: #2e4967;
color: #ffffff;
font-size: 12px;
@@ -368,6 +354,14 @@
//padding-left:20px ;
//padding: 0!important;
}
+ /deep/.el-input__icon{
+ display: block;
+ width: 140px;
+ height: 22px;
+ line-height: 22px;
+ cursor: pointer;
+ font-size: 0;
+ }
.echatsInput{
color: #00ffff;
background-color: #2e4967;
@@ -375,6 +369,7 @@
border-radius: 6px;
width: 80px;
height: 22px;
+ text-align: center;
}
input::-webkit-calendar-picker-indicator {
opacity: 100;
@@ -383,7 +378,7 @@
background-color:#2e4967;
text-align: center;
padding: 0 7px;
- line-height: 20px;
+ line-height: 24px;
border-radius: 4px;
margin-right: 6px;
}
@@ -397,9 +392,6 @@
#echarts {
margin: 0;
padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
}
}
</style>
--
Gitblit v1.8.0