From b993a85744f7ff5fb72fbb5a68ffe64173cce2d7 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 09:54:35 +0800
Subject: [PATCH] 開始結束時間
---
src/components/panel/topicSearch/GasWasteSearch.vue | 17 +++++++++--------
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 20 +++++++++++++-------
src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue | 8 +++++---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 3 +++
src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue | 10 +++++-----
5 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index ee6fb4b..66cd357 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -58,6 +58,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -140,6 +141,8 @@
}
},
mounted () {
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
// this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
},
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 020ee49..51b1e20 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -43,7 +43,10 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div style="width:6rem;height:2rem;" id="echarts" ref="main">
+<!-- <div style="width: 5rem;height: 2rem">-->
+<!-- <div style="width:100%;height:100%;" id="echarts" ref="main">–>-->
+<!-- </div>-->
+ <div style="width:720px;height:252px;" id="echarts" ref="main">
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -62,7 +65,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
-
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
components: {
@@ -128,11 +131,11 @@
],
xdata: ['0鏃�', '1鏃�', '2鏃�', '3鏃�', '4鏃�', '5鏃�', '6鏃�', '7鏃�', '8鏃�', '9鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�', '14鏃�', '15鏃�', '16鏃�'],
ydatas: [
- { name: '姘哀鍖栫墿', data: ['34.44', '36.91', '37.65', '37.16', '38.03', '38.23', '37.21', '37.67', '37.97', '37.58', '36.61', '37.76', '37.27', '37.24', '35.86', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 50 },
- { name: '浜屾哀鍖栫～', data: ['4.98', '4.57', '4.19', '3.14', '3.80', '3.62', '3.33', '2.80', '3.13', '2.54', '3.08', '2.48', '1.97', '1.76', '0.82', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 35 },
- { name: '搴熸皵娴侀噺', data: ['381907.22', '376474.19', '378572.31', '379369.44', '385225.72', '388657.56', '330667.31', '26560.98', '0.00', '0.00', '49567.43', '357837.31', '376972.66', '379693.50', '379982.22', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#9ACD32', bzz: null },
- { name: '鐑熷皹', data: ['4.02', '4.17', '4.31', '4.00', '4.45', '4.40', '4.40', '4.25', '4.26', '4.18', '4.58', '4.21', '3.96', '3.83', '3.78', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 10 },
- { name: '娓╁害', data: ['46.55', '46.70', '46.47', '46.56', '46.57', '46.58', '46.56', '46.58', '46.69', '46.47', '46.58', '46.60', '46.54', '46.55', '46.60', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#F206FF', bzz: null }
+ { name: '姘哀鍖栫墿', data: ['34.44', '36.91', '37.65', '37.16', '38.03', '38.23', '37.21', '37.67', '37.97', '37.58', '36.61', '37.76', '37.27', '37.24', '35.86', '36.61', '37.21'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 50 },
+ { name: '浜屾哀鍖栫～', data: ['4.98', '4.57', '4.19', '3.14', '3.80', '3.62', '3.33', '2.80', '3.13', '2.54', '3.08', '2.48', '1.97', '1.76', '0.82', '1.01', '1.5'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 35 },
+ { name: '搴熸皵娴侀噺', data: ['381907.22', '376474.19', '378572.31', '379369.44', '385225.72', '388657.56', '330667.31', '26560.98', '0.00', '0.00', '49567.43', '357837.31', '376972.66', '379693.50', '379982.22', '379693.50', '379982.22'], zdcbcolor: 'red', zxcolor: '#9ACD32', bzz: null },
+ { name: '鐑熷皹', data: ['4.02', '4.17', '4.31', '4.00', '4.45', '4.40', '4.40', '4.25', '4.26', '4.18', '4.58', '4.21', '3.96', '3.83', '3.78', '3.83', '3.78'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 10 },
+ { name: '娓╁害', data: ['46.55', '46.70', '46.47', '46.56', '46.57', '46.58', '46.56', '46.58', '46.69', '46.47', '46.58', '46.60', '46.54', '46.55', '46.60', '46.55', '46.60'], zdcbcolor: 'red', zxcolor: '#F206FF', bzz: null }
],
yname: ' 娴撳害(mg/m鲁)',
// id:'mychart',
@@ -141,11 +144,14 @@
}
},
created () {
+ // console.log(dayjs().format('YYYY-MM-DD HH:mm:ss'))
// this.$nextTick(() => {
// this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
// }
},
mounted () {
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
// this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
},
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
index ca95a55..90d24e1 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
@@ -119,15 +119,15 @@
// }]
// }
// ],
- tableData: []
+ tableData: ''
}
},
created () {
this.$nextTick(() => {
- this.$attrs.ManualData.forEach(item => {
- this.tableData = [...item]
- })
- this.tableData.LabMonTime = 100
+ // this.$attrs.ManualData.forEach(item => {
+ this.tableData = [...this.$attrs.ManualData]
+ // })
+ // this.tableData.LabMonTime = 100
console.log(this.tableData)
})
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
index 4a92d45..8b40ac1 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
@@ -36,7 +36,9 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:2rem;" ref="echarts"></div>
+ <div style="width:5rem;height:2rem;" >
+ <div style="width:100%;height:100%;" ref="echarts"> </div>
+ </div>
</div>
</div>
</template>
@@ -206,8 +208,8 @@
}
},
mounted () {
- // const Day = new Date()
- // console.log(Day)
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
},
methods: {
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 80c2f12..102b5e5 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,17 +97,16 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+import mapApi from '@/api/mapApi'
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
+// import WfsHelper from '@components/helpers/WfsHelper'
export default {
name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
+ // labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
@@ -160,11 +159,13 @@
dataType: this.form.dataType
}
console.log(param)
- var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName(this.form.query.layerName)
- wfsHelper.addLike(this.form.query.key, this.form.keyword)
+ // var wfsHelper = new WfsHelper()
+ // wfsHelper.addTypeName(this.form.query.layerName)
+ // wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
- const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ // const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ const res = await mapApi.getWasteGas()
+ console.log(res)
if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
this.list = res.data.features
}
--
Gitblit v1.8.0