From e2617bb02680f0755824cab9235f142b3e1ac708 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 12 四月 2021 09:59:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 89a6cf8..981b512 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -2,17 +2,12 @@
<template>
<div id="Tab">
<div class="infomation">
-<!-- <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>-->
-<!-- <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>-->
-<!-- <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>-->
-<!-- <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>-->
- <el-row>
- <el-col :span="6"><div class="grid-content bg-purple">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</div></el-col>
- <el-col :span="6"><div class="grid-content bg-purple">浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</div></el-col>
- <el-col :span="6"><div class="grid-content bg-purple">鐑熷皹 : 6.93 鏍囧噯 : 30</div></el-col>
- <el-col :span="6"><div class="grid-content bg-purple">搴熸皵娴侀噺 : 120343.18</div></el-col>
-<!-- <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>-->
- </el-row>
+ <div>
+ <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>
+ </div>
</div>
<div class="form-echrts">
<div class="from-search">
@@ -37,8 +32,8 @@
</div>
<div>
閲囨牱鐐规暟:
- <input list="source" id="ipt" class="echatsInput">
- <datalist id="source">
+ <input list="source" id="ipt" class="echatsInput" value="50">
+ <datalist id="source" >
<option value="0" />
<option value="25" />
<option value="50" />
@@ -313,18 +308,6 @@
margin-left: 10px;
}
-.el-tag {
- height: 25px;
- width: 140px;
- line-height: 25px;
- margin-right: 10px;
- font-size: 10px;
- background-color: rgba(0, 255, 246, 0.14);
- color: #00d0f9;
- border: none;
- padding: 0 15px;
-}
-
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
@@ -344,10 +327,14 @@
>span{line-height: 22px}
.pickerTable{
margin-left: 6px;
- /deep/.el-input__prefix{
+ /deep/.el-input{
+ font-size: 0px;
+ .el-input__prefix{
+ width: 100%;
+ }
}
/deep/.el-input__icon {
- font-size: 0;
+ //font-size: 0;
width: 100%;
}
}
@@ -358,6 +345,8 @@
}
/deep/.el-input__inner{
position: relative;
+ width: 0.9rem!important;
+ height: 0.125rem!important;
background-color: #2e4967;
color: #ffffff;
font-size: 12px;
@@ -374,6 +363,9 @@
width: 80px;
height: 22px;
}
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
.detailbtn{
background-color:#2e4967;
text-align: center;
--
Gitblit v1.8.0