From 3725d8463081a03ab3e342bd9610c20cf1ca09c2 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 10:43:14 +0800
Subject: [PATCH] 修改为div
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 183 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 158 insertions(+), 25 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 3c40d37..1973e76 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -2,20 +2,28 @@
<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-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">
<!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
-<!-- <div class="from-search">-->
+ <div class="from-search">
<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">-->
-<!--<!– <el-form-item label="瀹℃壒浜�">–>-->
-<!--<!– <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>–>-->
-<!--<!– </el-form-item>–>-->
+<!-- <el-form-item label="瀹℃壒浜�">-->
+<!-- <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>-->
+<!-- </el-form-item>-->
<!-- <div class="block">-->
<!-- <el-date-picker-->
+<!-- size="'mini"-->
<!-- class="date"-->
<!-- v-model="value"-->
<!-- type="datetimerange"-->
@@ -36,36 +44,78 @@
<!-- <el-form-item>-->
<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
<!-- </el-form-item>-->
+
<!-- </el-form>-->
-<!-- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>-->
-<!-- <el-dialog :visible.sync="dialogVisible"-->
-<!-- :append-to-body="true"-->
-<!-- :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"-->
-<!-- width="68%"-->
-<!-- center-->
-<!-- v-dialogDrag-->
-<!-- >-->
-<!-- <div class="el-dialog-div" style="height: 500px">-->
-<!-- <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
-<!-- </div>-->
-<!-- </el-dialog>-->
-<!-- </div>-->
- <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
+ <div class="layoutFrom">
+ <div class="pickerMon">
+ <div class="pickerData pickerDataLeft">
+ <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"
+ >
+ </el-date-picker>
+ </span>
+ </div>
+ </div>
+ <div class="sampling">
+ <span>
+ 閲囨牱鐐规暟:
+ </span>
+ <input list="source" id="ipt" class="echatsInput">
+ <datalist id="source">
+ <option value="0" />
+ <option value="25" />
+ <option value="50" />
+ <option value="75" />
+ <option value="100" />
+ </datalist>
+ </div>
+ <div class="InquiryBtn">
+ <div>鏌ヨ</div>
+ </div>
+ <div class="detailBox">
+ <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
+ <el-dialog :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
+ width="68%"
+ center
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 500px">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
+ </div>
+ </div>
+ </div>
+ <div style="width:100%;height:300px;" id="echarts" ref="main">
</div>
</div>
</div>
</template>
<script>
-// import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
export default {
name: 'ECharts',
components: {
- // PublicDetailedList
+ PublicDetailedList
},
data () {
return {
+ value1: '',
+ value2: '',
watchData: [],
dialogVisible: false,
dataDate: [],
@@ -260,6 +310,13 @@
</script>
<style scoped lang="less">
+.grid-content{
+ font-size: 8px!important;
+ background-color:#2e4967;
+ text-align: center;
+ margin: 0 2px 4px 2px;
+ border-radius: 2px;
+}
.Infomation {
margin-left: 10px;
height: 0.2rem;
@@ -279,9 +336,85 @@
.form-echrts {
width: 100%;
- height: 1rem;
+ height: 2rem;
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
+ .from-search{
+ margin-top: 6px;
+ .layoutFrom{
+ display: flex;
+ .sampling{
+ margin-left: 100px;
+ >span{
+ margin-right: 10px;
+ }
+ }
+ .InquiryBtn{
+ margin-left: 30px;
+ width: 36px;
+ height: 20px;
+ font-size: 8px;
+ background-color:#2e4967 ;
+ text-align: center;
+ border-radius: 3px;
+ }
+ .detailBox{
+ margin-left: 30px;
+ }
+ .pickerMon{
+ display: flex;
+ .pickerDataLeft{
+ margin-left: 10px;
+ margin-right: 90px;
+ }
+ .pickerData{
+ flex: 1;
+ display: flex;
+ >span{
+ margin-right: 15px;
+ }
+ .pickerTable{
+ margin-left: 6px;
+ width: 40px;
+
+ /deep/.el-input__icon {
+ width: 1rem;
+ font-size: 0;
+ }
+ }
+ }
+ }
+ }
+ ///deep/.el-date-editor--datetime{
+ // width: 100%;
+ //}
+ /deep/.el-input__inner{
+ position: relative;
+ width: 0.9rem!important;
+ height: 0.125rem!important;
+ background-color: #2e4967;
+ color: #ffffff;
+ font-size: 8px;
+ padding: 0;
+ //padding-left:20px ;
+ //padding: 0!important;
+ }
+ .echatsInput{
+ color: #00ffff;
+ background-color: #2e4967;
+ border: none;
+ border-radius: 6px;
+ width: 40px;
+ }
+ .detailbtn{
+ background-color:#2e4967;
+ text-align: center;
+ padding: 0 7px;
+ line-height: 20px;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ }
.el-dialog-div {
//height: 50vh!important;
overflow: auto;
--
Gitblit v1.8.0