From 270f4c72b8566400fe29f78099f5e206908ef501 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 15:52:32 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/assets/css/map/map-panel-style.less | 32 ++++++-
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 64 ++++++++++-----
src/components/LayerController/logic/WasteWater.js | 19 ++--
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 74 ++++++++++++------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 14 ++-
5 files changed, 135 insertions(+), 68 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 46bf141..17257c8 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -333,12 +333,32 @@
}
/*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
-.cell {
- padding: 0;
+
+.el-table{
+ .el-table__body-wrapper::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background: none;
+ }
+ .cell{
+ padding: 0 3px !important;
+ i{
+ display: block;
+ font-style: normal;
+ font-size: 10px;
+ line-height: 12px;
+ }
+ }
}
+.el-table--border th{
+ border-right: none;
+ border-left: 1px solid #ddd;
+
+}
+.el-table--border th.gutter{border-left: none}
.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
- /* padding-left: 10px; */
+
text-align: center;
}
.el-table th>.cell {
@@ -351,9 +371,9 @@
height: 0;
}
.el-table td, .el-table th.is-leaf {
- border: none;
font-size: 0.08rem;
}
+
.el-table .warning-row {
background: #28304d;
}
@@ -367,10 +387,9 @@
//淇敼琛ㄦ牸楂樺害
.el-table td {
padding: 0!important;
- height: 30px;
- line-height: 30px;
font-size: 0.01rem !important;
}
+
/***********************************************鍔ㄧ敾鏁堟灉************/
.transition{
transition: all .5s;
@@ -420,3 +439,4 @@
.el-tabs__header .is-top {
}
+
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index f8484de..00a1f84 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,27 +1,34 @@
<!-- 鏃ユ暟鎹� -->
<template>
- <div id="Tab">
- <div class="infomation">
- <div>
- <span class="grid-content">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : 6.93 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : 120343.18</span>
- </div>
- </div>
- <div class="form-echrts">
- <div class="from-search">
- <div class="pickerMon">
- <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">
+ <div id="Tab">
+ <div class="infomation">
+ <!-- <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>-->
+ <!-- <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>-->
+ <!-- <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>-->
+ <!-- <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>-->
+ <el-row>
+ <el-col :span="6"><div class="grid-content bg-purple">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</div></el-col>
+ <el-col :span="6"><div class="grid-content bg-purple">浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</div></el-col>
+ <el-col :span="6"><div class="grid-content bg-purple">鐑熷皹 : 6.93 鏍囧噯 : 30</div></el-col>
+ <el-col :span="6"><div class="grid-content bg-purple">搴熸皵娴侀噺 : 120343.18</div></el-col>
+ <!-- <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>-->
+ </el-row>
+ </div>
+ <div class="form-echrts">
+ <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-date-picker></span>
+ </div>
+ <div class="pickerData">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
<el-date-picker
type="datetime"
v-model="value2"
@@ -323,6 +330,19 @@
.Infomation {
margin-left: 10px;
}
+
+ .el-tag {
+ height: 25px;
+ width: 140px;
+ line-height: 25px;
+ margin-right: 10px;
+ font-size: 10px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
+ padding: 0 15px;
+ }
+
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 0ca567b..7c0ce24 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,31 +1,53 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="500px" border>
- <el-scrollbar style="height: 50vh">
- <el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
- <el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
- <el-table-column label="姘哀鍖栫墿">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)" width="60"></el-table-column>
- </el-table-column>
- <el-table-column label="浜屾哀鍖栫～">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)" width="60"></el-table-column>
- </el-table-column>
- <el-table-column label="鐑熷皹">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)" width="60"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)" width="60"></el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵娴侀噺">
- <el-table-column prop="StdValue" label="姘旈噺"></el-table-column>
- </el-table-column>
- </el-scrollbar>
+ <el-table :data="tableData" max-height="600px" border>
+ <el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
+ <el-table-column label="姘哀鍖栫墿">
+ <el-table-column prop="MonQty" width="70">
+ <template slot="header">娴撳害 <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="OrglQty" width="70">
+ <template slot="header">鎶樼畻鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="ConvertQty" width="70">
+ <template slot="header">鏍囧噯鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="EmissQty" width="70">
+ <template slot="header">鎺掓斁閲� <i>(kg/h)</i></template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="浜屾哀鍖栫～">
+ <el-table-column prop="MonQty" width="60">
+ <template slot="header">娴撳害 <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="OrglQty" width="60">
+ <template slot="header">鎶樼畻鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="ConvertQty" width="60">
+ <template slot="header">鏍囧噯鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="EmissQty" width="60">
+ <template slot="header">鎺掓斁閲� <i>(kg/h)</i></template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鐑熷皹">
+ <el-table-column prop="MonQty" width="60">
+ <template slot="header">娴撳害 <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="OrglQty" width="60">
+ <template slot="header">鎶樼畻鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="ConvertQty" width="60">
+ <template slot="header">鏍囧噯鍊� <i>(mg/m鲁)</i></template>
+ </el-table-column>
+ <el-table-column prop="EmissQty" label="鎺掓斁閲�" width="60">
+ <template slot="header">鎺掓斁閲� <i>(kg/h)</i></template>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵娴侀噺" width="100">
+ <el-table-column prop="StdValue" label="姘旈噺"></el-table-column>
+ </el-table-column>
+ <el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
</el-table>
</div>
</template>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 584a661..d64fe00 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,6 +14,7 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
>
@@ -57,8 +58,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
- // getGasQueryOnlineMonData: []
+ getQueryOnlineMonHourData: [],
+ getQueryOnlineMonDateData: []
}
},
methods: {
@@ -85,12 +86,15 @@
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, hourData, value) {
+ setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getQueryOnlineMonData = hourData
+ this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
+ // console.log(dataDetail)
+ this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
// console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
+ // console.log(dateData)
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index d8abe79..af239fe 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -62,21 +62,22 @@
endTime: '2020-04-07 15:13:20',
dataType: '2'
}
- // const dateValue = {
- // onLineMonEmissPointId: '23',
- // monItemId: '28,31',
- // beginTime: '2020-04-06 15:13:20',
- // endTime: '2020-04-07',
- // dataType: '1'
- // }
+ const dateValue = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06',
+ endTime: '2020-04-07',
+ dataType: '1'
+ }
const hourData = await mapApi.getQueryOnlineMonData(hourValue)
- // const dateData = await mapApi.getQueryOnlineMonData(dateValue)
+ const dateData = await mapApi.getQueryOnlineMonData(dateValue)
+ console.log(dateData)
// const drawback = await mapApi.getWasteWaterMonitoring()
// console.log(drawback)
const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, 'feishui')
+ instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
--
Gitblit v1.8.0