From 78b643de0b8690d566146858cd781be98d01777d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 10:00:50 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index eb3437c..9e972be 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -20,6 +20,7 @@
<SolidContent ref="SolidWastePopup"></SolidContent>
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
<popup-gas ref="FlueGas"></popup-gas>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -38,12 +39,15 @@
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
-import SolidContent from '@components/BaseNav/SolidContent'
// 搴曞浘涓氬姟js閫昏緫
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
// 搴熸皵
import AddGasHelper from '@components/flueGas/flueGas'
import PopupGas from '@/components/flueGas/popup-gas'
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+// 鍏叡灞曠ず鏁版嵁
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+
export default {
name: 'MapTemplate',
components: {
@@ -76,9 +80,6 @@
return this.$store.state.map.config
}
},
- // created () {
- // this.FlueGas()
- // },
beforeMount () {
this.$nextTick(() => {
this.init()
@@ -91,9 +92,16 @@
AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
},
ChangeState () {
+ const data = {
+ companyId: 3900100145,
+ userCode: 'wenchun.deng',
+ name: '',
+ marginWarr: '',
+ longDayWarr: ''
+ }
const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData()
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
+ AddSolidWaste.requestData(data)
+ AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
--
Gitblit v1.8.0