From 0eb2de2d7631496fb6d9db215852c43b49793f6a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 12 四月 2021 15:08:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 78 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 7f68fb3..5033415 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -15,31 +15,25 @@
<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>
閲囨牱鐐规暟:
- <input list="source" id="ipt" class="echatsInput" @change="datalistBtn">
- <datalist id="source" @click="datalistBtn">
- <option value="0" />
- <option value="25" />
- <option value="50" />
- <option value="75" />
- <option value="100" />
- </datalist>
+ <el-select v-model="formInline.region" placeholder="50">
+ <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>
@@ -88,7 +82,6 @@
},
methods: {
onSubmit () {
- console.log(this.value1)
console.log('submit!')
},
drawChart: function () {
@@ -309,11 +302,12 @@
// }
//}
.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
>i{
font-style: normal;
color: #eef309;
@@ -322,8 +316,8 @@
.animation {
//width: 600px;
//height: 0.06rem;
- .Infomation {
- margin-left: 10px;
+ .infomation {
+ padding: 5px 10px;
}
}
.form-echrts {
@@ -343,18 +337,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;
}
}
}
@@ -363,16 +347,25 @@
}
/deep/.el-input__inner{
position: relative;
- width: 0.9rem!important;
- height: 0.125rem!important;
+ width:140px;
background-color: #2e4967;
- color: #ffffff;
+ color: #fff;
font-size: 12px;
height: 24px;
padding: 0;
+ border-color:#00fff6;
+ text-align: center;
//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;
@@ -380,6 +373,7 @@
border-radius: 6px;
width: 80px;
height: 22px;
+ text-align: center;
}
input::-webkit-calendar-picker-indicator {
opacity: 100;
@@ -388,10 +382,15 @@
background-color:#2e4967;
text-align: center;
padding: 0 7px;
- line-height: 20px;
+ line-height: 24px;
border-radius: 4px;
margin-right: 6px;
}
+ .detailbtn:hover{
+ box-shadow: 0 0 0.03rem #fff700 !important;
+ color:#fff700 !important;
+ cursor: pointer;
+ }
}
.el-dialog-div {
//height: 50vh!important;
@@ -402,9 +401,6 @@
#echarts {
margin: 0;
padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
}
}
</style>
--
Gitblit v1.8.0