From 1602bcb0af9757e6d3af0b509060c4c0a40e1ba8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 14:36:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 17 +++-----
src/api/mapApi.js | 6 +-
src/api/mapUrl.js | 2
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 51 ++++++++++++++-----------
4 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 0b35a9c..cf79e51 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -24,11 +24,11 @@
getSolidWasteDetail (data) {
return axios.get(mapUrl.getSolidWasteDetail, data)
},
+ getWasteGas (data) {
+ return axios.get(mapUrl.getWasteGas, data)
+ },
getWasteWater (data) {
return axios.get(mapUrl.getWasteWater, data)
- },
- GetWasteGas (data) {
- return axios.get(mapUrl.GetWasteGas, data)
},
getCompany (data) {
return axios.get(mapUrl.getCompany, data)
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index cdf80b9..4bd6f56 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -9,7 +9,7 @@
export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
export const getSolidWasteDetail = $HOST + '/wasteSolid/getSolidWasteDetail'
-export const GetWasteGas = $HOST + '/wasteGas/getWasteGas'
+export const getWasteGas = $HOST + '/wasteGas/getWasteGas'
export const getWasteWater = $HOST + '/wasteWater/getWasteWater'
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 1ca26ff..42a4157 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -18,6 +18,22 @@
<el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
<el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
</el-row>
+<!-- <el-row type="flex" class="row-bg row-item-one" justify="space-around">-->
+<!-- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>-->
+<!-- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContent.porltName }}</el-col>-->
+<!-- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.MonTypeName }}</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="8">鎺掓斁鍘诲悜:{{ displayContent.EmissDirecti }}</el-col>-->
+<!-- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>-->
+<!-- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</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>
</div>
@@ -47,30 +63,25 @@
.win {
position: relative;
margin-bottom: 13px;
- background-color: rgba(33, 41, 69, 0.9);
+ background-color: rgba(33, 41, 69,0.9);
}
-
.main {
width: 100%;
height: 100%;
-
- .main-matter {
+ .main-matter{
font-size: 13px;
font-weight: normal;
padding: 10px 6px;
border: 1px solid #396d83;
-
- .row-item-one {
+ .row-item-one{
margin-bottom: 7px;
}
-
.el-row {
width: 100%;
color: #00d0f9;
display: flex;
font-size: 12px !important;
-
- .el-col {
+ .el-col{
flex: 1;
width: 100%;
background-color: #243a55;;
@@ -78,46 +89,40 @@
line-height: 28px;
margin-left: 6px;
border-radius: 4px;
-
- &:nth-child(1) {
- margin-left: 0;
+ &:nth-child(1){
+ margin-left:0;
}
}
}
}
}
-
-.border_corner {
+.border_corner{
z-index: 999;
position: absolute;
width: 10px;
height: 10px;
- background: rgba(0, 0, 0, 0);
+ background: rgba(0,0,0,0);
border: 1.5px solid #47d5ea;
}
-
-.border_corner_left_top {
+.border_corner_left_top{
top: 0;
left: 0;
border-right: none;
border-bottom: none;
}
-
-.border_corner_right_top {
+.border_corner_right_top{
top: 0;
right: 0;
border-left: none;
border-bottom: none;
}
-
-.border_corner_left_bottom {
+.border_corner_left_bottom{
bottom: 0;
left: 0;
border-right: none;
border-top: none;
}
-
-.border_corner_right_bottom {
+.border_corner_right_bottom{
bottom: 0;
right: 0;
border-left: none;
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 99fee38..574ed9f 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -18,11 +18,8 @@
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
- this.animalService = new AnimalService({
- L: L,
- layer: layer
- })
- const res = await mapApi.GetWasteGas()
+ this.animalService = new AnimalService({ L: L, layer: layer })
+ const res = await mapApi.getWasteGas()
const data = res.Result.DataInfo || {}
// console.log(data)
for (let i = 0; i < data.length; i++) {
@@ -53,13 +50,13 @@
this.clickListener = async (e) => {
// console.log(e)
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- const result = await mapApi.GetWasteGas(dataValue)
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.StoragePlaceId
+ // }
+ // const result = await mapApi.getWasteGas(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result)
+ instance.setData(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
}
--
Gitblit v1.8.0