From 0ab574aa5f3d49cd78a41ccbd063ace5a422635c Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 12 四月 2021 17:07:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 994a8be..0844f9f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -3,10 +3,10 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : 6.93 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : 120343.18</span>
+ <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
</div>
</div>
<div class="form-echrts">
@@ -27,14 +27,13 @@
</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>
@@ -345,12 +344,13 @@
/deep/.el-input__inner{
position: relative;
width:140px;
- height:22px;
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;
}
@@ -369,7 +369,6 @@
border-radius: 6px;
width: 80px;
height: 22px;
- text-align: center;
}
input::-webkit-calendar-picker-indicator {
opacity: 100;
@@ -378,7 +377,7 @@
background-color:#2e4967;
text-align: center;
padding: 0 7px;
- line-height: 24px;
+ line-height: 20px;
border-radius: 4px;
margin-right: 6px;
}
@@ -392,6 +391,9 @@
#echarts {
margin: 0;
padding: 0;
+ //height: 3rem;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
}
}
</style>
--
Gitblit v1.8.0