From bd59f31b6d5d1de02edc3a454931303753cf9f43 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 09:24:35 +0800
Subject: [PATCH] 弹框点击信息修改
---
src/components/BaseNav/SolidWaste/SolidWaste.js | 2
src/components/LayerController/logic/WasteGas.js | 2
src/api/mapApi.js | 8 ++-
src/components/LayerController/logic/WasteWater.js | 4 +-
src/views/MapTemplate.vue | 9 ++--
src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 25 ++++++++----
src/api/mapUrl.js | 7 +--
src/components/BaseNav/PublicBounced/PublicBounced.vue | 2
src/components/LayerController/logic/SolidWaste.js | 28 +++++++++-----
9 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index cebf2b3..8917ca0 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -12,15 +12,17 @@
getUser (data) {
return axios.get(mapUrl.GetUser, data)
},
+ // 鍥哄簾鐐�
getSolidWaste (data) {
return axios.get(mapUrl.getSolidWaste, data)
},
- getWasteWater (data) {
- return axios.get(mapUrl.getWasteWater, data)
- },
+ // 鍥哄簾鐐瑰熀鏈俊鎭�
getSolidWasteBaseInfo (data) {
return axios.get(mapUrl.getSolidWasteBaseInfo, data)
},
+ getWasteWater (data) {
+ return axios.get(mapUrl.getWasteWater, data)
+ },
GetWasteGas (data) {
return axios.get(mapUrl.GetWasteGas, data)
},
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index 1b986df..d956576 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -5,12 +5,11 @@
export const GetUser = $HOST + '/user/getUser'
+export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
+export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
+
export const GetWasteGas = $HOST + '/wasteGas/getWasteGas'
-export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
-
export const getWasteWater = $HOST + '/wasteWater/getWasteWater'
-
-export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
export const getCompany = $HOST + '/company/getCompany'
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
index 1065f96..997164f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
@@ -9,18 +9,18 @@
<div class="main">
<div class="main-matter">
<el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContentTab.Name }}</el-col>
- <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContentTab.DeptSname }}</el-col>
- <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab.EmissTypeName }}</el-col>
+ <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-row>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContentTab.EmissTypeDirectName }}</el-col>
- <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContentTab.ContrLevelShowName }}</el-col>
- <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContentTab.OrOutPortName }}</el-col>
+ <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-row>
</div>
</div>
- </div>
+ </div>
</template>
<script>
@@ -28,7 +28,16 @@
name: 'GasTable',
props: ['displayContentTab'],
data () {
- return {}
+ return {
+ displayContentTab2: []
+ }
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.displayContentTab.forEach(item => {
+ this.displayContentTab2 = item
+ })
+ })
}
}
</script>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 73a8df7..07a38cf 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -46,7 +46,7 @@
methods: {
setData (data, value) {
data.forEach((item, index) => {
- console.log(item.StoragePlaceName)
+ // console.log(item.StoragePlaceName)
this.displayContentTitle = item.StoragePlaceName
})
this.displayContentTab = data
diff --git a/src/components/BaseNav/SolidWaste/SolidWaste.js b/src/components/BaseNav/SolidWaste/SolidWaste.js
index 8babe45..5ce22d5 100644
--- a/src/components/BaseNav/SolidWaste/SolidWaste.js
+++ b/src/components/BaseNav/SolidWaste/SolidWaste.js
@@ -63,7 +63,7 @@
// 鐐瑰嚮 浜嬩欢
marker.on('click', (e) => {
try {
- // console.log(e)
+ console.log(e.target.getLatLng())
this.setPanTo(e.target.getLatLng(), 200)
this.EffectOfPulse(e.target.getLatLng())
this.SolidWastePopup.setData(data[i], 'gufei')
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index efb3b43..37b4b15 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -1,6 +1,7 @@
/**
* 鍥哄簾
*/
+
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const defaultImg = '/assets/images/map/solidwaste/voc.png'
const setting = '/assets/images/map/solidwaste/gf_green.png'
@@ -50,10 +51,17 @@
return layer.options.test.Name
}
- this.clickListener = async (e) => {
+ this.clickListener = (e) => {
+ // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
+ /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
// this.setPanTo(e.latlng, 200)
- console.log(e)
+ /* 鐐瑰嚮鏁版嵁鐨勬帴鍙ｈ姹� */
+ this.requestSolidWasteData(e).then(e)
+ }
+
+ // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
+ this.requestSolidWasteData = async (e) => {
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
@@ -66,14 +74,14 @@
instance.setData(result.Result.DataInfo, 'gufei')
}
- // panTo
- this.setPanTo = (pos, value) => {
- var position = pos
- position = this.layer.latLngToLayerPoint(position)
- position.y += value
- position = this.layer.layerPointToLatLng(position)
- this.layer.flyTo(position)
- }
+ // 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) => {
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 1d34a3b..99fee38 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -24,7 +24,7 @@
})
const res = await mapApi.GetWasteGas()
const data = res.Result.DataInfo || {}
- console.log(data)
+ // console.log(data)
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index a5ca19f..8b66aa9 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -18,9 +18,9 @@
layer: layer
})
const res = await mapApi.getWasteWater()
- console.log(res)
+ // console.log(res)
const data = res.Result.DataInfo
- console.log(data)
+ // console.log(data)
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2da8ce0..5463f63 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,9 +16,9 @@
<summary-sheets></summary-sheets>
<enterprise></enterprise>
<!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
-<!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
-<!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
-<!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
+ <!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
+ <!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
+ <!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
<PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -133,6 +133,7 @@
init () {
const mapcontainer = this.$refs.rootmap
this.map = Sgis.initMap(mapcontainer)
+ this.$refs.toolBox.map = this.map
window.popupComp = this.$refs.popup
var layerFactory = new LayerFactory({
@@ -154,7 +155,7 @@
// this.AddGasHelper()
// this.ChangeWaterState()
- this.$refs.toolBox.init(this.map)
+
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
--
Gitblit v1.8.0