From 2e0c26ba23e3b8ebdaed0b38e87526cce94bf215 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 19:39:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 8
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 7
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 15 +
src/assets/css/map/map-panel-style.less | 1
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 17 +
src/components/LayerController/logic/WasteWater.js | 10
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 7
src/components/BaseNav/PublicBounced/PublicBounced.vue | 7
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 329 +++++++++++++++++++++++++++++++----------
src/components/panel/topicSearch/SolidWasteSearch.vue | 40 ++--
11 files changed, 310 insertions(+), 133 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 2ed915f..83a6ced 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -48,6 +48,7 @@
}
.el-dialog {
+ height: 500px;
border: 0.00521rem solid @color;
box-shadow: 0 0 0.03rem @color;
background: rgba(0, 16, 30, 0.8);
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ab97fd7..8ccfd54 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -61,6 +61,7 @@
},
destoryed () {
this.$refs.PublicChart.$refs.Echats.CreateChart()
+ this.$refs.PublicChart.$refs.Echats.effChartShow()
},
methods: {
closePopup () {
@@ -85,12 +86,10 @@
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, hourData, dateData, value) {
+ setWaterData (dataWater, detailData, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
- // console.log(data)
this.getQueryOnlineMonData = hourData
- // console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getWasteWaterMonitoringDetails = detailData
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index b7d1745..0428a38 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -51,6 +51,12 @@
EChartsDateWasteWater,
EChartsWasteWaterTable
},
+ mounted () {
+ this.$refs.Echatrs.CreateChart()
+ },
+ updated () {
+ this.$refs.Echats.CreateChart()
+ },
data () {
return {
currentTab: this.current(),
@@ -59,7 +65,7 @@
},
methods: {
tabTaggle (taggleMenu, num) {
- this.currentTab = taggleMenu
+ this.currentTab = this.current()
this.active = num
// debugger
},
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 05af4e3..1ba24a5 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -77,8 +77,8 @@
formInline: {
user: '',
region: '',
- timeStart: '2021-03-14 00:00:00',
- timeEnd: '2021-04-12 00:00:00'
+ timeStart: '2021-03-15 00:00:00',
+ timeEnd: '2021-04-13 00:00:00'
},
JsonDateWater: {
datatype: 1,
@@ -319,7 +319,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 879b85c..d066b60 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -124,11 +124,6 @@
}
}
},
- created () {
- // this.$nextTick(() => {
- // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
- // }
- },
mounted () {
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
@@ -452,7 +447,7 @@
}],
series: serLists
}
- console.log(option)
+ // console.log(option)
this.myChart.setOption(option)
/*
this.myChart.on('legendselectchanged', function (params) {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index c224353..f771149 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -53,7 +53,7 @@
center
v-dialogDrag
>
- <div class="el-dialog-div" style="height: 260px">
+ <div class="el-dialog-div" style="height: 500px">
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
@@ -62,6 +62,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+// import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -78,8 +79,8 @@
value: '',
formInline: {
region: '',
- timeStart: '2021-04-12 17:00:00',
- timeEnd: '2021-04-13 16:00:00'
+ timeStart: '2021-04-12 10:00:00',
+ timeEnd: '2021-04-13 09:00:00'
},
myChart: null,
JsonHourWater: {
@@ -137,6 +138,11 @@
}
},
mounted () {
+ // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ // this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
+ // this.onSubmit()
+ },
+ updated () {
this.onSubmit()
},
methods: {
@@ -322,7 +328,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend,
@@ -683,9 +690,7 @@
}
}
.el-dialog-div {
- //height: 50vh!important;
overflow: auto;
- //overflow: hidden;
}
#echarts {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index b59c45b..be91bb6 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -249,16 +249,18 @@
}
},
mounted () {
- // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- // this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
- // this.DrawEXHRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
+ // console.log(this.formInline.timeStart)
+ console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
methods: {
onSubmit () {
this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
- this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
+ this.RealTimeChart = this.$echarts.init(this.$refs.main)
var serLists = []
for (var i = 0; i < ydatas.length; i++) {
// var zdcbcolor = ydatas[i].zdcbcolor
@@ -412,7 +414,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend
@@ -489,7 +492,7 @@
}
}, {
type: 'value',
- name: '娴侀噺(m鲁/h)',
+ name: '娴侀噺(m鲁/d)',
axisLabel: {
formatter: '{value}',
textStyle: {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
index 3fa7022..eb0006d 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -6,58 +6,117 @@
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
+ <div style="width: 755px">
<el-table
:data="tableData"
+ max-height="255px"
style="width: 100%;height: 100%">
<el-table-column
- prop="tableData.LabMonTime"
+ prop="date"
+ width="130"
label="妫�娴嬫椂闂�">
+ </el-table-column>
+ <el-table-column
+ label="BOD5">
+ <el-table-column
+ prop="codWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="codTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
</el-table-column>
<el-table-column
label="COD">
<el-table-column
- prop="tableData.MonItemId"
+ prop="phWatch"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="codTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="PH">
<el-table-column
- prop="tableData.MonItemId"
+ prop="bod5Watch"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="BOD5">
- <el-table-column
- prop="tableData.MonItemId"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="tableData.LabMonTime"
+ prop="bod5Time"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="姘ㄦ爱">
<el-table-column
- prop="tableData.MonItemId"
+ prop="adWatch"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="adTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
+ <el-table-column
+ label="鎸ュ彂閰�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="姘熺瀛�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="纭寲鐗�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鐭虫补绫�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鎮诞鐗�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
</el-table>
+ </div>
</template>
<script>
@@ -65,71 +124,181 @@
name: 'EChartsTable',
data () {
return {
- // tableLabel: [
- // {
- // label: '妫�娴嬫椂闂�',
- // prop: 'StoragePlaceId'
- // },
- // {
- // label: '浜屾哀鍖栫～',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '姘哀鍖栫墿',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '鐑熷皹',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '榛戝害',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // }
- // ],
- tableData: []
+ tableData: [{
+ date: '2016-05-03 12:00:00',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '1',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:00:15',
+ codWatch: '-',
+ codTime: '2',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '2',
+ adWatch: '1',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:00:30',
+ codWatch: '1',
+ codTime: '2',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:01:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:01:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:02:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:02:30',
+ codWatch: '-',
+ codTime: '-',
+ phWatch: '2',
+ phTime: '-',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:03:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:03:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '1'
+ },
+ {
+ date: '2016-05-03 12:04:15',
+ codWatch: '-',
+ codTime: '-',
+ phWatch: '1',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:04:30',
+ codWatch: '-',
+ codTime: '1',
+ phWatch: '2',
+ phTime: '-',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:05:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:05:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '1'
+ },
+ {
+ date: '2016-05-03 12:06:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:06:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '1'
+ }]
}
},
created () {
- this.$nextTick(() => {
- this.$attrs.ManualData.forEach(item => {
- this.tableData = [...item]
- })
- this.tableData.LabMonTime = 100
- console.log(this.tableData)
- })
+ // this.$nextTick(() => {
+ // this.$attrs.ManualData.forEach(item => {
+ // this.tableData = [...item]
+ // })
+ // this.tableData.LabMonTime = 100
+ // console.log(this.tableData)
+ // })
}
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
index 0ca567b..2a3d35f 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
@@ -39,7 +39,7 @@
}
},
mounted () {
- console.log(this.$attrs.value)
+ // console.log(this.$attrs.value)
if (this.$attrs.value === 'feiqi') {
this.tableData = this.$attrs.getWasteGasDetails
// console.log(this.$attrs.getWasteGasDetails)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 5b510ae..2ed9ee0 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -71,15 +71,13 @@
endTime: '2020-04-07',
dataType: '1'
}
- const hourData = await mapApi.getQueryOnlineMonData(hourValue)
- const dateData = await mapApi.getQueryOnlineMonData(dateValue)
- // console.log(dateData)
+ const detailData = await mapApi.getWasteWaterMonitoringDetails(dataValue) // 鏄庣粏琛ㄨ繑鍥炴暟鎹�
+ const hourData = await mapApi.getQueryOnlineMonData(hourValue) // 灏忔椂鏁版嵁
+ const dateData = await mapApi.getQueryOnlineMonData(dateValue) // 鏃ユ暟鎹�
// const drawback = await mapApi.getWasteWaterMonitoring()
- // console.log(drawback)
- const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
+ instance.setWaterData(e.layer.options.test, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 78a436b..3457c1d 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -152,26 +152,6 @@
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
this.searchDataDisplay = result.Result.DataInfo
- // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
- for (let i = 0; i < this.searchDataDisplay.length; i++) {
- // 缁忕含搴� 浣嶇疆
- const positionX = this.searchDataDisplay[i].Latitude
- const positionY = this.searchDataDisplay[i].Longitude
-
- // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
- const judgeValue = this.searchDataDisplay[i].StorageQty
- var iconUrl = this.differentTypes(judgeValue)
-
- const marker = this.L.marker([positionX, positionY], {
- // totransferData: this.searchDataDisplay[i],
- icon: this.L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- })
- })
- this.layer.addLayer(marker)
- }
},
// 涓嶅悓绫诲瀷鍥剧墖灏佽
differentTypes (judgeValue) {
@@ -187,6 +167,26 @@
async setBounced (val) {
const pos = [val.Latitude, val.Longitude]
window.map.flyTo(pos, 11)
+ // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
+ // for (let i = 0; i < this.searchDataDisplay.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = val.Latitude
+ const positionY = val.Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
+ const judgeValue = val.StorageQty
+ var iconUrl = this.differentTypes(judgeValue)
+
+ const marker = this.L.marker([positionX, positionY], {
+ // totransferData: this.searchDataDisplay[i],
+ icon: this.L.icon({
+ iconUrl: iconUrl,
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
+ })
+ })
+ this.layer.addLayer(marker)
+ // }
const t1 = setTimeout(async () => {
const dataValue = {
StoragePlaceId: val.StoragePlaceId
--
Gitblit v1.8.0