From e26316af3bbe224e59b5ba3fab54c80477daced1 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 26 Oct 2023 13:39:30 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/components/Wind/Map.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index 50d3619..218f1e7 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -1428,24 +1428,25 @@
return bgColorList
},
deviceDetail () {
- console.log('this.farterItem', this.farterItem)
+ console.log('this.farterItem', this.clickmac)
+ console.log('this.childerItem', this.childerItem)
this.monitorPointInfo = this.farterItem
this.$router.push({
name: 'deviceDetail',
params: {
monitorPointInfo: this.farterItem,
- device: this.clickmac,
+ device: this.childerItem,
macName: this.clickmac,
indexs: this.indexsLaber,
- items: [this.clickmac.latitude, this.clickmac.longitude]
+ items: [this.childerItem.latitude, this.childerItem.longitude]
},
query: {
monitorPointInfo: JSON.stringify(this.farterItem),
- device: JSON.stringify(this.clickmac),
+ device: JSON.stringify(this.childerItem),
macName: this.clickmac,
indexs: this.indexsLaber,
- items: [this.clickmac.latitude, this.clickmac.longitude]
+ items: [this.childerItem.latitude, this.childerItem.longitude]
}
})
},
@@ -1480,6 +1481,7 @@
.openPopup()
return
}
+ this.childerItem.name = res.data.name
let colorliststyleBgColor = this.styleBgColor(res.data)
console.log('colorliststyleBgColor', colorliststyleBgColor)
let deviceDetails = res.data
@@ -1487,7 +1489,9 @@
let windDir = ''
let dushu = deviceDetails.a01008 === '-' ? '-' : JSON.parse(deviceDetails.a01008)
.toFixed(0)
- let level = deviceDetails.a01007 === '0.0' ? '-' : WWindUtil.WindtoLevel(deviceDetails.a01007).level
+ let levelNumber = deviceDetails.a01007 === '0.0' ? '-' : Number(deviceDetails.a01007)
+ .toFixed(1)
+ let level = deviceDetails.a01007 === '0.0' ? '-' : WWindUtil.WindtoLevel(levelNumber).name
console.log('level', level)
if (deviceDetails.a01008) {
var windDirs = Number(
@@ -1619,8 +1623,8 @@
</div>
<div class='windInfor'>
<div>������: ${windDir} (${dushu}���)</div>
- <div>������: ${deviceDetails.a01007}m/s</div>
- <div>������: ${level}���</div>
+ <div>������: ${levelNumber}m/s</div>
+ <div>������: ${level}</div>
</div>
</div>
--
Gitblit v1.8.0