From 6d4e23a29f40b4739aa46436e5b703ecde4b39aa Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 11:37:00 +0800
Subject: [PATCH] table数据
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 3
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 16 +----
src/components/panel/topicSearch/GasWasteSearch.vue | 10 --
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 108 +++++++++--------------------------
4 files changed, 36 insertions(+), 101 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index 4ead4bd..44986ec 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -335,7 +335,8 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '5%'
+ left: '12%',
+ bottom: '15%'
// containLabel: true
},
legend: { // 鍥句緥
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 22a84ad..8ec3a47 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -25,16 +25,6 @@
</span>
</div>
</div>
-<!-- <div>-->
-<!-- 閲囨牱鐐规暟:-->
-<!-- <el-select v-model="formInline.region">-->
-<!-- <el-option label="0" value="0"></el-option>-->
-<!-- <el-option label="25" value="25"></el-option>-->
-<!-- <el-option label="50" value="50"></el-option>-->
-<!-- <el-option label="75" value="75"></el-option>-->
-<!-- <el-option label="100" value="100"></el-option>-->
-<!-- </el-select>-->
-<!-- </div>-->
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
@@ -43,7 +33,6 @@
<!-- 鏄庣粏寮规 -->
<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
@@ -143,7 +132,7 @@
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.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)
},
updated () {
@@ -346,7 +335,8 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '5%'
+ left: '6%',
+ bottom: '15%'
// containLabel: true
},
legend: { // 鍥句緥
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
index 90d24e1..241625a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -1,59 +1,52 @@
<template>
-<!-- <el-table :data="tableData" style="width:730px" height="200px">-->
-<!-- <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
-<!-- :label="item.label">-->
-<!-- <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
-<!-- </el-table-column>-->
-<!-- </el-table-column>-->
-<!-- </el-table>-->
<el-table
:data="tableData"
style="width: 100%;height: 100%">
<el-table-column
- prop="tableData.LabMonTime"
+ prop="LabMonTime"
label="妫�娴嬫椂闂�">
</el-table-column>
<el-table-column
label="姘哀鍖栫墿">
<el-table-column
- prop="tableData.MonItemId"
+ prop="NOMonTime"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="NOEndTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="浜屾哀鍖栫～">
<el-table-column
- prop="tableData.MonItemId"
+ prop="SOMontime"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="SoEndTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="鐑熷皹">
<el-table-column
- prop="tableData.MonItemId"
+ prop="MonItemId"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="EndMonTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
- label="榛戝害">
+ label="闈炵敳鐑锋�荤儍">
<el-table-column
- prop="tableData.MonItemId"
+ prop="MonItemId"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="MonItemId"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
@@ -65,71 +58,28 @@
name: 'EChartsTable',
data () {
return {
- // tableLabel: [
- // {
- // label: '妫�娴嬫椂闂�',
- // prop: 'StoragePlaceId'
- // },
- // {
- // label: '浜屾哀鍖栫～',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '姘哀鍖栫墿',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '鐑熷皹',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '榛戝害',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // }
- // ],
- tableData: ''
+ tableData: [{
+ LabMonTime: '2021-02-05 09:54',
+ MonItemId: '---',
+ EndMonTime: '30',
+ NOMonTime: '44',
+ NOEndTime: '100',
+ SOMontime: '9',
+ SoEndTime: '50'
+ }, {
+ LabMonTime: '2021-01-14 10:15',
+ MonItemId: '---',
+ EndMonTime: '30',
+ NOMonTime: '70',
+ NOEndTime: '100',
+ SOMontime: '---',
+ SoEndTime: '50'
+ }]
}
},
created () {
- this.$nextTick(() => {
- // this.$attrs.ManualData.forEach(item => {
- this.tableData = [...this.$attrs.ManualData]
- // })
- // this.tableData.LabMonTime = 100
- console.log(this.tableData)
- })
+ // this.tableData = [...this.$attrs.ManualData]
+ // console.log(this.tableData)
}
}
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index c852889..810d5ec 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,24 +97,18 @@
</template>
<script>
-<<<<<<< HEAD
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
-=======
+// import WfsHelper from '@components/helpers/WfsHelper'
+// import AjaxUtils from '@utils/AjaxUtils'
import mapApi from '@/api/mapApi'
// import WfsHelper from '@components/helpers/WfsHelper'
->>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
export default {
name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
list: [],
-<<<<<<< HEAD
-=======
// labelList: PipelineTypeOptions[0].labelList,
->>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
--
Gitblit v1.8.0