From ca2a7113f660f523518c4be431534e7eebaa297e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/tabHandover.vue | 54 +++++++++++-------------------------------------------
1 files changed, 11 insertions(+), 43 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 1599ed3..0a92b64 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -4,12 +4,7 @@
<el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
</el-tabs>
<div>
- <component :is="gcComp" :PollutionSourcetableDataList="PollutionSourcetableDataList" v-if="PollutionSourcetableDataList"
- :WasteWatertableDataList="WasteWatertableDataList"
- :WasteGastableDataList="WasteGastableDataList"
- :SolidWastetableDataList="SolidWastetableDataList"
- :EnvironmentalRisktableDataList="EnvironmentalRisktableDataList"
- ></component>
+ <component :is="gcComp"></component>
</div>
</div>
</template>
@@ -22,8 +17,8 @@
import SolidWaste from '@components/table/components/WasteSolid'
import PollutionSource from '@components/table/components/PollutionSource'
import EnvironmentalRisk from '@components/table/components/EnvironmentalRisk'
-import mapApi from '@/api/mapApi'
-
+import Pipeline from '@components/table/components/Pipeline'
+import CorporateEmergency from '@components/table/components/CorporateEmergency'
import { TopicList } from '../../../conf/Topic'
export default {
name: 'tabHandover',
@@ -33,74 +28,47 @@
// SoilGroundwater,
SolidWaste,
PollutionSource,
- EnvironmentalRisk
+ EnvironmentalRisk,
+ Pipeline,
+ CorporateEmergency
},
data () {
return {
titleProp: '',
activeName: '姹℃煋婧�',
topicList: TopicList, // tab椤�
- gcComp: PollutionSource, // 榛樿鏄剧ず姹℃煋婧愬唴瀹�
- PollutionSourcetableDataList: null, // 姹℃煋婧愮粺璁℃暟鎹�
- WasteWatertableDataList: null, // 搴熸按缁熻鏁版嵁
- WasteGastableDataList: null, // 搴熸皵缁熻鏁版嵁
- SolidWastetableDataList: null, // 鍥哄簾缁熻鏁版嵁
- EnvironmentalRisktableDataList: null // 鐜椋庨櫓婧愮粺璁℃暟鎹�
+ gcComp: PollutionSource
}
- },
- mounted () {
- this.getStatisticsData(this.activeName)
},
methods: {
refsDatatitle (item) {
this.titleProp = item
},
- async getStatisticsData (obj) {
- switch (obj) {
- case '姹℃煋婧�':
- this.PollutionSourcetableDataList = await mapApi.getPollutionSourceStatistics()
- break
- case '搴熸按':
- this.WasteWatertableDataList = await mapApi.getWasteWaterStatistics()
- break
- case '搴熸皵':
- this.WasteGastableDataList = await mapApi.getWasteGasStatistics()
- break
- case '鍥哄簾':
- this.SolidWastetableDataList = await mapApi.getSolidWasteStatistics()
- break
- case '鐜椋庨櫓':
- this.EnvironmentalRisktableDataList = await mapApi.getEnvironmentalRiskStatistics()
- break
- }
- },
handleClick (tab, event) {
switch (tab.label) {
case '姹℃煋婧�':
this.gcComp = PollutionSource
- this.getStatisticsData('姹℃煋婧�')
break
case '搴熸按':
this.gcComp = WasteWater
- this.getStatisticsData('搴熸按')
break
case '搴熸皵':
this.gcComp = WasteGas
- this.getStatisticsData('搴熸皵')
break
case '鍥哄簾':
this.gcComp = SolidWaste
- this.getStatisticsData('鍥哄簾')
break
case '鐜椋庨櫓':
this.gcComp = EnvironmentalRisk
- this.getStatisticsData('鐜椋庨櫓')
break
case '鍦熷￥鍙婂湴涓嬫按':
this.gcComp = SoilGroundwater
break
case '绠＄嚎':
- // this.gcComp = AirQuality
+ this.gcComp = Pipeline
+ break
+ case '浼佷笟搴旀��':
+ this.gcComp = CorporateEmergency
break
}
}
--
Gitblit v1.8.0