From e25ff993695e7a4b394a5d1aa102f113dbe5316b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 18 四月 2021 22:40:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WasteSolid/PublicTabs.vue | 26 +++++---
src/components/LayerController/logic/WasteSolid.js | 28 +--------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 62 +++++++++-----------
src/components/BaseNav/WasteSolid/PublicTable.vue | 12 +++
src/components/BaseNav/WasteSolid/WasteSolidIndex.vue | 22 ++++---
5 files changed, 72 insertions(+), 78 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 0db423e..3665692 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -4,49 +4,45 @@
<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 :setSolidWaste="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"-->
-<!-- :value="value"-->
-<!-- :getQueryOnlineMonData="getQueryOnlineMonData"-->
-<!-- :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
-<!-- :ManualData="ManualData"-->
-<!-- ref="PublicChart"-->
-<!-- >-->
-<!-- </public-chart>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="public-bounced-content-right">-->
-<!-- <public-video></public-video>-->
-<!-- </div>-->
-<!-- </div>-->
- <PublicSector></PublicSector>
+ <div class="public-bounced-content">
+ <div class="public-bounced-content-left">
+ <public-tabs :setSolidWaste="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"
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
+ >
+ </public-chart>
+ </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <public-video></public-video>
+ </div>
+ </div>
</div>
</template>
<script>
import '@/utils/dragBoxes'
-// import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
-// import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
-// import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
-// import PublicChart from './common/PublicChart'
-
-import PublicSector from '@components/BaseNav/PublicSector'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
export default {
name: 'PublicBounced',
components: {
- PublicSector
- // PublicTabs,
- // PublicTable,
- // PublicChart,
- // PublicVideo
+ PublicTabs,
+ PublicTable,
+ PublicChart,
+ PublicVideo
},
data () {
return {
diff --git a/src/components/BaseNav/WasteSolid/PublicTable.vue b/src/components/BaseNav/WasteSolid/PublicTable.vue
index ca2ccf9..3bc0315 100644
--- a/src/components/BaseNav/WasteSolid/PublicTable.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTable.vue
@@ -14,6 +14,8 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
+
export default {
name: 'PublicTable',
props: ['displayContentTable'],
@@ -54,10 +56,18 @@
},
mounted () {
this.$nextTick(() => {
- this.listData.push(this.displayContentTable[0], {}, {}, {}, {}, {}, {})
+ this.listData.push({}, {}, {}, {}, {}, {})
})
},
methods: {
+ async refsDataTable (data) {
+ const StoragePlaceId = {
+ StoragePlaceId: data
+ }
+ const result = await mapApi.getSolidWasteDetail(StoragePlaceId)
+ this.listData = result.Result.DataInfo[0]
+ console.log(this.listData)
+ },
// 闅旇棰滆壊璁剧疆
tableRowClassName ({
row,
diff --git a/src/components/BaseNav/WasteSolid/PublicTabs.vue b/src/components/BaseNav/WasteSolid/PublicTabs.vue
index 1f80af7..c940a49 100644
--- a/src/components/BaseNav/WasteSolid/PublicTabs.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTabs.vue
@@ -22,19 +22,27 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
+
export default {
name: 'GasTable',
data () {
return {
- tabList: [],
- setSolidWaste: [{
- StoragePlaceId: 0,
- StoragePlaceName: '鍙栨按鍗曞厓骞叉偿鏆傚瓨搴�',
- DesignFloorArea: 0.024,
- StorageQty: 0.016,
- SurplusFloorArea: 0.018,
- StorageDate: '2021-01-17'
- }]
+ setSolidWaste: []
+ }
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.refsDataTabs()
+ })
+ },
+ methods: {
+ async refsDataTabs (data) {
+ const StoragePlaceId = {
+ StoragePlaceId: data
+ }
+ const result = await mapApi.getSolidWasteBaseInfo(StoragePlaceId)
+ this.setSolidWaste = result.Result.DataInfo
}
}
}
diff --git a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
index 0b0ea0b..89c6c51 100644
--- a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
+++ b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
@@ -1,11 +1,10 @@
<template>
<public-sector>
- <div></div>
<template v-slot:tabs>
- <public-tabs></public-tabs>
+ <public-tabs ref='refsTabsData'></public-tabs>
</template>
<template v-slot:table>
- <public-table ref="table"></public-table>
+ <public-table ref="refsTableData"></public-table>
</template>
<template v-slot:video>
<public-video></public-video>
@@ -15,7 +14,6 @@
<script>
-// import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/WasteSolid/PublicTabs'
import PublicTable from '@components/BaseNav/WasteSolid/PublicTable'
import PublicVideo from '@components/BaseNav/PublicVideo'
@@ -23,16 +21,17 @@
export default {
name: 'WasteSolidIndex',
- props: ['title'],
+ props: ['storagePlaceId'],
components: {
- // WasteSolid,
PublicSector,
PublicTabs,
PublicTable,
PublicVideo
},
mounted () {
- console.log(this.title)
+ this.$nextTick(() => {
+ this.refsData()
+ })
},
data () {
return {
@@ -43,12 +42,15 @@
StorageQty: 0.016,
SurplusFloorArea: 0.018,
StorageDate: '2021-01-17'
- }],
- displayContentTable: '',
- flag: false
+ }]
}
},
methods: {
+ refsData () {
+ const data = this.storagePlaceId
+ this.$refs.refsTabsData.refsDataTabs(data)
+ this.$refs.refsTableData.refsDataTable(data)
+ },
// 鍥哄簾鐩稿叧淇℃伅璁剧疆
setData (title, dataBasic, dataDetailed, value) {
this.flag = true
diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index 3046b2d..977eaac 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -11,8 +11,6 @@
// 浣跨敤灏佽鏂规硶
const AnimalService = require('../service/AnimalService').default
-// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
@@ -34,8 +32,7 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
const judgeValue = getSolidWasteData[i].StorageQty
var iconUrl = this.differentTypes(judgeValue)
- // console.log(getSolidWasteData[i].Latitude, getSolidWasteData[i].Longitude)
- // console.log(getSolidWasteData[i])
+
const marker = L.marker([positionX, positionY], {
totransferData: getSolidWasteData[i],
icon: L.icon({
@@ -44,9 +41,6 @@
iconAnchor: [15, 15]
})
})
- // console.log(L.icon)
- // console.log(iconUrl)
- // console.log(marker)
layer.addLayer(marker)
}
}
@@ -75,33 +69,17 @@
// 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
this.requestSolidWasteData = async (e) => {
- // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
- // const dataValue = {
- // StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
- // }
- // console.log(e.layer.options.totransferData.Name)
// 寮规鏍囬
const title = e.layer.options.totransferData.Name
- // 鍩烘湰淇℃伅 tabs
- // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
- // 璇︾粏淇℃伅灞曠ず table
- // const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
-
- // // 缁戝畾寮规瀹炰緥
- // const PublicBounced = window.Vue.extend(publicBounced)
- // const instance = new PublicBounced().$mount()
- // document.body.appendChild(instance.$el)
- // // document.body.removeChild(instance.$el)
- // // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
- // instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
this.setPanTo(e.latlng, 300)
+
+ // console.log(e.layer.options.totransferData.StoragePlaceId)
window.$layer.open({
content: {
content: WasteSolidIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
- info: this.info,
storagePlaceId: e.layer.options.totransferData.StoragePlaceId
}
},
--
Gitblit v1.8.0