From 44670fecb984ced41512446cdcd8a28a202a120f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 08 四月 2021 14:31:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
/dev/null | 257 --------------
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 34
src/components/table/summarySheets.vue | 73 ++-
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 2
src/components/table/components/tabHandover.vue | 7
src/assets/css/map/map-panel-style.less | 6
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 299 ++++++++++++++++
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 28
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 16
src/components/BaseNav/PublicBounced/PublicBounced.vue | 38 -
src/components/plugin/proj4leaflet.js | 1
src/components/table/components/SolidWaste.vue | 279 ++++++++++----
12 files changed, 599 insertions(+), 441 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 8bf42ab..8b5390c 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -376,4 +376,8 @@
padding: 10px;
text-align: center;
border-bottom: 1px solid @background-color-split;
-}
\ No newline at end of file
+}
+
+.el-tabs__header .is-top {
+
+}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
deleted file mode 100644
index ce510b7..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<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>
- </div>
- <div class="form-echrts">
- <div>
- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
- <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
- >
- <div class="el-dialog-div" style="height: 500px">
- <public-detailed-list v-bind="$attrs"></public-detailed-list>
- </div>
- </el-dialog>
- </div>
- <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
- </div>
- </div>
- </div>
-</template>
-
-<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
-
-export default {
- name: 'ECharts',
- components: {
- PublicDetailedList
- },
- data () {
- return {
- watchData: [],
- dialogVisible: false,
- dataDate: [],
- options: {
- title: {
- // text: '鎶樼嚎鍥惧爢鍙�'
- },
- color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'cross',
- label: {
- color: '#1a4245'
- }
- }
- },
- legend: {
- x: '200px',
- y: '30px',
- data: [{
- name: '姘哀鍖栫墿',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '浜屾哀鍖栫～',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '鐑熷皹',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '搴熸皵娴侀噺',
- textStyle: {
- color: '#00d0f9'
- }
- }]
- // pageTextStyle: {
- // color: '#fff'
- // }
- },
- grid: {
- left: '3%',
- right: '1%',
- bottom: '3%',
- // top: '1%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- // 鍥炬爣缂╂斁璁剧疆
- dataZoom: [{
- type: 'inside',
- start: 0,
- end: 100
- }, {
- start: 0,
- end: 100,
- show: false,
- // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
- handleSize: '80%',
- handleStyle: {
- color: '#fff',
- shadowBlur: 3,
- shadowColor: 'rgba(0, 0, 0, 0.6)',
- shadowOffsetX: 2,
- shadowOffsetY: 2
- }
- }],
- // x杞寸殑璁剧疆
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚', '鍛ㄥ叚'],
- axisLabel: { // x杞村叏閮ㄦ樉绀�
- rotate: 20,
- interval: 0,
- textStyle: {
- color: '#fff'
- }
- },
- splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
- show: true,
- lineStyle: {
- type: 'dashed'
- }
- },
- axisTick: { // x 杞村埢搴︽樉绀�
- show: false
- },
- axisLine: {
- lineStyle: {
- color: '#FFFFFF',
- width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
- }
- }
- },
- // Y 杞寸殑璁剧疆
- yAxis: [{
- type: 'value',
- // position: 'left', // 澶� Y 杞翠娇鐢�
- // name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
- name: '娴撳害(mg/m鲁)',
- axisLabel: {
- formatter: '{value}',
- textStyle: {
- color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
- }
- },
- axisPointer: {
- snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
- },
- splitLine: {
- show: false // y杞� 缃戞牸绾夸笉鏄剧ず
- },
- axisLine: {
- lineStyle: {
- color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
- width: 1
- }
- }
- }],
- series: [
- {
- name: '姘哀鍖栫墿',
- type: 'line',
- stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '浜屾哀鍖栫～',
- type: 'line',
- stack: '鎬婚噺',
- data: [150, 232, 201, 154, 190, 330, 410]
- },
- {
- name: '鐑熷皹',
- type: 'line',
- stack: '鎬婚噺',
- data: [320, 332, 301, 334, 390, 330, 320]
- },
- {
- name: '搴熸皵娴侀噺',
- type: 'line',
- stack: '鎬婚噺',
- data: [820, 932, 901, 934, 1290, 1330, 1320]
- }
- ]
- }
- }
- },
- methods: {
- drawChart: function () {
- const myChart = this.$echarts.init(this.$refs.main)
- myChart.setOption(this.options)
- }
- },
- mounted () {
- this.$nextTick(() => {
- this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
- // console.log(dataWatch)
- for (var i = 0; i < dataWatch.length; i++) {
- this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
- }
- // console.log(this.dataDate)
- })
- }
-}
-</script>
-
-<style scoped lang="less">
-.Infomation {
- margin-left: 10px;
- height: 0.2rem;
-}
-
-.el-tag {
- height: 25px;
- 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%;
- height: 1rem;
- border-top: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .el-dialog-div {
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
- }
-
- #echarts {
- margin: 0;
- padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
-}
-</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
new file mode 100644
index 0000000..3c40d37
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -0,0 +1,299 @@
+<!-- 灏忔椂鏁版嵁 -->
+<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>
+ </div>
+ <div class="form-echrts">
+ <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
+<!-- <div class="from-search">-->
+<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">-->
+<!--<!– <el-form-item label="瀹℃壒浜�">–>-->
+<!--<!– <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>–>-->
+<!--<!– </el-form-item>–>-->
+<!-- <div class="block">-->
+<!-- <el-date-picker-->
+<!-- class="date"-->
+<!-- v-model="value"-->
+<!-- type="datetimerange"-->
+<!-- range-separator="鑷�"-->
+<!-- start-placeholder="寮�濮嬫棩鏈�"-->
+<!-- end-placeholder="缁撴潫鏃ユ湡">-->
+<!-- </el-date-picker>-->
+<!-- </div>-->
+<!-- <el-form-item label="閲囨牱鐐规暟" class="text-size">-->
+<!-- <el-select v-model="formInline.region" placeholder="0">-->
+<!-- <el-option label="0" value="shanghai"></el-option>-->
+<!-- <el-option label="25" value="beijing"></el-option>-->
+<!-- <el-option label="50" value="beijing"></el-option>-->
+<!-- <el-option label="75" value="beijing"></el-option>-->
+<!-- <el-option label="100" value="beijing"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>-->
+<!-- <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-->
+<!-- >-->
+<!-- <div class="el-dialog-div" style="height: 500px">-->
+<!-- <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
+<!-- </div>-->
+ <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+// import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+
+export default {
+ name: 'ECharts',
+ components: {
+ // PublicDetailedList
+ },
+ data () {
+ return {
+ watchData: [],
+ dialogVisible: false,
+ dataDate: [],
+ value: '',
+ options: {
+ title: {
+ // text: '鎶樼嚎鍥惧爢鍙�'
+ },
+ color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ label: {
+ color: '#1a4245'
+ }
+ }
+ },
+ legend: {
+ x: '200px',
+ y: '30px',
+ data: [{
+ name: '姘哀鍖栫墿',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '鐑熷皹',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ }]
+ },
+ grid: {
+ left: '3%',
+ right: '1%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ },
+ // 鍥炬爣缂╂斁璁剧疆
+ dataZoom: [{
+ type: 'inside',
+ start: 0,
+ end: 100
+ }, {
+ start: 0,
+ end: 100,
+ show: false,
+ // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+ handleSize: '80%',
+ handleStyle: {
+ color: '#fff',
+ shadowBlur: 3,
+ shadowColor: 'rgba(0, 0, 0, 0.6)',
+ shadowOffsetX: 2,
+ shadowOffsetY: 2
+ }
+ }],
+ // x杞寸殑璁剧疆
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: ['12:00:00', '13:00:00', '14:00:00', '15:00:00', '16:00:00', '17:00:00', '18:00:00'],
+ axisLabel: { // x杞村叏閮ㄦ樉绀�
+ rotate: 20,
+ interval: 0,
+ textStyle: {
+ color: '#fff'
+ }
+ },
+ splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
+ show: true,
+ lineStyle: {
+ type: 'dashed'
+ }
+ },
+ axisTick: { // x 杞村埢搴︽樉绀�
+ show: false
+ },
+ axisLine: {
+ lineStyle: {
+ color: '#FFFFFF',
+ width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ }
+ }
+ },
+ // Y 杞寸殑璁剧疆
+ yAxis: [{
+ type: 'value',
+ // position: 'left', // 澶� Y 杞翠娇鐢�
+ // name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
+ name: '娴撳害(mg/m鲁)',
+ axisLabel: {
+ formatter: '{value}',
+ textStyle: {
+ color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ }
+ },
+ axisPointer: {
+ snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ },
+ splitLine: {
+ show: false // y杞� 缃戞牸绾夸笉鏄剧ず
+ },
+ axisLine: {
+ lineStyle: {
+ color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
+ width: 1
+ }
+ }
+ }],
+ series: [
+ {
+ name: '姘哀鍖栫墿',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [120, 132, 101, 134, 90, 230, 210]
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [150, 232, 201, 154, 190, 330, 410]
+ },
+ {
+ name: '鐑熷皹',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [320, 332, 301, 334, 390, 330, 320]
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [820, 932, 901, 934, 1290, 1330, 1320]
+ }
+ ]
+ },
+ formInline: {
+ user: '',
+ region: ''
+ }
+ }
+ },
+ methods: {
+ onSubmit () {
+ console.log('submit!')
+ },
+ drawChart: function () {
+ const myChart = this.$echarts.init(this.$refs.main)
+ myChart.setOption(this.options)
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ } else {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ }
+ myChart.resize()
+ }
+ }
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.drawChart()
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
+ // console.log(dataWatch)
+ for (var i = 0; i < dataWatch.length; i++) {
+ this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
+ }
+ // console.log(this.dataDate)
+ })
+ }
+}
+</script>
+
+<style scoped lang="less">
+.Infomation {
+ margin-left: 10px;
+ height: 0.2rem;
+}
+
+.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%;
+ height: 1rem;
+ border-top: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //height: 3rem;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
+}
+</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index a17a64a..09a7134 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -1,36 +1,36 @@
<template>
- <div class="win">
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
- </ul>
- <component :is="currentTab" v-bind="$attrs"></component>
- </div>
+ <div class="win">
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <ul class="tab">
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ </ul>
+ <component :is="currentTab" v-bind="$attrs"></component>
+ </div>
</template>
<script>
-import ECharts from './ECharts'
+import EChartsHour from './EChartsHour'
export default {
name: 'PublicChart',
components: {
- ECharts
+ EChartsHour
},
data () {
return {
- currentTab: 'ECharts'
+ currentTab: 'EChartsHour'
}
},
methods: {
tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
- debugger
+ // debugger
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 5da2a6f..0ca567b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,29 +1,31 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="500px">
+ <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鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
+ <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鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
+ <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鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
+ <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/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 3aa7f07..267759a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -14,7 +14,7 @@
<el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.porltName }}</el-col>
<el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</el-col>
</el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
+ <el-row type="flex" class="row-bg row-item-two" justify="space-around">
<el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
<el-col :span="18">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
<el-col :span="18">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
@@ -36,7 +36,7 @@
<el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteWaterdata.porltName }}</el-col>
<el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteWaterdata.MonTypeName }}</el-col>
</el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
+ <el-row type="flex" class="row-bg row-item-two" justify="space-around">
<el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteWaterdata.EmissDirecti }}</el-col>
<el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteWaterdata.ContrLevelShowName }}</el-col>
<el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteWaterdata.OrOutPortName }}</el-col>
@@ -77,7 +77,7 @@
margin-bottom: 10px;
background-color: rgba(33, 41, 69, 0.9);
//width: 6rem;
- height: 0.5rem;
+ //height: 0.5rem;
}
.main {
@@ -87,13 +87,19 @@
.main-matter {
font-size: 13px;
font-weight: normal;
- //padding: 10px 6px;
+ padding: 0px 6px;
border: 1px solid #396d83;
.row-item-one {
+ //flex-wrap: nowrap;
+ overflow: hidden;
+ margin-top: 6px;
margin-bottom: 7px;
+ //margin-left: 10px;
}
-
+ .row-item-two{
+ margin-bottom: 6px;
+ }
.el-row {
width: 100%;
color: #00d0f9;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index 426879e..4c581a3 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -26,7 +26,7 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- height: 2.1rem;
+ //height: 2rem;
}
.main {
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index b8ab6bf..5a47938 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,39 +14,13 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getWasteWaterMonitoring="getWasteWaterMonitoring"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails
-"></public-chart>
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
<public-video></public-video>
</div>
</div>
- <!-- <el-dialog-->
- <!-- :visible.sync="flag"-->
- <!-- width="70%"-->
- <!-- v-drag-->
- <!-- :modal="false">-->
- <!-- <div class="public-bounced-title">-->
- <!-- <span>{{ displayContentTitle }}</span>-->
- <!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
- <!-- </div>-->
- <!-- <div class="public-bounced-content">-->
- <!-- <div class="public-bounced-content-left">-->
- <!-- <public-tabs :displayContentTab="displayContentTab" :value="value"-->
- <!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
- <!-- <div class="public-bounced-content-left-bottom">-->
- <!-- <public-table v-if="value === 'gufei'"-->
- <!-- :displayContentTable="displayContentTable"></public-table>-->
- <!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
- <!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="public-bounced-content-right">-->
- <!-- <public-video></public-video>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- </el-dialog>-->
</div>
</template>
@@ -119,14 +93,16 @@
<style lang="less" scoped>
.public-bounced {
- width: 10rem;
+ width: 8rem;
//height: 2.6rem;
//width: 70vw;
//height: 30vh;
z-index: 999;
position: absolute;
- top: 5%;
- left: 5%;
+ //bottom: 2rem;
+ //left: 5rem;
+ top: 15%;
+ left: 15%;
background-color: #002432;
border: 1px #9fc5c8 solid;
@@ -159,7 +135,7 @@
justify-content: space-around;
.public-bounced-content-left {
- width: 6.8rem;
+ width: 4.8rem;
}
.public-bounced-content-right {
diff --git a/src/components/plugin/proj4leaflet.js b/src/components/plugin/proj4leaflet.js
index c07a40e..91ce411 100644
--- a/src/components/plugin/proj4leaflet.js
+++ b/src/components/plugin/proj4leaflet.js
@@ -1,5 +1,4 @@
/* eslint-disable */
-let L = window.L
(function (factory) {
var L, proj4;
if (typeof define === 'function' && define.amd) {
diff --git a/src/components/table/components/SolidWaste.vue b/src/components/table/components/SolidWaste.vue
index c90311a..89be52e 100644
--- a/src/components/table/components/SolidWaste.vue
+++ b/src/components/table/components/SolidWaste.vue
@@ -1,111 +1,201 @@
<template>
- <div class="Solid-Waste">
- <el-table
- class="tableBox"
- :data="tableData"
- :header-cell-style="tableHeaderColor"
- :cell-style="rowClass"
- @cell-click="handle"
- >
- <el-table-column
- width="30px"
- label=""
- >
- <template>
- <i class="el-icon-caret-right"></i>
- <span style="margin-left: 10px"></span>
- </template>
- </el-table-column>
- <el-table-column
- label="搴忓彿"
- width="60px"
- type="index">
- </el-table-column>
- <el-table-column
- prop="UserName"
- label="浼佷笟鍚嶇О"
- width="120px">
- <template slot-scope="scope">
- <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
- <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
- <div v-else >{{scope.row.UserName}}</div>
- </template>
- </el-table-column>
- <el-table-column label="浜х敓閲� 锛堝惃锛�">
- <el-table-column
- prop="AddOutPut"
- label="涓�鑸浐搴�"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="MonthOutPut"
- label="鍗遍櫓搴熺墿"
- width="100px">
- </el-table-column>
- </el-table-column>
- <el-table-column label="璐瓨鐘舵�侊紙涓級">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="100px">
- <template slot-scope="{row,$index}">
- <u v-if="$index!=1" >{{row.normal}}</u>
- <el-popover v-else
- placement="bottom-end"
- width="200"
- trigger="click"
- title="鐩戞祴鐐规帓鏀炬槑缁�"
- >
- <ChemicalWastewater></ChemicalWastewater>
- <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
- </el-popover>
- </template>
- </el-table-column>
- <el-table-column
- prop="warning"
- label="棰勮"
- width="100px">
- </el-table-column>
- </el-table-column>
- </el-table>
- </div>
+ <div class="waste-water">
+ <el-table
+ class="tableBox"
+ :data="tableData"
+ style="width: 100%"
+ :header-cell-style="tableHeaderColor"
+ :cell-style="rowClass"
+ @cell-click="handle"
+ >
+ <el-table-column
+ width="30px"
+ label=""
+ >
+ <template slot-scope="{row,$index}">
+ <!-- <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
+ <el-popover
+ placement="bottom"
+ trigger="click"
+ :disabled="!isShowIcon"
+ popper-class="popovers"
+ >
+ <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
+ <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
+ <!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="搴忓彿"
+ width="45px"
+ type="index">
+ </el-table-column>
+ <el-table-column
+ prop="UserName"
+ label="浼佷笟鍚嶇О"
+ width="120px">
+ <template slot-scope="scope">
+ <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
+ <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
+ <div v-else >{{scope.row.UserName}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="WasteWaters"
+ label="澶栨帓搴熸按閲忥紙m鲁锛�"
+ width="100px">
+ </el-table-column>
+ <el-table-column label="COD (t)">
+ <el-table-column
+ prop="AddOutPut"
+ label="绱浜х敓閲�"
+ width="70px">
+ </el-table-column>
+ <el-table-column
+ prop="MonthOutPut"
+ label="褰撴湀鐢熶骇閲�"
+ width="70px">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="姘ㄦ爱 (t)">
+ <el-table-column
+ prop="NH4NPut"
+ label="绱浜х敓閲�"
+ width="70px">
+ </el-table-column>
+ <el-table-column
+ prop="NH4NMonth"
+ label="褰撴湀鐢熶骇閲�"
+ width="70px">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
+ <el-table-column
+ prop="normal"
+ label="姝ｅ父"
+ width="60px">
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=2" >{{row.normal}}</u>
+ <el-popover v-else
+ placement="bottom-end"
+ width="200"
+ trigger="click"
+ popper-class="popovers"
+ title="鐩戞祴鐐规槑缁嗚〃"
+ >
+ <refinery></refinery>
+ <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ <!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
+ <!-- <i v-if="isShowIcon" class="el-icon-caret-bottom" slot="reference" @click="isbtn"></i>-->
+ <!-- <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="overProof"
+ label="瓒呮爣"
+ width="60px">
+ </el-table-column>
+ <el-table-column
+ prop="Abnormal"
+ label="寮傚父"
+ width="60px">
+ </el-table-column>
+ <el-table-column
+ prop="StopProduction"
+ label="鍋滀骇"
+ width="60px">
+ </el-table-column>
+ <el-table-column
+ prop="deficiency"
+ label="缂哄け"
+ width="60px">
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=1" >{{row.deficiency}}</u>
+ <el-popover v-else
+ placement="bottom-end"
+ width="200"
+ trigger="click"
+ title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�"
+ popper-class="popovers"
+ >
+ <MissingAlarm></MissingAlarm>
+ <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
+ </el-popover>
+ </template>
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ <!-- <ChemicalWastewater v-show="isShowIcon"></ChemicalWastewater>-->
+ <!-- </el-col>-->
+ <!-- </el-row>-->
+ </div>
</template>
<script>
-import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
+import ChemicalWastewater from './componented/ChemicalWastewater'
+import Refinery from '@components/table/components/componented/refinery'
+import MissingAlarm from '@components/table/components/componented/MissingAlarm'
export default {
name: 'SolidWaste',
components: {
+ MissingAlarm,
+ Refinery,
ChemicalWastewater
},
data () {
return {
+ isActive: '',
+ isShowIcon: false,
tableData: [{
UserName: '闆嗗洟鍚嶇О',
- AddOutPut: '580',
- MonthOutPut: '250',
- normal: '10',
- warning: '9'
+ WasteWaters: '',
+ AddOutPut: '',
+ MonthOutPut: '',
+ NH4NPut: '',
+ NH4NMonth: '',
+ normal: '',
+ overProof: '',
+ Abnormal: '',
+ StopProduction: '',
+ deficiency: ''
}, {
UserName: '澶╂触鐭冲寲',
WasteWaters: '116.6',
AddOutPut: '58.3',
MonthOutPut: '13.1',
- warning: '13.1',
- normal: '21'
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
}, {
UserName: 'xxxx鐐煎寲3',
WasteWaters: '116.6',
MonthOutPut: '13.1',
- warning: '13.1',
- normal: '21'
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
}, {
UserName: 'xxxx4',
WasteWaters: '116.6',
AddOutPut: '58.3',
MonthOutPut: '13.1',
- warning: '13.1',
- normal: '21'
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
+
}]
}
},
@@ -120,14 +210,35 @@
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
handle (row, column, event, cell) {
console.log(row.UserName)
+ },
+ doIcon (index) {
+ if (index !== 1) {
+ this.isShowIcon = false
+ this.isActive = ''
+ return
+ }
+ this.isShowIcon = !this.isShowIcon
+ if (index === this.isActive) {
+ this.isActive = ''
+ return
+ }
+ this.isActive = index
}
}
}
</script>
<style scoped>
-.Solid-Waste{
- width: 100%;
- height: 100%;
+.popovers{
+ width: auto !important;
+ background-color: gray !important;
}
+.popovers.el-popover{
+ padding:0;
+}
+.active {
+ /*color: red;*/
+ transform:rotate(90deg);
+}
+
</style>
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index ed43d60..35a1739 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -4,7 +4,8 @@
<waste-water></waste-water>
</el-tab-pane>
<el-tab-pane label="搴熸皵" name="second">
- <waste-gas></waste-gas>
+ <waste-water></waste-water>
+<!-- <waste-gas></waste-gas>-->
</el-tab-pane>
<el-tab-pane label="鍥哄簾" name="third">
<solid-waste></solid-waste>
@@ -17,14 +18,14 @@
<script>
import WasteWater from '@components/table/components/WasteWater'
-import WasteGas from '@components/table/components/WasteGas'
+// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/SolidWaste'
import AirQuality from '@components/table/components/AirQuality'
export default {
name: 'tabHandover',
components: {
WasteWater,
- WasteGas,
+ // WasteGas,
SolidWaste,
AirQuality
},
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 4ab8d7a..6592090 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,33 +1,41 @@
<template>
- <div class="summary-sheets">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="left">
- <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
- <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
- <!--<span class="icon-name">缁熻琛�</span>-->
- </div>
- </el-tooltip>
- <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻">
- <tab-handover></tab-handover>
- </Dialog >
+ <div class="summary-sheets">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="left">
+ <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
+ <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
+ <!--<span class="icon-name">缁熻琛�</span>-->
+ </div>
+ </el-tooltip>
+ <!-- <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻">-->
+ <!-- <tab-handover></tab-handover>-->
+ <!-- </Dialog >-->
+ <div class="dialog" v-drag v-show="dialogShow">
+ <tab-handover></tab-handover>
</div>
+ </div>
</template>
<script>
import tabHandover from '@components/table/components/tabHandover'
-import Dialog from '@views/popup/Dialog'
+// import Dialog from '@views/popup/Dialog'
+
+import '@/components/BaseNav/SolidWaste/directive/dir'
+
export default {
name: 'summary-sheet.vue',
components: {
- tabHandover,
- Dialog
+ tabHandover
+ // Dialog
},
data () {
return {
- summaryVisible: false
+ summaryVisible: false,
+ dialogShow: false
}
},
methods: {
closeBtn () {
+ this.dialogShow = !this.dialogShow
// const summary = document.getElementById('summary')
// summary.style.display = 'none'
this.$refs.summarySheets.show()
@@ -46,19 +54,28 @@
</script>
<style scoped lang="less">
- .summary-sheets {
- position: absolute;
- top: 0.42979rem;
- left: 0.14583rem;
- /*width: 850px;*/
- /*height: 265px;*/
- z-index:500;
+.summary-sheets {
+ position: absolute;
+ top: 0.42979rem;
+ left: 0.14583rem;
+ /*width: 850px;*/
+ /*height: 265px;*/
+ z-index: 500;
- /*color: #fff;*/
- .el-icon-c-scale-to-original {
- width: 30px;
- height: 30px;
- font-size: 30px;
- }
- }
+ .dialog {
+ //width: 800px;
+ //height: 300px;
+ position: absolute;
+ top: 15%;
+ left: 3rem;
+ }
+
+ /*color: #fff;*/
+
+ .el-icon-c-scale-to-original {
+ width: 30px;
+ height: 30px;
+ font-size: 30px;
+ }
+}
</style>
--
Gitblit v1.8.0