From 38ef8cb7cefcd4b308bdefa164fb01ccbd6a0a81 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期日, 25 四月 2021 16:57:58 +0800
Subject: [PATCH] 废水废气图表数据弹框相关修改
---
src/components/BaseNav/WasteWater/WasteWaterRealChart.vue | 57 +++++++-------
src/components/BaseNav/WasteGas/DayData.vue | 26 +++---
src/components/LayerController/service/LayerFactory.js | 6
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 45 +++++-----
src/components/BaseNav/WasteGas/WasteGasRealChart.vue | 35 ++++----
src/components/BaseNav/PublicChart.vue | 37 +++++++++
src/Sgis.js | 14 +--
src/components/BaseNav/WasteGas/HourData.vue | 17 +--
8 files changed, 138 insertions(+), 99 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index fda9cf2..d74d329 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,7 +1,7 @@
// 鍒濆鍖栨樉绀�
-import MapConfig from '@/conf/MapConfig'
+import MapConfig from './conf/MapConfig'
import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
-import DownLoad from '@components/plugin/DownLoad'
+import DownLoad from './components/plugin/DownLoad'
// 娴嬮噺
import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
@@ -14,11 +14,9 @@
import '@/components/plugin/magicMarker.css'
import '@components/plugin/pulse/Pulse' // marker 澶栧湀娉�
import '@components/plugin/pulse/Pulse.css' // marker 澶栧湀娉� css
-import BasemapHelper from '@components/helpers/BasemapHelper'
-import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
-
-// import eventBus from '@/eventBus'
-import eventBus from './eventBus'
+import BasemapHelper from './components/helpers/BasemapHelper'
+import VectorLayerHelper from './components/helpers/VectorLayerHelper'
+// import eventBus from './eventBus'
let map = null
const L = window.L
@@ -34,7 +32,7 @@
console.log(event, a, b)
})
- eventBus.$emit('map-obj', map)
+ // eventBus.$emit('map-obj', map)
window.map = map
window.L = L
diff --git a/src/components/BaseNav/PublicChart.vue b/src/components/BaseNav/PublicChart.vue
new file mode 100644
index 0000000..bc858e5
--- /dev/null
+++ b/src/components/BaseNav/PublicChart.vue
@@ -0,0 +1,37 @@
+<template>
+ <!-- <div class="public-chart">-->
+ <div style="width:800px;height:200px;" ref="publicChart"></div>
+ <!-- </div>-->
+</template>
+
+<script>
+export default {
+ name: 'PublicChart',
+ props: {
+ propsData: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ }
+ },
+ data () {
+ return {
+ publicChart: null
+ }
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.publicChart = this.$echarts.init(this.$refs.publicChart)
+ this.publicChart.clear()
+ this.publicChart.setOption(this.propsData)
+ window.onresize = this.publicChart.resize()
+ })
+ },
+ methods: {}
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/components/BaseNav/WasteGas/DayData.vue b/src/components/BaseNav/WasteGas/DayData.vue
index 74174c7..e6a14ab 100644
--- a/src/components/BaseNav/WasteGas/DayData.vue
+++ b/src/components/BaseNav/WasteGas/DayData.vue
@@ -218,14 +218,16 @@
for (var l = 0; l < nameList.length; l++) {
var obj
var iconurl
- if (nameList[l] === 'COD') {
+ if (nameList[l] === '浜屾哀鍖栫～') {
iconurl = 'image://../assets/imgs/legend/SO2.png'
- } else if (nameList[l] === '姘ㄦ爱') {
+ } else if (nameList[l] === '姘哀鍖栫墿') {
iconurl = 'image://../assets/imgs/legend/NOX.png'
- } else if (nameList[l] === '鎬荤７') {
+ } else if (nameList[l] === '鐑熷皹') {
iconurl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (nameList[l] === '鎬绘爱') {
- iconurl = 'image://../assets/imgs/legend/zongdan.png'
+ } else if (nameList[l] === '闈炵敳鐑锋�荤儍') {
+ iconurl = 'image://../assets/imgs/legend/grn.png'
+ } else if (nameList[l] === '娓╁害') {
+ iconurl = 'image://../assets/imgs/legend/WenDu.png'
} else {
iconurl = 'image://../assets/imgs/legend/VOCs.png'
}
@@ -270,18 +272,18 @@
if (nameList[j] === 'COD') {
zdcbcolor = 'red'
zxcolor = '#fff21c'
- } else if (nameList[j] === '姘ㄦ爱') {
+ } else if (nameList[j] === '姘哀鍖栫墿') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
} else if (nameList[j] === '鎬荤７') {
zdcbcolor = 'red'
zxcolor = '#f48183'
- } else if (nameList[j] === '鎬绘爱') {
+ } else if (nameList[j] === '搴熸皵娴侀噺') {
zdcbcolor = 'red'
- zxcolor = '#d9f2f4'
+ zxcolor = '#70ff49'
} else {
zdcbcolor = 'red'
- zxcolor = '#9ACD32'
+ zxcolor = '#d9f2f4'
}
let sdata = []
@@ -471,8 +473,8 @@
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
} else if (seriesName === '娓╁害') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#F206FF;"></span>'
- } else {
- maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
+ } else if (seriesName === '搴熸皵娴侀噺') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#70ff49;"></span>'
}
s += maker + seriesName + ':' + valueFliter + '<br />'
}
@@ -581,7 +583,7 @@
type: 'value',
name: dataUnit,
max: function (value) {
- const ma = value.max > 120 ? value.max : 120
+ const ma = value.max > 12 ? value.max : 120
return parseInt(ma)
},
axisLabel: {
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index a50c62b..40d3d81 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -23,7 +23,7 @@
</div>
<div style="width:5rem;height:1.5rem;" id="echarts" ref="wastegashour"></div>
</div>
-<!-- 鏄庣粏寮规-->
+ <!-- 鏄庣粏寮规-->
<el-dialog :visible.sync="showSchedule"
:modal="false"
v-dialogDrag
@@ -276,7 +276,7 @@
iconurl = 'image://../assets/imgs/legend/grn.png'
} else if (nameList[l] === '娓╁害') {
iconurl = 'image://../assets/imgs/legend/WenDu.png'
- } else {
+ } else if (nameList[l] === '搴熸皵娴侀噺') {
iconurl = 'image://../assets/imgs/legend/VOCs.png'
}
@@ -314,18 +314,15 @@
if (nameList[j] === '浜屾哀鍖栫～') {
zdcbcolor = 'red'
zxcolor = '#fff21c'
- } else if (nameList[j] === '姘ㄦ爱') {
+ } else if (nameList[j] === '姘哀鍖栫墿') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
} else if (nameList[j] === '鐑熷皹') {
zdcbcolor = 'red'
zxcolor = '#f48183'
- } else if (nameList[j] === '娓╁害') {
+ } else if (nameList[j] === '搴熸皵娴侀噺') {
zdcbcolor = 'red'
- zxcolor = '#F206FF'
- } else {
- zdcbcolor = 'red'
- zxcolor = '#9ACD32'
+ zxcolor = '#52ff3f'
}
const ydata = {
name: nameList[j],
@@ -513,7 +510,7 @@
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
} else if (seriesName === '娓╁害') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#F206FF;"></span>'
- } else {
+ } else if (seriesName === '搴熸皵娴侀噺') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
}
s += maker + seriesName + ':' + valueFliter + '<br />'
@@ -623,7 +620,7 @@
type: 'value',
name: dataUnit,
max: function (value) {
- const ma = value.max > 120 ? value.max : 120
+ const ma = value.max > 12 ? value.max : 12
return parseInt(ma)
},
axisLabel: {
diff --git a/src/components/BaseNav/WasteGas/WasteGasRealChart.vue b/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
index 1991563..c1b1705 100644
--- a/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasRealChart.vue
@@ -26,12 +26,13 @@
</div>
<div class="echarts-chart">
<div style="width:5rem;height:1.5rem;" ref="echarts"></div>
+ <!-- <public-chart :propsData="propsData"></public-chart>-->
</div>
</div>
</template>
<script>
-
+// import PublicChart from '../PublicChart'
import PublicDataStandard from '../PublicDataStandard'
import mapApi from '../../../api/mapApi'
import 'dayjs/locale/es'
@@ -40,6 +41,7 @@
export default {
name: 'WasteGasRealChart',
components: {
+ // PublicChart,
PublicDataStandard
},
data () {
@@ -86,6 +88,7 @@
val: null
}
}],
+ propsData: {},
// 寮�濮� /缁撴潫 鏃堕棿 鍜岄噰鏍风偣鍊肩殑缁戝畾鍊兼暟鎹�
formData: {
@@ -148,9 +151,9 @@
const nameListTemp = [
{
'TJIP45.y2h508CEMS01NOX': '姘哀鍖栫墿',
- 'TJIP45.y2h508CEMS01SO2': '鐑熷皹',
- 'TJIP45.y2h508CEMS01F': '浜屾哀鍖栫７',
- 'TJIP45.y2h508CEMS01PM': 'ph'
+ 'TJIP45.y2h508CEMS01SO2': '姘у惈閲�',
+ 'TJIP45.y2h508CEMS01F': '娓╁害',
+ 'TJIP45.y2h508CEMS01PM': '搴熸皵娴侀噺'
// 'TJIP45.lscl2tb552AI10710': '浜屾哀鍖栫⒊'
}
]
@@ -223,15 +226,15 @@
for (let l = 0; l < nameList.length; l++) {
let obj
let iconUrl
- if (nameList[l] === 'ph') {
+ if (nameList[l] === '娓╁害') {
iconUrl = 'image://../assets/imgs/legend/WenDu.png'
} else if (nameList[l] === '姘哀鍖栫墿') {
iconUrl = 'image://../assets/imgs/legend/NOX.png'
} else if (nameList[l] === '鐑熷皹') {
iconUrl = 'image://../assets/imgs/legend/zongdan.png'
- } else if (nameList[l] === '浜屾哀鍖栫７') {
- iconUrl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (nameList[l] === '浜屾哀鍖栫⒊') {
+ } else if (nameList[l] === '姘у惈閲�') {
+ iconUrl = 'image://../assets/imgs/legend/VOCs.png'
+ } else if (nameList[l] === '搴熸皵娴侀噺') {
iconUrl = 'image://../assets/imgs/legend/VOCs.png'
}
@@ -265,7 +268,7 @@
for (let j = 0; j < nameList.length; j++) {
let zdcbcolor, zxcolor
- if (nameList[j] === 'ph') {
+ if (nameList[j] === '娓╁害') {
zdcbcolor = 'red'
zxcolor = '#f206ff'
} else if (nameList[j] === '鐑熷皹') {
@@ -274,12 +277,12 @@
} else if (nameList[j] === '姘哀鍖栫墿') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
- } else if (nameList[j] === '浜屾哀鍖栫⒊') {
+ } else if (nameList[j] === '搴熸皵娴侀噺') {
zdcbcolor = 'red'
zxcolor = '#9ACD32'
- } else if (nameList[j] === '浜屾哀鍖栫７') {
+ } else if (nameList[j] === '姘у惈閲�') {
zdcbcolor = 'red'
- zxcolor = '#f48183'
+ zxcolor = '#008000'
}
let ydata
// 涓存椂鏁版嵁
@@ -471,7 +474,7 @@
let maker = params[i].marker
let colo = ''
switch (seriesName) {
- case 'ph':
+ case '娓╁害':
colo = '#f206ff'
break
case '姘哀鍖栫墿':
@@ -480,11 +483,11 @@
case '鐑熷皹':
colo = '#e0ffff'
break
- case '浜屾哀鍖栫⒊':
+ case '搴熸皵娴侀噺':
colo = '#9ACD32'
break
- case '浜屾哀鍖栫７':
- colo = '#f48183'
+ case '姘у惈閲�':
+ colo = '#008000'
break
default:
colo = ''
diff --git a/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue b/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
index 6c2eaef..cf1c44f 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterRealChart.vue
@@ -22,7 +22,7 @@
<el-option v-for="(item,index) in regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch()">鏌ヨ</el-button>
-<!-- <el-button>鏄庣粏琛�</el-button>-->
+ <!-- <el-button>鏄庣粏琛�</el-button>-->
</div>
<div class="echarts-chart">
<div style="width:5rem;height:1.5rem;" ref="echarts"></div>
@@ -148,11 +148,11 @@
// temp 涓存椂鏁版嵁鍒ゆ柇鏂规硶
const tempList = [
{
- 'TJIP45.lscl2tbAIA-10505-1': '姘哀鍖栫墿',
- 'TJIP45.lscl2tbAIA-10505-2': '鐑熷皹',
- 'TJIP45.lscl2tb552AISA11202A': '浜屾哀鍖栫７',
- 'TJIP45.lscl2tb552AISA11201B': 'pH',
- 'TJIP45.lscl2tb552AI10710': '浜屾哀鍖栫⒊'
+ 'TJIP45.lscl2tb552AISA11201B': 'COD',
+ 'TJIP45.lscl2tbAIA-10505-1': '姘ㄦ爱',
+ 'TJIP45.lscl2tbAIA-10505-2': '鎬荤７',
+ 'TJIP45.lscl2tb552AI10710': '鎬绘爱',
+ 'TJIP45.lscl2tb552AISA11202A': '搴熸按娴侀噺'
}
]
// 鎸囨爣
@@ -237,15 +237,15 @@
for (let l = 0; l < this.nameList.length; l++) {
let obj
let IconUrl
- if (this.nameList[l] === 'pH') {
- IconUrl = 'image://../assets/imgs/legend/WenDu.png'
- } else if (this.nameList[l] === '姘哀鍖栫墿') {
+ if (this.nameList[l] === 'COD') {
+ IconUrl = 'image://../assets/imgs/legend/SO2.png'
+ } else if (this.nameList[l] === '姘ㄦ爱') {
IconUrl = 'image://../assets/imgs/legend/NOX.png'
- } else if (this.nameList[l] === '鐑熷皹') {
- IconUrl = 'image://../assets/imgs/legend/zongdan.png'
- } else if (this.nameList[l] === '浜屾哀鍖栫⒊') {
+ } else if (this.nameList[l] === '鎬荤７') {
IconUrl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (this.nameList[l] === '浜屾哀鍖栫７') {
+ } else if (this.nameList[l] === '鎬绘爱') {
+ IconUrl = 'image://../assets/imgs/legend/zongdan.png'
+ } else if (this.nameList[l] === '搴熸按娴侀噺') {
IconUrl = 'image://../assets/imgs/legend/VOCs.png'
}
if (this.nameList[l] === '搴熸按' || this.nameList[l] === '搴熸按娴侀噺') { // 灏嗗簾姘存祦閲忔帓鍒版暟缁勬渶鍚�
@@ -279,19 +279,19 @@
this.ydatas = []
for (let j = 0; j < this.nameList.length; j++) {
let zdcbcolor, zxcolor
- if (this.nameList[j] === 'pH') {
+ if (this.nameList[j] === 'COD') {
zdcbcolor = 'red'
- zxcolor = '#900090'
+ zxcolor = '#ffff00'
} else if (this.nameList[j] === '姘ㄦ爱') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
- } else if (this.nameList[j] === '鐑熷皹') {
+ } else if (this.nameList[j] === '鎬荤７') {
zdcbcolor = 'red'
zxcolor = '#f48183'
} else if (this.nameList[j] === '鎬绘爱') {
zdcbcolor = 'red'
zxcolor = '#e0ffff'
- } else {
+ } else if (this.nameList[j] === '搴熸按娴侀噺') {
zdcbcolor = 'red'
zxcolor = '#9ACD32'
}
@@ -300,10 +300,10 @@
// 涓存椂鏁版嵁
const BBZMAPPING = {
COD: 35,
- pH: 9,
- 鎬绘爱: 15,
+ 姘ㄦ爱: 30,
鎬荤７: 0.3,
- 姘ㄦ爱: 3
+ 鎬绘爱: 15,
+ 搴熸按娴侀噺: 3
}
for (let m = 0; m < this.RealTimeDataList.length; m++) {
let stdValue = null
@@ -491,19 +491,19 @@
let maker = params[i].marker
let colo = ''
switch (seriesName) {
- case 'pH':
- colo = '#900090'
+ case 'COD':
+ colo = '#ffff00'
break
- case '浜屾哀鍖栫⒊':
+ case '姘ㄦ爱':
colo = '#00B0F0'
break
- case '鐑熷皹':
+ case '鎬绘爱':
colo = '#e0ffff'
break
- case '姘哀鍖栫墿':
+ case '搴熸按娴侀噺':
colo = '#9ACD32'
break
- case '浜屾哀鍖栫７':
+ case '鎬荤７':
colo = '#f48183'
break
default:
@@ -523,7 +523,8 @@
}
},
grid: { // 缃戞牸
- top: '20%'
+ top: '20%',
+ left: '15%'
},
legend: {
data: legend
@@ -578,7 +579,7 @@
type: 'value',
name: yname,
max: function (value) {
- return parseInt(value.max + 30)
+ return parseInt(value.max + 3)
},
axisLabel: {
formatter: '{value}',
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index 909038e..2ab18e6 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -117,8 +117,8 @@
for (var j in configs) {
const config = configs[j]
const checked = config.checked
- console.log(zoom)
- console.log(k)
+ // console.log(zoom)
+ // console.log(k)
if (checked && zoom > k) {
this.show(config)
} else if (checked && zoom < k) {
@@ -196,7 +196,7 @@
this.findLayerById(layer.getLayers(), id)
} else {
layer.eachLayer(function (layer) {
- console.log(layer)
+ // console.log(layer)
})
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 0fec718..4b3d479 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -17,8 +17,8 @@
title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎
</el-button>
<el-scrollbar style="height:450px">
- <el-card shadow="hover"> <!-- style="height: 300px"-->
- <span class="clearfixs">璧峰绠℃</span>
+ <el-card shadow="hover">
+ <span class="fixed-style">璧峰绠℃</span>
<el-table
ref="singleTable"
highlight-current-row
@@ -62,7 +62,7 @@
</template>
</el-table-column>
</el-table>
- <span class="clearfixs">缁撴潫绠℃</span>
+ <span class="fixed-style">缁撴潫绠℃</span>
<el-table
max-height="200"
highlight-current-row
@@ -105,7 +105,7 @@
</template>
</el-table-column>
</el-table>
- <span class="clearfixs">鍒嗘瀽缁撴灉:<span style="color: red;">{{ currentLinkIsTrue }}</span></span>
+ <span class="fixed-style">鍒嗘瀽缁撴灉:<span style="color: red;">{{ currentLinkIsTrue }}</span></span>
<el-table
highlight-current-row
max-height="200"
@@ -160,7 +160,7 @@
<el-button type="primary" @click="handleClick" size="mini" style="margin-bottom: 5px;" title="娓呴櫎缁樺埗">娓呴櫎
</el-button>
<el-card shadow="hover">
- <span class="clearfixs">鍙戠敓鐖嗚鐨勭娈�</span>
+ <span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span>
<el-table
ref="singleTable"
highlight-current-row
@@ -202,7 +202,7 @@
</template>
</el-table-column>
</el-table>
- <span class="clearfixs">闇�瑕佸叧闂殑闃�闂�</span>
+ <span class="fixed-style">闇�瑕佸叧闂殑闃�闂�</span>
<el-table
highlight-current-row
:data="bgFm"
@@ -343,7 +343,7 @@
<el-button type="primary" @click="jdmClear" size="mini" style="margin-bottom: 5px;" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎
</el-button>
<el-card class="box-card">
- <div slot="header" class="clearfixs">
+ <div slot="header" class="fixed-style">
<span>绠＄嚎鏌ヨ缁撴灉</span>
</div>
<el-table
@@ -371,7 +371,7 @@
</el-table>
</el-card>
<el-card class="box-card">
- <div slot="header" class="clearfixs">
+ <div slot="header" class="fixed-style">
<span>鏂潰鍥�</span>
</div>
<span v-show="!myChartShow" style="color: #909399;font-size: 12px;">鏆傛棤鏁版嵁</span>
@@ -387,7 +387,6 @@
<script>
import eventBus from '../../../../eventBus'
-// import main from "../leaflet/app/main"
import DrawLine from './AnalysisChoose/DrawLine'
import mapApi from '../../../../api/mapApi'
@@ -398,12 +397,13 @@
// 鍦板浘鐐瑰嚮绫诲瀷 first杩為�氭�х偣鍑� second鐖嗙鐐瑰嚮 third娴佸悜鐐瑰嚮 fourth妯柇闈�
activeName: 'first',
measure: null,
- map: null,
+ map: window.map,
myChart: null,
myChartShow: false,
flowPipeLine: null,
+ // 鐢ㄤ簬鍒ゆ柇
currentSelectStart: null,
currentSelectEnd: null,
currentSelectStartLine: null,
@@ -443,9 +443,8 @@
}
},
mounted () {
+ // 鍒濆鍖杄charts鍥捐〃
this.myChart = this.$echarts.init(this.$refs.myChart)
- // 鍏ㄥ眬map浼犻�� || this.map = window.map
- this.map = window.map
// 浣跨敤 DrwLine鏂规硶
eventBus.$on('draw-hdm-line', (points) => {
this.getHdmPoint(points)
@@ -470,11 +469,11 @@
// 娴佸悜鍦板浘涓婄偣鍑�
selectPipeLine () {
- this.map.on('click', this.selectClick)
+ window.map.on('click', this.selectClick)
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
- this.map.off('click', this.selectClick)
+ window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
console.log(point)
this.getPipeLine(point)
@@ -773,12 +772,12 @@
// 娴佸悜鏁版嵁璇锋眰
async getPipeLine (point) {
- const param = {
- x: point[0],
- y: point[1],
- radius: 3
- }
- console.log(param)
+ // const param = {
+ // x: point[0],
+ // y: point[1],
+ // radius: 3
+ // }
+ // console.log(param)
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
// const res = await api.getPipeline(param)
@@ -810,6 +809,7 @@
console.log('姝ｆ祦鍚戞樉绀�')
console.log(e)
+ // 娓呴櫎娴佸悜鏂规硶
this.clearLX()
// const param = {
// points: e.data,
@@ -859,7 +859,8 @@
// 妯柇闈㈡暟鎹姹�
async getHdmPoint (line) {
console.log('妯柇闈㈢殑缁樺埗绾�')
- console.table(line)
+ // console.table(line)
+ // 妯柇闈㈡暟鎹�
this.hdmParam = {
x1: line[0].lng,
y1: line[0].lat,
@@ -955,7 +956,7 @@
padding: 0;
}
-/deep/ .clearfixs {
+/deep/ .fixed-style {
display: inline-block;
color: #ffffff;
margin: 15px;
--
Gitblit v1.8.0