From 7a6f7a499364eb56bf208fed4c18bee6a978714f Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 10:49:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
/dev/null | 0
public/assets/images/map/wastewater/fs_red.png | 0
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 8 +---
public/assets/images/map/wastewater/fs_orange.png | 0
src/components/BaseNav/WasteWater/WasteWater.js | 9 ++--
src/components/LayerController/logic/WasteWater.js | 58 +++++++++++++++++++++++------
public/assets/images/map/wastewater/fs_gray.png | 0
src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue | 3 -
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8 ++--
public/assets/images/map/wastewater/fs_blue.png | 0
public/assets/images/map/wastewater/fs_bright_green.png | 0
public/assets/images/map/wastewater/fs_green_xc.png | 0
12 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_blue.png b/public/assets/images/map/wastewater/fs_blue.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/Waste-water/fs_blue.png
rename to public/assets/images/map/wastewater/fs_blue.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_bright_green.png b/public/assets/images/map/wastewater/fs_bright_green.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/Waste-water/fs_bright_green.png
rename to public/assets/images/map/wastewater/fs_bright_green.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_gray.png b/public/assets/images/map/wastewater/fs_gray.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/Waste-water/fs_gray.png
rename to public/assets/images/map/wastewater/fs_gray.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_green_xc.png b/public/assets/images/map/wastewater/fs_green_xc.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/Waste-water/fs_green_xc.png
rename to public/assets/images/map/wastewater/fs_green_xc.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_orange.png b/public/assets/images/map/wastewater/fs_orange.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/Waste-water/fs_orange.png
rename to public/assets/images/map/wastewater/fs_orange.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_red.png b/public/assets/images/map/wastewater/fs_red.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/Waste-water/fs_red.png
rename to public/assets/images/map/wastewater/fs_red.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_green.png b/src/assets/images/map-pages/basenav/Waste-water/fs_green.png
deleted file mode 100644
index e75d458..0000000
--- a/src/assets/images/map-pages/basenav/Waste-water/fs_green.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/Waste-water/fs_yellow.png b/src/assets/images/map-pages/basenav/Waste-water/fs_yellow.png
deleted file mode 100644
index 8d84aa8..0000000
--- a/src/assets/images/map-pages/basenav/Waste-water/fs_yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
index dd4da05..c2366b0 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,5 +1,5 @@
<template>
- <div style="width:670px;height:260px;" id="echarts" ref="main"></div>
+ <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
</template>
<script>
@@ -175,13 +175,9 @@
<style scoped lang="less">
#echarts{
- width: 670px!important;
- height: 260px!important;
- //position: relative;
margin: 0;
padding: 0;
- /*background-color: rgba(0, 0, 0, 0.6);*/
border: 1px solid #396d83;
- margin: 10px 10px 10px 10px;
+ /*margin: 10px 10px 10px 10px;*/
}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
index 44f8842..23814fc 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -32,9 +32,6 @@
}
},
methods: {
- handleClick (tab, event) {
- console.log(tab, event)
- }
}
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 07a38cf..892cbad 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -45,10 +45,10 @@
},
methods: {
setData (data, value) {
- data.forEach((item, index) => {
- // console.log(item.StoragePlaceName)
- this.displayContentTitle = item.StoragePlaceName
- })
+ // data.forEach((item, index) => {
+ // // console.log(item.StoragePlaceName)
+ // // this.displayContentTitle = item.StoragePlaceName
+ // })
this.displayContentTab = data
this.flag = true
this.value = value
diff --git a/src/components/BaseNav/WasteWater/WasteWater.js b/src/components/BaseNav/WasteWater/WasteWater.js
index 1847391..336d2eb 100644
--- a/src/components/BaseNav/WasteWater/WasteWater.js
+++ b/src/components/BaseNav/WasteWater/WasteWater.js
@@ -1,7 +1,8 @@
+// 璇锋眰鏁版嵁
import { requestWasteWater } from '@/api/request'
// 灞曠ず鍥剧墖
-import defaultImg from '@assets/images/map-pages/basenav/Waste-water/fs_green.png'
-import Setting from '@assets/images/map-pages/basenav/Waste-water/fs_yellow.png'
+// import defaultImg from '@assets/images/map-pages/basenav/Waste-water/fs_green.png'
+// import Setting from '@assets/images/map-pages/basenav/Waste-water/fs_yellow.png'
// 搴曞浘涓氬姟灞曠ず鐐�
class AddWasteWaterHelper {
@@ -105,10 +106,10 @@
WasteWaterIconUrl (determineValueOne, determineValueTwo, position) {
let EffectOfChange
if (determineValueOne === 1 || determineValueTwo === 1) {
- EffectOfChange = defaultImg
+ // EffectOfChange = defaultImg
this.EffectOfPulse(position, this.WasteWaterMarkersLabels, this.WasteWaterLayerGroup)
} else {
- EffectOfChange = Setting
+ // EffectOfChange = Setting
}
return EffectOfChange
}
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 8b66aa9..5a568e9 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -3,9 +3,15 @@
*/
const AnimalService = require('../service/AnimalService').default
const mapApi = require('../../../api/mapApi').default
+// 寮圭獥鏁版嵁寮曡繘
+const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const testValue1 = '/assets/images/map/wastewater/fs_green.png'
-const testValue2 = '/assets/images/map/wastewater/fs_yellow.png'
+const NormalImg = '/assets/images/map/wastewater/fs_green.png' // 姝ｅ父
+const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
+const AbnormalImg = '/assets/images/map/wastewater/fs_blue.png' // 寮傚父
+const MissImg = '/assets/images/map/wastewater/fs_yellow.png' // 缂哄け
+const AlarmImg = '/assets/images/map/wastewater/fs_red.png' // 鎶ヨ闂儊
+const WarnImg = '/assets/images/map/wastewater/fs_orange.png' // 棰勮闂儊
module.exports = function () {
/**
@@ -18,9 +24,7 @@
layer: layer
})
const res = await mapApi.getWasteWater()
- // console.log(res)
- const data = res.Result.DataInfo
- // console.log(data)
+ const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
@@ -30,6 +34,7 @@
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
const marker = L.marker.magic([positionX, positionY], {
+ test: data[i],
icon: L.icon({
iconUrl: iconUrl,
iconSize: [50, 50],
@@ -41,22 +46,51 @@
}
this.bindTooltip = (layer) => {
- return '娴嬭瘯搴熸按'
+ return layer.options.test.Name
}
- this.clickListener = (e) => {
+ this.clickListener = async (e) => {
// console.log(e)
this.animalService.pulseEffect(e.latlng)
- return this.PublicBounced.$el
+ const dataValue = {
+ StoragePlaceId: e.layer.options.test.StoragePlaceId
+ }
+ const result = await mapApi.getWasteWater(dataValue)
+ const PublicBounced = window.Vue.extend(publicBounced)
+ const instance = new PublicBounced()
+ instance.setData(result)
+ instance.$mount()
+ document.body.appendChild(instance.$el)
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
this.differentTypes = (testValue) => {
let testChange
- if (testValue === 1) {
- testChange = testValue1
- } else {
- testChange = testValue2
+ switch (testValue) {
+ case 1:
+ testChange = NormalImg
+ break
+ case 2:
+ testChange = OffImg
+ break
+ case 3:
+ testChange = AbnormalImg
+ break
+ case 4:
+ testChange = MissImg
+ break
+ case 5:
+ testChange = NormalImg
+ break
+ case 6:
+ testChange = AlarmImg
+ break
+ case 7:
+ testChange = AbnormalImg
+ break
+ case 8:
+ testChange = WarnImg
+ break
}
return testChange
}
--
Gitblit v1.8.0