From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 143 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 110 insertions(+), 33 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index e4f7d3f..03d5345 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -15,31 +15,61 @@
</el-row>
</div>
<div class="form-echrts">
+ <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
<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-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>
+ <div class="pickerData">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
<el-date-picker
type="datetime"
v-model="value2"
>
</el-date-picker>
</span>
- </div>
</div>
- </el-col>
- <el-col :span="5">
- 閲囨牱鐐规暟:
+ </div>
+ <div class="sampling">
+ <span>
+ 閲囨牱鐐规暟:
+ </span>
<input list="source" id="ipt" class="echatsInput">
<datalist id="source">
<option value="0" />
@@ -48,9 +78,11 @@
<option value="75" />
<option value="100" />
</datalist>
- </el-col>
- <el-col class="detailbtn" :span="2" @click="onSubmit">鏌ヨ</el-col>
- <el-col :span="3">
+ </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"
@@ -63,8 +95,8 @@
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
- </el-col>
- </el-row>
+ </div>
+ </div>
</div>
<div style="width:5rem;height:2rem;" id="echarts" ref="main">
</div>
@@ -277,6 +309,26 @@
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()
@@ -336,24 +388,49 @@
//margin: 10px 10px 10px 10px;
.from-search{
margin-top: 6px;
- .pickerMon{
+ .layoutFrom{
display: flex;
- .pickerData{
- flex: 1;
+ .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;
- .pickerTable{
- margin-left: 6px;
- width: 40px;
+ .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: 0.9rem;
- font-size: 0;
+ /deep/.el-input__icon {
+ width: 1rem;
+ font-size: 0;
+ }
}
}
}
- }
- /deep/.el-date-editor--datetime{
- width: 100%;
}
/deep/.el-input__inner{
position: relative;
--
Gitblit v1.8.0