From dc109551277dd40494a03a84e8a0bb8b9073e38c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 14:11:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
public/assets/imgs/legend/marker_p_2.png | 0
public/assets/imgs/legend/cyj.png | 0
public/assets/imgs/legend/YanChen.png | 0
public/assets/imgs/legend/SO2.png | 0
src/api/mapApi.js | 4 +
public/assets/imgs/legend/red_airquality.png | 0
public/assets/imgs/legend/gray.png | 0
public/assets/imgs/legend/image15.gif | 0
public/assets/imgs/legend/green_airquality.png | 0
public/assets/imgs/legend/zlj.png | 0
public/assets/imgs/legend/cqj.png | 0
public/assets/imgs/legend/gwtl4.png | 0
public/assets/imgs/legend/zsj.png | 0
public/assets/imgs/legend/grn.png | 0
public/assets/imgs/legend/yellow_airquality.png | 0
public/assets/imgs/legend/orange_airquality.png | 0
public/assets/imgs/legend/WenDu.png | 0
public/assets/imgs/legend/image12.gif | 0
public/assets/imgs/legend/gwtl3.png | 0
src/components/LayerController/logic/WasteGas.js | 12 +++
public/assets/imgs/legend/green_airquality_2.png | 0
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 8 ++
src/api/mapUrl.js | 1
src/components/BaseNav/PublicBounced/PublicBounced.vue | 7 +
public/assets/imgs/legend/orange.png | 0
public/assets/imgs/legend/red.png | 0
public/assets/imgs/legend/image9.gif | 0
public/assets/imgs/legend/NOX.png | 0
public/assets/imgs/legend/green_airquality_3.png | 0
public/assets/imgs/legend/green.png | 0
public/assets/imgs/legend/gwtl.png | 0
public/assets/imgs/legend/gwtl2.png | 0
public/assets/imgs/legend/marker_p_1.png | 0
public/assets/imgs/legend/zongdan.png | 0
public/assets/imgs/legend/blue.png | 0
public/assets/imgs/legend/VOCs.png | 0
public/assets/imgs/legend/purple.png | 0
public/assets/imgs/legend/yellow.png | 0
src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue | 140 ++++++++++++++++++++++++++++++++++++++++++++++
39 files changed, 166 insertions(+), 6 deletions(-)
diff --git a/public/assets/imgs/legend/NOX.png b/public/assets/imgs/legend/NOX.png
new file mode 100644
index 0000000..98b699e
--- /dev/null
+++ b/public/assets/imgs/legend/NOX.png
Binary files differ
diff --git a/public/assets/imgs/legend/SO2.png b/public/assets/imgs/legend/SO2.png
new file mode 100644
index 0000000..0e2887e
--- /dev/null
+++ b/public/assets/imgs/legend/SO2.png
Binary files differ
diff --git a/public/assets/imgs/legend/VOCs.png b/public/assets/imgs/legend/VOCs.png
new file mode 100644
index 0000000..21cfbf8
--- /dev/null
+++ b/public/assets/imgs/legend/VOCs.png
Binary files differ
diff --git a/public/assets/imgs/legend/WenDu.png b/public/assets/imgs/legend/WenDu.png
new file mode 100644
index 0000000..74401e7
--- /dev/null
+++ b/public/assets/imgs/legend/WenDu.png
Binary files differ
diff --git a/public/assets/imgs/legend/YanChen.png b/public/assets/imgs/legend/YanChen.png
new file mode 100644
index 0000000..d7d2517
--- /dev/null
+++ b/public/assets/imgs/legend/YanChen.png
Binary files differ
diff --git a/public/assets/imgs/legend/blue.png b/public/assets/imgs/legend/blue.png
new file mode 100644
index 0000000..8943f6a
--- /dev/null
+++ b/public/assets/imgs/legend/blue.png
Binary files differ
diff --git a/public/assets/imgs/legend/cqj.png b/public/assets/imgs/legend/cqj.png
new file mode 100644
index 0000000..cd4d1f6
--- /dev/null
+++ b/public/assets/imgs/legend/cqj.png
Binary files differ
diff --git a/public/assets/imgs/legend/cyj.png b/public/assets/imgs/legend/cyj.png
new file mode 100644
index 0000000..639f7da
--- /dev/null
+++ b/public/assets/imgs/legend/cyj.png
Binary files differ
diff --git a/public/assets/imgs/legend/gray.png b/public/assets/imgs/legend/gray.png
new file mode 100644
index 0000000..4915b70
--- /dev/null
+++ b/public/assets/imgs/legend/gray.png
Binary files differ
diff --git a/public/assets/imgs/legend/green.png b/public/assets/imgs/legend/green.png
new file mode 100644
index 0000000..80463ea
--- /dev/null
+++ b/public/assets/imgs/legend/green.png
Binary files differ
diff --git a/public/assets/imgs/legend/green_airquality.png b/public/assets/imgs/legend/green_airquality.png
new file mode 100644
index 0000000..67f1d1c
--- /dev/null
+++ b/public/assets/imgs/legend/green_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/green_airquality_2.png b/public/assets/imgs/legend/green_airquality_2.png
new file mode 100644
index 0000000..ca7b11b
--- /dev/null
+++ b/public/assets/imgs/legend/green_airquality_2.png
Binary files differ
diff --git a/public/assets/imgs/legend/green_airquality_3.png b/public/assets/imgs/legend/green_airquality_3.png
new file mode 100644
index 0000000..d5f6a73
--- /dev/null
+++ b/public/assets/imgs/legend/green_airquality_3.png
Binary files differ
diff --git a/public/assets/imgs/legend/grn.png b/public/assets/imgs/legend/grn.png
new file mode 100644
index 0000000..70b4321
--- /dev/null
+++ b/public/assets/imgs/legend/grn.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl.png b/public/assets/imgs/legend/gwtl.png
new file mode 100644
index 0000000..2c1460d
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl2.png b/public/assets/imgs/legend/gwtl2.png
new file mode 100644
index 0000000..87c2011
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl2.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl3.png b/public/assets/imgs/legend/gwtl3.png
new file mode 100644
index 0000000..1dcbce3
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl3.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl4.png b/public/assets/imgs/legend/gwtl4.png
new file mode 100644
index 0000000..391f82c
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl4.png
Binary files differ
diff --git a/public/assets/imgs/legend/image12.gif b/public/assets/imgs/legend/image12.gif
new file mode 100644
index 0000000..f9b38b2
--- /dev/null
+++ b/public/assets/imgs/legend/image12.gif
Binary files differ
diff --git a/public/assets/imgs/legend/image15.gif b/public/assets/imgs/legend/image15.gif
new file mode 100644
index 0000000..15b1353
--- /dev/null
+++ b/public/assets/imgs/legend/image15.gif
Binary files differ
diff --git a/public/assets/imgs/legend/image9.gif b/public/assets/imgs/legend/image9.gif
new file mode 100644
index 0000000..9bbd325
--- /dev/null
+++ b/public/assets/imgs/legend/image9.gif
Binary files differ
diff --git a/public/assets/imgs/legend/marker_p_1.png b/public/assets/imgs/legend/marker_p_1.png
new file mode 100644
index 0000000..fc4a504
--- /dev/null
+++ b/public/assets/imgs/legend/marker_p_1.png
Binary files differ
diff --git a/public/assets/imgs/legend/marker_p_2.png b/public/assets/imgs/legend/marker_p_2.png
new file mode 100644
index 0000000..ee33170
--- /dev/null
+++ b/public/assets/imgs/legend/marker_p_2.png
Binary files differ
diff --git a/public/assets/imgs/legend/orange.png b/public/assets/imgs/legend/orange.png
new file mode 100644
index 0000000..cf3ceaf
--- /dev/null
+++ b/public/assets/imgs/legend/orange.png
Binary files differ
diff --git a/public/assets/imgs/legend/orange_airquality.png b/public/assets/imgs/legend/orange_airquality.png
new file mode 100644
index 0000000..c36469a
--- /dev/null
+++ b/public/assets/imgs/legend/orange_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/purple.png b/public/assets/imgs/legend/purple.png
new file mode 100644
index 0000000..b206049
--- /dev/null
+++ b/public/assets/imgs/legend/purple.png
Binary files differ
diff --git a/public/assets/imgs/legend/red.png b/public/assets/imgs/legend/red.png
new file mode 100644
index 0000000..9e29f57
--- /dev/null
+++ b/public/assets/imgs/legend/red.png
Binary files differ
diff --git a/public/assets/imgs/legend/red_airquality.png b/public/assets/imgs/legend/red_airquality.png
new file mode 100644
index 0000000..d43ca40
--- /dev/null
+++ b/public/assets/imgs/legend/red_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/yellow.png b/public/assets/imgs/legend/yellow.png
new file mode 100644
index 0000000..f1f339f
--- /dev/null
+++ b/public/assets/imgs/legend/yellow.png
Binary files differ
diff --git a/public/assets/imgs/legend/yellow_airquality.png b/public/assets/imgs/legend/yellow_airquality.png
new file mode 100644
index 0000000..567af17
--- /dev/null
+++ b/public/assets/imgs/legend/yellow_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/zlj.png b/public/assets/imgs/legend/zlj.png
new file mode 100644
index 0000000..79a22ab
--- /dev/null
+++ b/public/assets/imgs/legend/zlj.png
Binary files differ
diff --git a/public/assets/imgs/legend/zongdan.png b/public/assets/imgs/legend/zongdan.png
new file mode 100644
index 0000000..55639d9
--- /dev/null
+++ b/public/assets/imgs/legend/zongdan.png
Binary files differ
diff --git a/public/assets/imgs/legend/zsj.png b/public/assets/imgs/legend/zsj.png
new file mode 100644
index 0000000..f7d6414
--- /dev/null
+++ b/public/assets/imgs/legend/zsj.png
Binary files differ
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 51e2068..19a8423 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -40,6 +40,10 @@
getWasteGasMonData (data) {
return axios.get(mapUrl.getWasteGasMonData, data)
},
+ // 搴熸皵浜哄伐鏁版嵁
+ getWasteGasManualData (data) {
+ return axios.get(mapUrl.getWasteGasManualData, data)
+ },
// 搴熸按鐐�
getWasteWater (data) {
return axios.get(mapUrl.getWasteWater, data)
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index ef1af63..fceb5ae 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -14,6 +14,7 @@
export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
export const DataItems = $HOST + '/wasteWater/RTDB/DataItems'
export const getWasteGasMonData = $HOST + '/wasteGas/QueryOnlineMonData'
+export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'
export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 搴熸按鐐逛俊鎭�
export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
new file mode 100644
index 0000000..ca95a55
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
@@ -0,0 +1,140 @@
+<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"
+ label="妫�娴嬫椂闂�">
+ </el-table-column>
+ <el-table-column
+ label="姘哀鍖栫墿">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="浜屾哀鍖栫～">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鐑熷皹">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="榛戝害">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+</template>
+
+<script>
+export default {
+ 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: []
+ }
+ },
+ created () {
+ this.$nextTick(() => {
+ this.$attrs.ManualData.forEach(item => {
+ this.tableData = [...item]
+ })
+ this.tableData.LabMonTime = 100
+ console.log(this.tableData)
+ })
+ }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 76eda5b..627b3bf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -8,7 +8,7 @@
<li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("EChartsTable")'>浜哄伐鏁版嵁</li>
</ul>
<ul class="tab" v-else>
<li @click='tabTaggle("EChartsRealWasteWater")'>瀹炴椂鏁版嵁</li>
@@ -29,9 +29,11 @@
</template>
<script>
+ import ECharts from './Echarts'
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
-import ECharts from './Echarts'
+import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
+
import EChartsRealWasteWater from './EChartsRealWasteWater'
import EChartsHourWasteWater from './EChartsHourWasteWater'
import EChartsDateWasteWater from './EChartsDateWasteWater'
@@ -42,9 +44,11 @@
EChartsHour,
EChartsDate,
ECharts,
+ EChartsTable,
EChartsHourWasteWater,
EChartsDateWasteWater,
EChartsRealWasteWater
+
},
data () {
return {
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 01c6da1..cea3744 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,6 +15,7 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
ref="PublicChart"
>
</public-chart>
@@ -54,7 +55,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
},
@@ -79,10 +81,11 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, GasHourData, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bdc5e30..9b85faf 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -68,13 +68,21 @@
endTime: '2020-04-07 15:13:20',
dataType: '1'
}
+ const GasManualData = {
+ companyId: '3900100145',
+ labMonPointId: '219',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: ' 2020-04-07 15:13:20'
+ }
+ const ManualData = await mapApi.getWasteGasManualData(GasManualData)
+ console.log(ManualData)
const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
- console.log(Mondata)
+ // console.log(Mondata)
const result = await mapApi.getWasteGasDetails(dataValue)
// console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, 'feiqi')
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
--
Gitblit v1.8.0