From 91a1b18cd9b949c65e493d802cfb8393667b214d Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期四, 27 五月 2021 21:50:42 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/CorporateEmergency.vue | 39 ++
src/conf/Topic.js | 6
src/components/table/components/IndexStatistics.vue | 28 -
src/api/mapApi.js | 27 +
public/assets/wasteWater.json | 53 +++
src/components/table/components/EnvironmentalRisk.vue | 46 +++
src/components/table/components/Pipeline.vue | 37 ++
src/components/table/components/PollutionSource.vue | 44 +++
public/assets/wasteGas.json | 53 +++
public/assets/indexStatistics.json | 26 +
public/assets/warn.json | 34 ++
src/components/table/components/SoilGroundwater.vue | 55 ---
src/components/table/components/tabHandover.vue | 27 +
src/components/message/index.vue | 7
src/components/table/components/WasteWater.vue | 54 ---
src/components/table/components/WasteGas.vue | 54 ---
public/assets/soilGroundwater.json | 53 +++
public/assets/corporateEmergency.json | 53 +++
public/assets/pollutionSource.json | 22 +
public/assets/pipeline.json | 34 ++
src/components/table/components/Warn.vue | 34 --
21 files changed, 571 insertions(+), 215 deletions(-)
diff --git a/public/assets/corporateEmergency.json b/public/assets/corporateEmergency.json
new file mode 100644
index 0000000..1067828
--- /dev/null
+++ b/public/assets/corporateEmergency.json
@@ -0,0 +1,53 @@
+[
+ {
+ "UserName": "闆嗗洟鍚嶇О",
+ "WasteWaters": "",
+ "AddOutPut": "",
+ "MonthOutPut": "",
+ "NH4NPut": "",
+ "NH4NMonth": "",
+ "normal": "",
+ "overProof": "",
+ "Abnormal": "",
+ "StopProduction": "",
+ "deficiency": ""
+ },
+ {
+ "UserName": "澶╂触鐭冲寲",
+ "WasteWaters": "116.6",
+ "AddOutPut": "58",
+ "MonthOutPut": "13",
+ "NH4NPut": "58",
+ "NH4NMonth": "13",
+ "normal": "21",
+ "overProof": "2",
+ "Abnormal": "2",
+ "StopProduction": "2",
+ "deficiency": "2"
+ },
+ {
+ "UserName": "xxxx鐐煎寲3",
+ "WasteWaters": "116",
+ "MonthOutPut": "13",
+ "NH4NPut": "58",
+ "NH4NMonth": "13",
+ "normal": "21",
+ "overProof": "2",
+ "Abnormal": "2",
+ "StopProduction": "2",
+ "deficiency": "2"
+ },
+ {
+ "UserName": "xxxx4",
+ "WasteWaters": "116",
+ "AddOutPut": "58",
+ "MonthOutPut": "13",
+ "NH4NPut": "58",
+ "NH4NMonth": "13",
+ "normal": "21",
+ "overProof": "2",
+ "Abnormal": "2",
+ "StopProduction": "2",
+ "deficiency": "2"
+ }
+]
\ No newline at end of file
diff --git a/public/assets/indexStatistics.json b/public/assets/indexStatistics.json
new file mode 100644
index 0000000..7ff8888
--- /dev/null
+++ b/public/assets/indexStatistics.json
@@ -0,0 +1,26 @@
+[
+ {
+ "date": "闆嗗洟鍏徃",
+ "name": "35",
+ "province": "23",
+ "city": "11",
+ "address": 235,
+ "zip": 23
+ },
+ {
+ "date": "澶╂触鐭冲寲",
+ "name": 32,
+ "province": 33,
+ "city": 44,
+ "address": 53,
+ "zip": 200333
+ },
+ {
+ "date": "娴庡崡鐐煎寲",
+ "name": 35,
+ "province": 13,
+ "city": 33,
+ "address": 44,
+ "zip": 200333
+ }
+]
\ No newline at end of file
diff --git a/public/assets/pipeline.json b/public/assets/pipeline.json
new file mode 100644
index 0000000..923c277
--- /dev/null
+++ b/public/assets/pipeline.json
@@ -0,0 +1,34 @@
+[
+ {
+ "date": "闆嗗洟鍏徃",
+ "name": 1,
+ "province": 1,
+ "city": 0,
+ "address": 1,
+ "zip": 0
+ },
+ {
+ "date": "澶╂触鐭冲寲",
+ "name": 1,
+ "province": 0,
+ "city": 1,
+ "address": 1,
+ "zip": 2
+ },
+ {
+ "date": "XXX鐐煎寲",
+ "name": 1,
+ "province": 2,
+ "city": 0,
+ "address": 0,
+ "zip": 1
+ },
+ {
+ "date": "XXX鐐煎寲2",
+ "name": 1,
+ "province": 2,
+ "city": 0,
+ "address": 0,
+ "zip": 1
+ }
+]
\ No newline at end of file
diff --git a/public/assets/pollutionSource.json b/public/assets/pollutionSource.json
new file mode 100644
index 0000000..716e990
--- /dev/null
+++ b/public/assets/pollutionSource.json
@@ -0,0 +1,22 @@
+[
+ {
+ "UserName": "闆嗗洟鍏徃",
+ "ProductionFacilities": 45,
+ "GovernanceFacilities": 32
+ },
+ {
+ "UserName": "鍖椾含鐭虫补",
+ "ProductionFacilities": 22,
+ "GovernanceFacilities": 14
+ },
+ {
+ "UserName": "澶╂触鐭冲寲",
+ "ProductionFacilities": 3,
+ "GovernanceFacilities": 12
+ },
+ {
+ "UserName": "璐靛窞鐭虫补",
+ "ProductionFacilities": 10,
+ "GovernanceFacilities": 6
+ }
+]
\ No newline at end of file
diff --git a/public/assets/soilGroundwater.json b/public/assets/soilGroundwater.json
new file mode 100644
index 0000000..e74333e
--- /dev/null
+++ b/public/assets/soilGroundwater.json
@@ -0,0 +1,53 @@
+[
+ {
+ UserName: '闆嗗洟鍚嶇О',
+ WasteWaters: '',
+ AddOutPut: '',
+ MonthOutPut: '',
+ NH4NPut: '',
+ NH4NMonth: '',
+ normal: '',
+ overProof: '',
+ Abnormal: '',
+ StopProduction: '',
+ deficiency: ''
+ },
+ {
+ UserName: '澶╂触鐭冲寲',
+ WasteWaters: '116.6',
+ AddOutPut: '58.3',
+ MonthOutPut: '13.1',
+ 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',
+ 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',
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
+ }
+]
\ No newline at end of file
diff --git a/public/assets/warn.json b/public/assets/warn.json
new file mode 100644
index 0000000..923c277
--- /dev/null
+++ b/public/assets/warn.json
@@ -0,0 +1,34 @@
+[
+ {
+ "date": "闆嗗洟鍏徃",
+ "name": 1,
+ "province": 1,
+ "city": 0,
+ "address": 1,
+ "zip": 0
+ },
+ {
+ "date": "澶╂触鐭冲寲",
+ "name": 1,
+ "province": 0,
+ "city": 1,
+ "address": 1,
+ "zip": 2
+ },
+ {
+ "date": "XXX鐐煎寲",
+ "name": 1,
+ "province": 2,
+ "city": 0,
+ "address": 0,
+ "zip": 1
+ },
+ {
+ "date": "XXX鐐煎寲2",
+ "name": 1,
+ "province": 2,
+ "city": 0,
+ "address": 0,
+ "zip": 1
+ }
+]
\ No newline at end of file
diff --git a/public/assets/wasteGas.json b/public/assets/wasteGas.json
new file mode 100644
index 0000000..2ffbdf6
--- /dev/null
+++ b/public/assets/wasteGas.json
@@ -0,0 +1,53 @@
+[
+ {
+ "UserName": "闆嗗洟鍚嶇О",
+ "WasteWaters": "",
+ "AddOutPut": "",
+ "MonthOutPut": "",
+ "NH4NPut": "",
+ "NH4NMonth": "",
+ "normal": "",
+ "overProof": "",
+ "Abnormal": "",
+ "StopProduction": "",
+ "deficiency": ""
+ },
+ {
+ "UserName": "澶╂触鐭冲寲",
+ "WasteWaters": "116.6",
+ "AddOutPut": "58.3",
+ "MonthOutPut": "13.1",
+ "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",
+ "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",
+ "NH4NPut": "58.3",
+ "NH4NMonth": "13.1",
+ "normal": "21",
+ "overProof": "2",
+ "Abnormal": "2",
+ "StopProduction": "2",
+ "deficiency": "2"
+ }
+]
\ No newline at end of file
diff --git a/public/assets/wasteWater.json b/public/assets/wasteWater.json
new file mode 100644
index 0000000..2ffbdf6
--- /dev/null
+++ b/public/assets/wasteWater.json
@@ -0,0 +1,53 @@
+[
+ {
+ "UserName": "闆嗗洟鍚嶇О",
+ "WasteWaters": "",
+ "AddOutPut": "",
+ "MonthOutPut": "",
+ "NH4NPut": "",
+ "NH4NMonth": "",
+ "normal": "",
+ "overProof": "",
+ "Abnormal": "",
+ "StopProduction": "",
+ "deficiency": ""
+ },
+ {
+ "UserName": "澶╂触鐭冲寲",
+ "WasteWaters": "116.6",
+ "AddOutPut": "58.3",
+ "MonthOutPut": "13.1",
+ "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",
+ "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",
+ "NH4NPut": "58.3",
+ "NH4NMonth": "13.1",
+ "normal": "21",
+ "overProof": "2",
+ "Abnormal": "2",
+ "StopProduction": "2",
+ "deficiency": "2"
+ }
+]
\ No newline at end of file
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 4cec69b..62bd5f3 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -91,5 +91,32 @@
},
getRiskEnterprise (data) {
return axios.get('/assets/riskEnterprise.json', data)
+ },
+ getPollutionSourceStatistics (data) {
+ return axios.get('/assets/pollutionSource.json', data)
+ },
+ getWasteWaterStatistics (data) {
+ return axios.get('/assets/wasteWater.json', data)
+ },
+ getWasteGasStatistics (data) {
+ return axios.get('/assets/wasteGas.json', data)
+ },
+ getSolidWasteStatistics (data) {
+ return axios.get('/assets/wasteGas.json', data)
+ },
+ getEnvironmentalRiskStatistics (data) {
+ return axios.get('/assets/pollutionSource.json', data)
+ },
+ getIndexStatistics (data) {
+ return axios.get('/assets/indexStatistics.json', data)
+ },
+ getwarnStatistics (data) {
+ return axios.get('/assets/warn.json', data)
+ },
+ getPipelineStatistics (data) {
+ return axios.get('/assets/pipeline.json', data)
+ },
+ getCorporateEmergencyStatistics (data) {
+ return axios.get('/assets/corporateEmergency.json', data)
}
}
diff --git a/src/components/message/index.vue b/src/components/message/index.vue
index 3f6c687..f3741d8 100644
--- a/src/components/message/index.vue
+++ b/src/components/message/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="message">
- <el-tooltip :popper-class="'message-btn'" effect="dark" content="閫氱煡" placement="left">
+ <el-tooltip id="notification" :popper-class="'message-btn'" effect="dark" content="閫氱煡" placement="left">
<div :class='["iconBtn",selectGroup === true ? "active-button" : ""]' @click="changeSelectMouse" >
<i class="icon el-icon-bell" ></i>
</div>
@@ -71,6 +71,7 @@
this.selectGroup = !this.selectGroup
this.isShowMessage = this.selectGroup
if (this.selectGroup) {
+ document.querySelector('#notification').style.opacity = '0'
this.isShow = []
} else {
this.isShow = !this.isShow
@@ -88,6 +89,7 @@
handleClose (done) {
this.selectGroup = false
this.isShowMessage = false
+ document.querySelector('#notification').style.opacity = '1'
}
}
}
@@ -102,7 +104,8 @@
.dialogMessage{
/deep/ .el-dialog{
width: 30vw;
- left: 60%;
+ right: 0.14583rem;
+ top: 0.11979rem;
}
.conclusion{
text-indent:2em;
diff --git a/src/components/table/components/CorporateEmergency.vue b/src/components/table/components/CorporateEmergency.vue
new file mode 100644
index 0000000..0609e51
--- /dev/null
+++ b/src/components/table/components/CorporateEmergency.vue
@@ -0,0 +1,39 @@
+<template>
+ <div class="Pipeline">
+ <el-table class="tableBox" :data="tableData" border>
+ <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="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="WasteWaters" label="搴旀�ラ妗堟暟閲忥紙涓級"></el-table-column>
+ <el-table-column prop="AddOutPut" label="搴旀�ラ妗堝妗堝彿"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="搴旀�ョ墿璧勫瓨鏀剧偣"></el-table-column>
+ <el-table-column prop="NH4NPut" label="鐜繚浜嬩欢锛堜釜锛�"></el-table-column>
+ <el-table-column prop="NH4NMonth" label="鐜繚澶勭綒锛堜釜锛�"></el-table-column>
+ <el-table-column prop="normal" label="澶勭綒閲戦锛堜竾鍏冿級"></el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+import mapApi from '@/api/mapApi'
+export default {
+ name: 'CorporateEmergency',
+ data () {
+ return {
+ tableData: null
+ }
+ },
+ async mounted () {
+ this.tableData = await mapApi.getCorporateEmergencyStatistics()
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/table/components/EnvironmentalRisk.vue b/src/components/table/components/EnvironmentalRisk.vue
new file mode 100644
index 0000000..d67c894
--- /dev/null
+++ b/src/components/table/components/EnvironmentalRisk.vue
@@ -0,0 +1,46 @@
+<template>
+ <div class="PollutionSource">
+ <el-table class="tableBox" :data="tableData" :header-cell-style="tableHeaderColor" :cell-style="rowClass" border>
+ <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="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="ProductionFacilities" label="涓�绾ч闄╂簮锛堜釜锛�"></el-table-column>
+ <el-table-column prop="GovernanceFacilities" label="浜岀骇椋庨櫓婧愶紙涓級"></el-table-column>
+ <el-table-column prop="GovernanceFacilities" label="涓夌骇椋庨櫓婧愶紙涓級"></el-table-column>
+ <el-table-column prop="GovernanceFacilities" label="搴旀�ョ墿璧勫瓨鏀剧偣"></el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+import mapApi from '@/api/mapApi'
+export default {
+ name: 'AirQuality',
+ data () {
+ return {
+ tableData: null
+ }
+ },
+ async mounted () {
+ this.tableData = await mapApi.getEnvironmentalRiskStatistics()
+ },
+ methods: {
+ tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ },
+ // 琛ㄥご鏍峰紡璁剧疆
+ rowClass () {
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index ef47519..f5d31f0 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -66,37 +66,19 @@
</template>
<script>
-
+import mapApi from '@/api/mapApi'
export default {
name: 'IndexStatistics',
data () {
return {
titleProp: '',
activeName: 'first',
- tableData: [{
- date: '闆嗗洟鍏徃',
- name: '35',
- province: '23',
- city: '11',
- address: 235,
- zip: 23
- }, {
- date: '澶╂触鐭冲寲',
- name: 32,
- province: 33,
- city: 44,
- address: 53,
- zip: 200333
- }, {
- date: '娴庡崡鐐煎寲',
- name: 35,
- province: 13,
- city: 33,
- address: 44,
- zip: 200333
- }]
+ tableData: null
}
},
+ async mounted () {
+ this.tableData = await mapApi.getIndexStatistics()
+ },
methods: {
refsDatatitle (item) {
this.titleProp = item
diff --git a/src/components/table/components/Pipeline.vue b/src/components/table/components/Pipeline.vue
new file mode 100644
index 0000000..619ff80
--- /dev/null
+++ b/src/components/table/components/Pipeline.vue
@@ -0,0 +1,37 @@
+<template>
+ <div class="Pipeline">
+ <el-table class="tableBox" :data="tableData" border>
+ <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="date" label="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="name" label="绠＄嚎鎬婚暱搴︼紙km锛�"></el-table-column>
+ <el-table-column prop="province" label="鍛ㄨ竟鐜 "></el-table-column>
+ <el-table-column prop="city" label="鎷︽埅璁炬柦"></el-table-column>
+ <el-table-column prop="address" label="鍐呭鎺掑彛"></el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+import mapApi from '@/api/mapApi'
+export default {
+ name: 'Pipeline',
+ data () {
+ return {
+ tableData: null
+ }
+ },
+ async mounted () {
+ this.tableData = await mapApi.getPipelineStatistics()
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/table/components/PollutionSource.vue b/src/components/table/components/PollutionSource.vue
new file mode 100644
index 0000000..474e1dc
--- /dev/null
+++ b/src/components/table/components/PollutionSource.vue
@@ -0,0 +1,44 @@
+<template>
+ <div class="PollutionSource">
+ <el-table class="tableBox" :data="tableData" :header-cell-style="tableHeaderColor" :cell-style="rowClass" border>
+ <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="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="ProductionFacilities" label="鐢熶骇璁炬柦"></el-table-column>
+ <el-table-column prop="GovernanceFacilities" label="娌荤悊璁炬柦"></el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+import mapApi from '@/api/mapApi'
+export default {
+ name: 'AirQuality',
+ data () {
+ return {
+ tableData: null
+ }
+ },
+ async mounted () {
+ this.tableData = await mapApi.getPollutionSourceStatistics()
+ },
+ methods: {
+ tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ },
+ // 琛ㄥご鏍峰紡璁剧疆
+ rowClass () {
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/table/components/SoilGroundwater.vue b/src/components/table/components/SoilGroundwater.vue
index cad6f79..6c3538b 100644
--- a/src/components/table/components/SoilGroundwater.vue
+++ b/src/components/table/components/SoilGroundwater.vue
@@ -1,6 +1,6 @@
<template>
<div class="waste-water">
- <el-table class="tableBox" :data="tableData" style="width: 100%" @cell-click="handle">
+ <el-table class="tableBox" :data="SolidWastetableDataList" style="width: 100%" @cell-click="handle">
<el-table-column width="30px" label="">
<template slot-scope="{row,$index}">
<el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
@@ -84,6 +84,7 @@
<script>
// import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
+import mapApi from '@/api/mapApi'
// import MissingAlarm from '@components/table/components/componented/MissingAlarm'
export default {
name: 'WasteWater',
@@ -96,55 +97,6 @@
return {
isActive: '',
isShowIcon: false,
- tableData: [{
- UserName: '闆嗗洟鍚嶇О',
- WasteWaters: '',
- AddOutPut: '',
- MonthOutPut: '',
- NH4NPut: '',
- NH4NMonth: '',
- normal: '',
- overProof: '',
- Abnormal: '',
- StopProduction: '',
- deficiency: ''
- }, {
- UserName: '澶╂触鐭冲寲',
- WasteWaters: '116.6',
- AddOutPut: '58.3',
- MonthOutPut: '13.1',
- 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',
- 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',
- NH4NPut: '58.3',
- NH4NMonth: '13.1',
- normal: '21',
- overProof: '2',
- Abnormal: '2',
- StopProduction: '2',
- deficiency: '2'
-
- }],
tableHeader1: [
{ name: '浼佷笟鍚嶇О', width: '140', propS: 'value1' },
{ name: '鍦板潡鍚嶇О', width: '140', propS: 'value2' },
@@ -165,6 +117,9 @@
]
}
},
+ async mounted () {
+ this.tableData = await mapApi.getSolidWasteStatistics()
+ },
methods: {
tableHeaderColor ({ row, column, owIndex, columnIndex }) {
// return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index 0308373..f5f12e8 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -149,42 +149,18 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
export default {
data () {
return {
titleProp: '',
activeName: 'first',
- tableData: [{
- date: '闆嗗洟鍏徃',
- name: 1,
- province: 1,
- city: 0,
- address: 1,
- zip: 0
- }, {
- date: '澶╂触鐭冲寲',
- name: 1,
- province: 0,
- city: 1,
- address: 1,
- zip: 2
- }, {
- date: 'XXX鐐煎寲',
- name: 1,
- province: 2,
- city: 0,
- address: 0,
- zip: 1
- }, {
- date: 'XXX鐐煎寲2',
- name: 1,
- province: 2,
- city: 0,
- address: 0,
- zip: 1
- }]
+ tableData: null
}
},
+ async mounted () {
+ this.tableData = await mapApi.getwarnStatistics()
+ },
methods: {
refsDatatitle (item) {
this.titleProp = item
diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue
index 1bbe3b1..86a5779 100644
--- a/src/components/table/components/WasteGas.vue
+++ b/src/components/table/components/WasteGas.vue
@@ -63,6 +63,7 @@
import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+import mapApi from '@/api/mapApi'
export default {
name: 'WasteGas',
components: {
@@ -74,55 +75,7 @@
return {
isActive: '',
isShowIcon: false,
- tableData: [{
- UserName: '闆嗗洟鍚嶇О',
- WasteWaters: '',
- AddOutPut: '',
- MonthOutPut: '',
- NH4NPut: '',
- NH4NMonth: '',
- normal: '',
- overProof: '',
- Abnormal: '',
- StopProduction: '',
- deficiency: ''
- }, {
- UserName: '澶╂触鐭冲寲',
- WasteWaters: '116.6',
- AddOutPut: '58.3',
- MonthOutPut: '13.1',
- 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',
- 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',
- NH4NPut: '58.3',
- NH4NMonth: '13.1',
- normal: '21',
- overProof: '2',
- Abnormal: '2',
- StopProduction: '2',
- deficiency: '2'
-
- }],
+ tableData: null,
tableHeader1: [
{ name: '鎺掓斁鐐�', width: '140', propS: 'value1' },
{ name: '鍗曚綅閮ㄩ棬', width: '80', propS: 'value2' },
@@ -137,6 +90,9 @@
]
}
},
+ async mounted () {
+ this.tableData = await mapApi.getWasteGasStatistics()
+ },
methods: {
tableHeaderColor ({ columnIndex }) {
// return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index a4c51fd..6540b1a 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -70,6 +70,7 @@
import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+import mapApi from '@/api/mapApi'
export default {
name: 'WasteWater',
components: {
@@ -81,57 +82,12 @@
return {
isActive: '',
isShowIcon: false,
- tableData: [{
- UserName: '闆嗗洟鍚嶇О',
- WasteWaters: '',
- AddOutPut: '',
- MonthOutPut: '',
- NH4NPut: '',
- NH4NMonth: '',
- normal: '',
- overProof: '',
- Abnormal: '',
- StopProduction: '',
- deficiency: ''
- }, {
- UserName: '澶╂触鐭冲寲',
- WasteWaters: '116.6',
- AddOutPut: '58.3',
- MonthOutPut: '13.1',
- 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',
- 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',
- NH4NPut: '58.3',
- NH4NMonth: '13.1',
- normal: '21',
- overProof: '2',
- Abnormal: '2',
- StopProduction: '2',
- deficiency: '2'
-
- }]
+ tableData: null
}
},
+ async mounted () {
+ this.tableData = await mapApi.getWasteWaterStatistics()
+ },
methods: {
tableHeaderColor ({ row, column, owIndex, columnIndex }) {
// return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 1665928..43896f1 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -15,10 +15,12 @@
import SoilGroundwater from '@components/table/components/SoilGroundwater'
import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/WasteSolid'
-import AirQuality from '@components/table/components/AirQuality'
+import PollutionSource from '@components/table/components/PollutionSource'
+import EnvironmentalRisk from '@components/table/components/EnvironmentalRisk'
+import Pipeline from '@components/table/components/Pipeline'
+import CorporateEmergency from '@components/table/components/CorporateEmergency'
import { TopicList } from '../../../conf/Topic'
-
export default {
name: 'tabHandover',
components: {
@@ -26,14 +28,17 @@
// WasteGas,
// SoilGroundwater,
SolidWaste,
- AirQuality
+ PollutionSource,
+ EnvironmentalRisk,
+ Pipeline,
+ CorporateEmergency
},
data () {
return {
titleProp: '',
- activeName: 'gcComp',
- topicList: TopicList,
- gcComp: AirQuality
+ activeName: '姹℃煋婧�',
+ topicList: TopicList, // tab椤�
+ gcComp: PollutionSource // 榛樿鏄剧ず姹℃煋婧愬唴瀹�
}
},
methods: {
@@ -41,10 +46,9 @@
this.titleProp = item
},
handleClick (tab, event) {
- console.log(tab.label)
switch (tab.label) {
case '姹℃煋婧�':
- this.gcComp = AirQuality
+ this.gcComp = PollutionSource
break
case '搴熸按':
this.gcComp = WasteWater
@@ -56,13 +60,16 @@
this.gcComp = SolidWaste
break
case '鐜椋庨櫓':
- this.gcComp = AirQuality
+ this.gcComp = EnvironmentalRisk
break
case '鍦熷￥鍙婂湴涓嬫按':
this.gcComp = SoilGroundwater
break
case '绠＄嚎':
- this.gcComp = AirQuality
+ this.gcComp = Pipeline
+ break
+ case '浼佷笟搴旀��':
+ this.gcComp = CorporateEmergency
break
}
}
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index 8e4e0d7..ff80c53 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -47,14 +47,14 @@
isShow: false,
icon: 'iconditu',
comp: ''
-}, {
+}, /* {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
isShow: false,
icon: 'icondxs_green',
comp: ''
-}, {
+} */ {
name: '绠＄嚎',
id: 7,
checked: false,
@@ -68,7 +68,7 @@
isShow: false,
icon: 'iconqiye',
comp: ''
-}/* {
+} /* {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
--
Gitblit v1.8.0