From 610977c95dec18b78e3e50be5d172d2cb94de86a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 12 四月 2021 09:55:36 +0800
Subject: [PATCH] 修改废气图表
---
src/assets/css/map/map-panel-style.less | 2
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 138 +++++++++++++++++++++-------------
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 74 ++++++------------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 14 +--
4 files changed, 116 insertions(+), 112 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 17257c8..5c5a3a9 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -335,6 +335,7 @@
/*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
.el-table{
+ border-bottom: 1px solid #fff;
.el-table__body-wrapper::-webkit-scrollbar {
width: 0;
height: 0;
@@ -353,7 +354,6 @@
.el-table--border th{
border-right: none;
border-left: 1px solid #ddd;
-
}
.el-table--border th.gutter{border-left: none}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 00a1f84..0d40bc9 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,34 +1,27 @@
<!-- 鏃ユ暟鎹� -->
<template>
- <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">
+ <div id="Tab">
+ <div class="animation">
+ <div class="infomation">
+ <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">
<el-date-picker
type="datetime"
v-model="value2"
@@ -39,7 +32,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <input list="source" id="ipt" class="echatsInput" v-model="value" @change="datalistBtn">
+ <input list="source" id="ipt" class="echatsInput" @change="datalistBtn">
<datalist id="source" @click="datalistBtn">
<option value="0" />
<option value="25" />
@@ -84,7 +77,7 @@
watchData: [],
dialogVisible: false,
myChar: null,
- value: '50',
+ value: '',
formInline: {
user: '',
region: ''
@@ -315,34 +308,71 @@
this.myChart = this.$echarts.init(this.$refs.main)
this.myChart.setOption(opitons)
})
+ },
+ // 鍦板浘鍒囨崲
+ updateBasemapList () {
+ this.basemapList = this.basemapHelper.getBasemapList()
+ console.log(this.basemapList)
+ },
+ changeBasemap (itm) {
+ const code = itm.code
+ this.basemapList.forEach((item) => {
+ if (item.code === code) {
+ console.log(this.currentBaseMapCode)
+ if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
+ this.currentBaseMapCode = code
+ this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
+ } else {
+ this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
+ }
+
+ this.basemapHelper.getBasemapList().forEach((item) => {
+ item.layer.bringToBack()
+ })
+ }
+ })
}
}
</script>
<style scoped lang="less">
- .grid-content{
- font-size: 8px!important;
- background-color:#2e4967;
- text-align: center;
- margin: 0 2px 4px 2px;
- border-radius: 2px;
- }
- .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;
- }
-
+//.animation{
+// padding: 0 1rem;
+// overflow: hidden;
+// //width: 1rem;
+// .infomation{
+// display: flex;
+// //margin: 0 1rem;
+// overflow: hidden;
+// animation: move 1s linear 0s infinite;
+// @keyframes move {
+// 0% {
+// }
+// 100% {
+// transform: translateX(-10%);
+// }
+// }
+// /* 榧犳爣缁忚繃marquee 灏卞仠姝㈠姩鐢� */
+// &:hover {
+// //z-index: 9999999;
+// animation-play-state: paused;
+// }
+// }
+//}
+ .grid-content {
+ font-size: 8px !important;
+ background-color: #2e4967;
+ text-align: center;
+ margin: 0 2px 4px 2px;
+ border-radius: 2px;
+ }
+.animation {
+ //width: 600px;
+ //height: 0.06rem;
+ .Infomation {
+ margin-left: 10px;
+ }
+}
.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 7c0ce24..0ca567b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,53 +1,31 @@
<template>
<div class="PublicDetailedList">
- <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 :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>
</div>
</template>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d64fe00..b221e49 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,7 +14,6 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
>
@@ -58,8 +57,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonHourData: [],
- getQueryOnlineMonDateData: []
+ getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -81,7 +80,7 @@
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
- // console.log(dataDetails)
+ console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
@@ -89,12 +88,9 @@
setWaterData (dataWater, dataDetail, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
- // console.log(dataDetail)
- this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
+ this.getQueryOnlineMonData = hourData
// console.log(drawData)
- this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
- // console.log(dateData)
+ this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
--
Gitblit v1.8.0