From 7ff20fa3438e716cc2b7ff1ad3494af45d183fa4 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 11:13:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 224 ++++++++++++++++++++++---------------------------------
1 files changed, 91 insertions(+), 133 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 9ecea2e..8605ebe 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -15,111 +15,55 @@
</el-row>
</div>
<div class="form-echrts">
- <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
<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>-->
-<!-- <div class="block">-->
-<!-- <el-date-picker-->
-<!-- size="'mini"-->
-<!-- class="date"-->
-<!-- v-model="value"-->
-<!-- type="datetimerange"-->
-<!-- range-separator="鑷�"-->
-<!-- start-placeholder="寮�濮嬫棩鏈�"-->
-<!-- end-placeholder="缁撴潫鏃ユ湡">-->
-<!-- </el-date-picker>-->
-<!-- </div>-->
-<!-- <el-form-item label="閲囨牱鐐规暟" class="text-size">-->
-<!-- <el-select v-model="formInline.region" placeholder="0">-->
-<!-- <el-option label="0" value="shanghai"></el-option>-->
-<!-- <el-option label="25" value="beijing"></el-option>-->
-<!-- <el-option label="50" value="beijing"></el-option>-->
-<!-- <el-option label="75" value="beijing"></el-option>-->
-<!-- <el-option label="100" value="beijing"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item>-->
-<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
-<!-- </el-form-item>-->
-
-<!-- </el-form>-->
-<!-- <input list="students">-->
-<!-- <datalist id="students">-->
-<!-- <option value="Lily">-->
-<!-- <option value="Lucy">-->
-<!-- <option value="Jim">-->
-<!-- <option value="Lily">-->
-<!-- </datalist>-->
- <el-row type="flex" :gutter="20">
- <el-col :span="14">
-<!-- <el-row>-->
-<!-- <el-col :span="12">-->
-<!-- <el-row type="flex" justify="space-between">-->
-<!-- <el-col class="pickerData">-->
-<!-- 寮�濮嬫椂闂�:-->
-<!-- <el-date-picker-->
-<!-- type="date">-->
-<!-- </el-date-picker>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- </el-col>-->
-<!-- <el-col :span="12" type="flex">-->
-<!-- <el-row type="flex" justify="center">-->
-<!-- <el-col>-->
-<!-- 缁撴潫鏃堕棿:-->
-<!-- <el-date-picker-->
-<!-- type="date"-->
-<!-- >-->
-<!-- </el-date-picker>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
- </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>
-<!-- <div data-tap-disabled="true">-->
-<!-- 閲囨牱鐐规暟:-->
-<!-- <select id="source">-->
-<!-- <option value="1">0</option>-->
-<!-- <option value="2">25</option>-->
-<!-- <option value="3">50</option>-->
-<!-- <option value="4">75</option>-->
-<!-- <option value="5">100</option>-->
-<!-- </select>-->
-<!-- </div>-->
- </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 class="pickerMon">
+ <div class="pickerData">
+ <span> 寮�濮嬫椂闂�:</span>
+ <span class="pickerTable">
+ <el-date-picker type="datetime" v-model="value1">
+ </el-date-picker>
+ </span>
</div>
- </el-dialog>
- </el-col>
- </el-row>
- </div>
- <div style="width:600px;height:200px;" id="echarts" ref="main">
+ <div class="pickerData">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
+ <el-date-picker
+ type="datetime"
+ v-model="value2"
+ >
+ </el-date-picker>
+ </span>
+ </div>
+ </div>
+ <div>
+ 閲囨牱鐐规暟:
+ <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="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>
@@ -133,6 +77,8 @@
},
data () {
return {
+ value1: '',
+ value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
@@ -199,7 +145,7 @@
},
grid: {
left: '3%',
- right: '6%',
+ right: '3%',
bottom: '3%',
containLabel: true
},
@@ -365,7 +311,6 @@
}
.Infomation {
margin-left: 10px;
- height: 0.2rem;
}
.el-tag {
@@ -382,27 +327,54 @@
.form-echrts {
width: 100%;
- height: 1rem;
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
.from-search{
- //display: flex;
- //justify-content: space-between;
- .pickerData{
+ display: flex;
+ padding:5px;
+ >div{margin-left: 10px}
+ .pickerMon{
display: flex;
- justify-content: space-between;
+ >div:first-child{
+ margin-right: 10px;
+ }
+ .pickerData{
+ flex: 1;
+ display: flex;
+ >span{line-height: 22px}
+ .pickerTable{
+ margin-left: 6px;
+ /deep/.el-input__prefix{
+ }
+ /deep/.el-input__icon {
+ font-size: 0;
+ width: 100%;
+ }
+ }
+ }
+ }
+ /deep/.el-date-editor--datetime{
+ width: 100%;
}
/deep/.el-input__inner{
- width: 40px!important;
- height: 16px!important;
+ position: relative;
+ width: 0.9rem!important;
+ height: 0.125rem!important;
background-color: #2e4967;
+ color: #ffffff;
+ 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;
+ width: 80px;
+ height: 22px;
}
.detailbtn{
background-color:#2e4967;
@@ -410,7 +382,6 @@
padding: 0 7px;
line-height: 20px;
border-radius: 4px;
- margin-right: 6px;
}
}
.el-dialog-div {
@@ -419,25 +390,12 @@
//overflow: hidden;
}
- .from-search {
- background-color: red;
- .date{
- width: 200px;
- height: 30px;
- padding: 0;
- border: none;
- .el-icon-time{
- line-height: 30px;
- }
- }
- }
-
- #echarts {
- margin: 0;
- padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
- }
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //height: 3rem;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
+}
</style>
--
Gitblit v1.8.0