From 7cf298a7995b835af4d1b6a1ef2b4d0f5ce7decc Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 16:33:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 1 +
src/components/LayerController/logic/WasteWater.js | 11 ++++++-----
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 12 ++++++------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index dcc006d..c28589c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -34,14 +34,14 @@
</div>
<div v-else-if="value == 'feishui'">
<el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</el-col>
- <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.DeptSname }}</el-col>
- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ setWasteGasdata.MonTypeName }}</el-col>
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab.Name }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab.porltName }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ displayContentTab.MonTypeName }}</el-col>
</el-row>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
- <el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab.EmissDirecti }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab.ContrLevelShowName }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab.OrOutPortName }}</el-col>
</el-row>
</div>
</div>
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index a992284..4ecd0e0 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -57,6 +57,7 @@
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
instance.setGasData(e.layer.options.test, 'feiqi')
+ console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
}
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 0be9e1a..210afcd 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -52,14 +52,15 @@
this.clickListener = async (e) => {
// console.log(e)
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- const result = await mapApi.getWasteWater(dataValue)
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.StoragePlaceId
+ // }
+ // const result = await mapApi.getWasteWater(dataValue)
// console.log(result)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setGasData(result, 'feishui')
+ instance.setGasData(e.layer.options.test, 'feishui')
+ console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
}
--
Gitblit v1.8.0