From 1162b1dc722a6658ac1f0bf1b6cf0b641d3f4674 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 15:46:14 +0800
Subject: [PATCH] 修改样式
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 44 ++++------
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 188 ++++++++++++++++++++++++----------------------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 7 -
3 files changed, 119 insertions(+), 120 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 712cff4..f8484de 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,75 +1,65 @@
<!-- 鏃ユ暟鎹� -->
<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>
- <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">
+ <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">
<el-date-picker
- type="datetime"
- v-model="value2"
+ type="datetime"
+ v-model="value2"
>
</el-date-picker>
</span>
- </div>
- </div>
- </el-col>
- <el-col :span="5">
- 閲囨牱鐐规暟:
- <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>
- </el-col>
- <el-col class="detailbtn" :span="2" @click="onSubmit">鏌ヨ</el-col>
- <el-col :span="3">
- <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>
- </el-col>
- </el-row>
- </div>
- <div style="width:5rem;height:2rem;" id="echarts" ref="main">
- </div>
+ </div>
</div>
+ <div>
+ 閲囨牱鐐规暟:
+ <input list="source" id="ipt" class="echatsInput" v-model="value" @change="datalistBtn">
+ <datalist id="source" @click="datalistBtn">
+ <option value="0" />
+ <option value="25" />
+ <option value="50" />
+ <option value="75" />
+ <option value="100" />
+ </datalist>
+ </div>
+ <div class="detailbtn" @click="onSubmit">鏌ヨ</div>
+ <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
+ </div>
+ <div style="width:5rem;height:2rem;" id="echarts" ref="main">
+ </div>
</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>
</template>
<script>
@@ -82,17 +72,35 @@
},
data () {
return {
+ value1: '',
+ value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
- value: '',
+ value: '50',
formInline: {
user: '',
region: ''
+ },
+ source: {
+
}
}
},
methods: {
+ datalistBtn (value) {
+ // var inputSelect = document.getElementById('#ipt').value
+ // var optionlength = document.getElementsByTagName('option').length
+ // var optionId = ''
+ // for (var i = 0; i < optionlength; i++) {
+ // // var optionValue = $('option').eq(i).attr('data-value')
+ // if (inputSelect == optionValue) {
+ // optionId = $('option').eq(i).attr('data-id')
+ // }
+ // }
+ console.log(1)
+ // this.value = value
+ },
onSubmit () {
console.log('submit!')
},
@@ -315,36 +323,33 @@
.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;
//margin: 10px 10px 10px 10px;
.from-search{
- margin-top: 6px;
+ display: flex;
+ padding:5px;
+ >div{margin-left: 10px}
.pickerMon{
- display: flex;
+ display: flex;
+ >div:first-child {
+ margin-right: 10px;
+ }
.pickerData{
flex: 1;
display: flex;
+ >span{line-height: 22px}
.pickerTable{
margin-left: 6px;
- width: 40px;
-
+ /deep/.el-input{
+ font-size: 0px;
+ .el-input__prefix{
+ width: 100%;
+ }
+ }
/deep/.el-input__icon {
- width: 0.9rem;
+ width: 100%;
font-size: 0;
}
}
@@ -359,18 +364,23 @@
height: 0.125rem!important;
background-color: #2e4967;
color: #ffffff;
- font-size: 8px;
+ font-size: 12px;
+ height: 24px;
padding: 0;
//padding-left:20px ;
//padding: 0!important;
}
.echatsInput{
- color: #00ffff;
- background-color: #2e4967;
- border: none;
- border-radius: 6px;
- width: 40px;
+ color: #00ffff;
+ background-color: #2e4967;
+ border: none;
+ border-radius: 6px;
+ width: 80px;
+ height: 22px;
}
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
.detailbtn{
background-color:#2e4967;
text-align: center;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 8605ebe..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%;
}
}
@@ -376,6 +363,9 @@
width: 80px;
height: 22px;
}
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
.detailbtn{
background-color:#2e4967;
text-align: center;
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 29f6209..584a661 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -16,7 +16,6 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
- :getGasQueryOnlineMonData = 'getGasQueryOnlineMonData'
>
</public-chart>
</div>
@@ -58,8 +57,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: [],
- getGasQueryOnlineMonData: []
+ getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -80,7 +79,7 @@
setGasData (data, dataDetails, GasHourData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
- this.getGasQueryOnlineMonData = GasHourData
+ this.getQueryOnlineMonData = GasHourData
// console.log(dataDetails)
this.displayContentTitle = data.Name
this.flag = true
--
Gitblit v1.8.0