From 17ba6febdaacf7563f7688bae473a4a89e914ff5 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 16:04:18 +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 | 21 +++++++++++----------
src/components/flueGas/popup-gas.vue | 8 ++++----
src/views/MapTemplate.vue | 7 ++-----
src/styles/theme-dark/variable.less | 2 +-
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8 ++++++--
src/components/flueGas/GasComponents/GasTable.vue | 4 ++--
7 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 003f1dc..8326dfa 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -5,13 +5,14 @@
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
- <span>鍐呭</span>
+<!-- <span>鍐呭</span>-->
+ <popup-gas></popup-gas>
</div>
</div>
</template>
<script>
-
+import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
data () {
@@ -20,6 +21,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 62f103f..6ea7391 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/flueGas/flueGas.js
@@ -55,14 +55,14 @@
// // 绾�
// 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].porltName, {
permanent: true,
@@ -73,9 +73,10 @@
// 鐐瑰嚮 浜嬩欢
marker.on('click', (e) => {
try {
- // console.log(e)
+ console.log(e)
this.EffectOfPulse(e.target.getLatLng())
- this.FlueGasPopup.setDate(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 dcbaf77..c4a64c0 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -22,7 +22,6 @@
<PublicBounced ref="PublicBounced"></PublicBounced>
<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
- <popup-gas ref="FlueGas"></popup-gas>
<PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -51,7 +50,7 @@
// import SolidContent from '@components/SolidWaste/SolidContent'
// 搴熸皵
import AddGasHelper from '@components/flueGas/flueGas'
-import PopupGas from '@/components/flueGas/popup-gas'
+// import PopupGas from '@/components/flueGas/popup-gas'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
@@ -71,12 +70,11 @@
SolidContent,
// WasteWaterContent,
// SolidContent,
- PopupGas,
+ // PopupGas,
PublicBounced
},
data () {
return {
- show: true,
// isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
@@ -175,7 +173,6 @@
// this.ChangeState()
// this.AddGasHelper()
- // this.ChangeState()
// this.ChangeWaterState()
this.saveMapStatus()
--
Gitblit v1.8.0