From 0ca297f9622764653a7262b51bdff73b553dee79 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 10:55:54 +0800
Subject: [PATCH] 弹框接收信息展示修改
---
src/api/mapApi.js | 4 +
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 63 ++++++++++-----------
src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 12 ++--
src/api/mapUrl.js | 1
src/components/BaseNav/PublicBounced/PublicBounced.vue | 14 ++--
src/components/LayerController/logic/SolidWaste.js | 53 +++++++++--------
6 files changed, 77 insertions(+), 70 deletions(-)
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 8917ca0..0b35a9c 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -20,6 +20,10 @@
getSolidWasteBaseInfo (data) {
return axios.get(mapUrl.getSolidWasteBaseInfo, data)
},
+ // 鍥哄簾璇︾粏淇℃伅
+ getSolidWasteDetail (data) {
+ return axios.get(mapUrl.getSolidWasteDetail, data)
+ },
getWasteWater (data) {
return axios.get(mapUrl.getWasteWater, data)
},
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index d956576..cdf80b9 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -7,6 +7,7 @@
export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
+export const getSolidWasteDetail = $HOST + '/wasteSolid/getSolidWasteDetail'
export const GetWasteGas = $HOST + '/wasteGas/getWasteGas'
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
index 997164f..1ca26ff 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
@@ -9,14 +9,14 @@
<div class="main">
<div class="main-matter">
<el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
</el-row>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
- <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
- <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
</el-row>
</div>
</div>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index a6b9aa8..f2c0f64 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -7,18 +7,19 @@
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-video">
- <el-table
- tooltip-effect="dark"
- :data="data"
- >
- <el-table-column prop="name" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" label="绫诲埆"></el-table-column>
- <el-table-column prop="date" label="鍥哄簾鍚嶇О"></el-table-column>
- <el-table-column prop="address" label="浠ｇ爜"></el-table-column>
- <el-table-column prop="address" label="浜х敓閲�"></el-table-column>
- <el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
- <el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
- </el-table>
+<!-- <el-table-->
+<!-- tooltip-effect="dark"-->
+<!-- :data="displayContentTable2"-->
+<!-- >-->
+<!-- <el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>-->
+<!-- <el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>-->
+<!-- <el-table-column prop="StoragePlaceName" label="鍥哄簾鍚嶇О"></el-table-column>-->
+<!-- <el-table-column prop="StorageZDMJ" label="浠ｇ爜"></el-table-column>-->
+<!-- <el-table-column prop="StorageZCNL" label="浜х敓閲�"></el-table-column>-->
+<!-- <el-table-column prop="StorageZCL" label="鍌ㄥ瓨閲�"></el-table-column>-->
+<!-- <el-table-column prop="StorageType" label="浜х敓瑁呯疆"></el-table-column>-->
+<!-- </el-table>-->
+ <span>{{ displayContentTable3.StoragePlaceTypeName }}</span>
</div>
</div>
</div>
@@ -27,34 +28,30 @@
<script>
export default {
name: 'PublicTable',
- props: ['requestSolidWasteData'],
+ props: ['displayContentTable'],
data () {
return {
- data: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖�'
- }, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖�'
- }, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖�'
- }]
+ displayContentTable2: [
+ {
+ CompanyName: '涓煩鐭冲寲',
+ StoragePlaceId: 3,
+ StoragePlaceName: '鐏版福鍦�',
+ StoragePlaceTypeName: '涓�鑸浐搴熷～鍩嬪満',
+ StorageType: '绮夌叅鐏般�佺伆娓�',
+ StorageZCL: '38',
+ StorageZCNL: '40.7',
+ StorageZDMJ: '10.60798'
+ }
+ ],
+ displayContentTable3: []
}
},
mounted () {
this.$nextTick(() => {
- this.getSolidWasteData()
+ this.displayContentTable.forEach(item => {
+ this.displayContentTable3 = item
+ })
})
- },
- methods: {
- getSolidWasteData () {
- // const data = requestSolidWasteData
- // console.log(data)
- }
}
}
</script>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 07a38cf..4d7da9e 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,9 +6,9 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContentTab="displayContentTab" ></GasTab>
+ <GasTab :displayContentTab="displayContentTab"></GasTab>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
<GasECharts v-else></GasECharts>
</div>
</div>
@@ -40,16 +40,18 @@
return {
displayContentTitle: '',
displayContentTab: '',
+ displayContentTable: '',
flag: false
}
},
methods: {
- setData (data, value) {
- data.forEach((item, index) => {
- // console.log(item.StoragePlaceName)
+ setData (dataBasic, dataDetailed, value) {
+ console.log(dataDetailed)
+ dataBasic.forEach(item => {
this.displayContentTitle = item.StoragePlaceName
})
- this.displayContentTab = data
+ this.displayContentTab = dataBasic
+ this.displayContentTable = dataDetailed
this.flag = true
this.value = value
},
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index 37b4b15..3eee0e3 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -36,7 +36,7 @@
var iconUrl = this.differentTypes(judgeValue)
const marker = L.marker([positionX, positionY], {
- test: getSolidWasteData[i],
+ totransferData: getSolidWasteData[i],
icon: L.icon({
iconUrl: iconUrl,
iconSize: [50, 50],
@@ -48,7 +48,7 @@
}
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return layer.options.totransferData.Name
}
this.clickListener = (e) => {
@@ -60,29 +60,6 @@
this.requestSolidWasteData(e).then(e)
}
- // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
- this.requestSolidWasteData = async (e) => {
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- const result = await mapApi.getSolidWasteBaseInfo(dataValue)
- // console.log(result)
- const PublicBounced = window.Vue.extend(publicBounced)
- const instance = new PublicBounced()
- instance.$mount()
- document.body.appendChild(instance.$el)
- instance.setData(result.Result.DataInfo, 'gufei')
- }
-
- // flayTo()
- // this.setPanTo = (pos, value) => {
- // var position = pos
- // position = this.map.latLngToLayerPoint(position)
- // position.y += value
- // position = this.map.layerPointToLatLng(position)
- // this.map.flyTo(position)
- // }
-
// 涓嶅悓绫诲瀷鍥剧墖灏佽
this.differentTypes = (judgeValue) => {
var effectOfChange
@@ -93,4 +70,30 @@
}
return effectOfChange
}
+
+ // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
+ this.requestSolidWasteData = async (e) => {
+ // 鍩烘湰淇℃伅灞曠ず
+ const dataValue = {
+ StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
+ }
+ const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
+ // 璇︾粏淇℃伅灞曠ず
+ const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
+
+ const PublicBounced = window.Vue.extend(publicBounced)
+ const instance = new PublicBounced()
+ instance.$mount()
+ document.body.appendChild(instance.$el)
+ instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
+ }
+
+ // flayTo()
+ // this.setPanTo = (pos, value) => {
+ // var position = pos
+ // position = this.map.latLngToLayerPoint(position)
+ // position.y += value
+ // position = this.map.layerPointToLatLng(position)
+ // this.map.flyTo(position)
+ // }
}
--
Gitblit v1.8.0