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 | 197 +++++++++++++++----------------------------------
1 files changed, 61 insertions(+), 136 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 8ea50f0..8605ebe 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -15,92 +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>-->
- <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">
+ <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>
- <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>
+ 閲囨牱鐐规暟:
+ <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>
@@ -309,26 +272,6 @@
return options
}
},
- methods: {
- onSubmit () {
- console.log('submit!')
- },
- drawChart: function () {
- const myChart = this.$echarts.init(this.$refs.main)
- myChart.setOption(this.options)
- window.onresize = function () {
- var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
- if (h1 > 700) {
- myChart.getDom().style.height = 3 + 'rem'
- myChart.getDom().style.width = 6 + 'rem'
- } else {
- myChart.getDom().style.height = 3 + 'rem'
- myChart.getDom().style.width = 6 + 'rem'
- }
- myChart.resize()
- }
- }
- },
mounted () {
this.$nextTick(() => {
this.drawChart()
@@ -387,50 +330,31 @@
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
.from-search{
- margin-top: 6px;
- .layoutFrom{
+ display: flex;
+ padding:5px;
+ >div{margin-left: 10px}
+ .pickerMon{
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{
+ >div:first-child{
+ margin-right: 10px;
+ }
+ .pickerData{
+ flex: 1;
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;
+ >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{
position: relative;
@@ -438,7 +362,8 @@
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;
@@ -448,7 +373,8 @@
background-color: #2e4967;
border: none;
border-radius: 6px;
- width: 40px;
+ width: 80px;
+ height: 22px;
}
.detailbtn{
background-color:#2e4967;
@@ -456,7 +382,6 @@
padding: 0 7px;
line-height: 20px;
border-radius: 4px;
- margin-right: 6px;
}
}
.el-dialog-div {
--
Gitblit v1.8.0