From 270f4c72b8566400fe29f78099f5e206908ef501 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 15:52:32 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index f8484de..00a1f84 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,27 +1,34 @@
<!-- 鏃ユ暟鎹� -->
<template>
- <div id="Tab">
- <div class="infomation">
- <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">
- <div class="pickerMon">
- <div class="pickerData">
- <span> 寮�濮嬫椂闂�:</span>
- <span class="pickerTable">
- <el-date-picker type="datetime" v-model="value1">
- </el-date-picker>
- </span>
- </div>
- <div class="pickerData">
- <span >缁撴潫鏃堕棿:</span>
- <span class="pickerTable">
+ <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>
+ <div class="form-echrts">
+ <div class="from-search">
+ <el-row type="flex">
+ <el-col :span="14">
+ <div class="pickerMon">
+ <div class="pickerData">
+ <span> 寮�濮嬫椂闂�:</span>
+ <span class="pickerTable"><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"
@@ -323,6 +330,19 @@
.Infomation {
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;
--
Gitblit v1.8.0