From 181c63668c5d81002fa2dd4f5312318cf81f2180 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 15:50:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/SolidWaste/SolidWaste.js | 2 +-
src/components/flueGas/flueGas.js | 24 +++++++++++++-----------
src/components/flueGas/popup-gas.vue | 8 ++++----
src/views/MapTemplate.vue | 2 ++
src/styles/theme-dark/variable.less | 2 +-
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8 +++++++-
src/components/flueGas/GasComponents/GasTable.vue | 4 ++--
7 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ed22e56..dab29fe 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced" v-draw v-show="flag">
+ <div class="public-bounced" v-show="flag">
<div class="public-bounced-title">
<span>{{ displayContent.Name }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,6 +7,8 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left"></div>
<div class="public-bounced-content-right"></div>
+<!-- <span>鍐呭</span>-->
+ <popup-gas></popup-gas>
</div>
</div>
</template>
@@ -15,6 +17,7 @@
import '@/components/BaseNav/SolidWaste/directive'
+import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
data () {
@@ -23,6 +26,9 @@
flag: false
}
},
+ components: {
+ PopupGas
+ },
methods: {
setData (data) {
this.displayContent = data
diff --git a/src/components/BaseNav/SolidWaste/SolidWaste.js b/src/components/BaseNav/SolidWaste/SolidWaste.js
index b9be819..54107a5 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)
this.EffectOfPulse(e.target.getLatLng())
this.SolidWastePopup.setData(data[i])
return this.SolidWastePopup.$el
diff --git a/src/components/flueGas/GasComponents/GasTable.vue b/src/components/flueGas/GasComponents/GasTable.vue
index d4f11da..0b927c9 100644
--- a/src/components/flueGas/GasComponents/GasTable.vue
+++ b/src/components/flueGas/GasComponents/GasTable.vue
@@ -34,11 +34,11 @@
.el-row {
color: #00d0f9;
.el-col{
- width: 240px;
+ width: 200px;
height: 28px;
background-color: #243a55;
border-radius: 0.05rem;
- margin: 5px;
+ //margin: 5px;
text-align: center;
line-height: 28px;
}
diff --git a/src/components/flueGas/flueGas.js b/src/components/flueGas/flueGas.js
index 1c816be..e192167 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/flueGas/flueGas.js
@@ -35,8 +35,8 @@
}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
- const positionX = data[i].positionX
- const positionY = data[i].positionY
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
// 鍒ゆ柇 缁忕含搴︿綅缃俊鎭槸鍚﹀瓨鍦�
// if (positionX != null && positionY != null) {
@@ -55,16 +55,16 @@
// // 绾�
// var polyline = this.L.polyline(latlngs, { color: 'red' }).addTo(this.map)
// console.log(polyline)
- marker.bindPopup(() => {
- return this.FlueGasPopup.$el
- }, {
- className: 's-map-popup',
- minWidth: 1548,
- closeButton: true,
- autoClose: false
- })
+ // marker.bindPopup(() => {
+ // return this.FlueGasPopup.$el
+ // }, {
+ // className: 's-map-popup',
+ // minWidth: 1548,
+ // closeButton: true,
+ // autoClose: false
+ // })
// 鍒掕繃鍑虹幇 灞曠ず鏁版嵁
- marker.bindTooltip(data[i].StoragePlaceName, {
+ marker.bindTooltip(data[i].porltName, {
permanent: true,
offset: [0, -16],
direction: 'top',
@@ -76,6 +76,8 @@
// console.log(e)
this.EffectOfPulse(e.target.getLatLng())
this.FlueGasPopup.setData(data[i])
+ // this.FlueGasPopup.setData(data[i])
+ return this.FlueGasPopup.$el
} catch (error) {
console.log(error)
}
diff --git a/src/components/flueGas/popup-gas.vue b/src/components/flueGas/popup-gas.vue
index a883d48..a9de862 100644
--- a/src/components/flueGas/popup-gas.vue
+++ b/src/components/flueGas/popup-gas.vue
@@ -35,10 +35,10 @@
}
},
methods: {
- setDate (data) {
- console.log(data)
- this.displayContent = data
- }
+ // setDate (data) {
+ // console.log(data)
+ // this.displayContent = data
+ // }
}
}
</script>
diff --git a/src/styles/theme-dark/variable.less b/src/styles/theme-dark/variable.less
index 430a7b4..dee09f6 100644
--- a/src/styles/theme-dark/variable.less
+++ b/src/styles/theme-dark/variable.less
@@ -1,4 +1,4 @@
-@import "../common/variable";
+//@import "../common/variable";
/* 涓婚鑹�
-------------------------- */
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 253123a..e0e1dc4 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -19,6 +19,7 @@
<el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>
<PublicBounced ref="PublicBounced"></PublicBounced>
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -46,6 +47,7 @@
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'MapTemplate',
components: {
--
Gitblit v1.8.0