From c7a16ca1b6fbcb0b82a4a09c2e75014624082e37 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期四, 27 三月 2025 22:45:48 +0800
Subject: [PATCH] 修复走航融合功能bug
---
src/components/monitor/WeatherData.vue | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/components/monitor/WeatherData.vue b/src/components/monitor/WeatherData.vue
index 85d436a..af32269 100644
--- a/src/components/monitor/WeatherData.vue
+++ b/src/components/monitor/WeatherData.vue
@@ -2,10 +2,10 @@
<el-row class="wrap">
<el-form :inline="true" class="form">
<el-form-item label="娓╁害锛�" class="w-tag">
- {{ temprature }}
+ {{ temprature }}鈩�
</el-form-item>
<el-form-item label="婀垮害锛�" class="w-tag">
- {{ humidity }}
+ {{ humidity }}%
</el-form-item>
</el-form>
<!-- <div class="w-tag">{{ temprature }}</div>
@@ -14,10 +14,10 @@
<el-row class="wrap">
<el-form :inline="true" class="form">
<el-form-item label="椋庡悜锛�" class="w-tag">
- {{ windDirection }}
+ {{ _windDir }}
</el-form-item>
<el-form-item label="椋庨�燂細" class="w-tag">
- {{ windSpeed }}
+ {{ windSpeed }}m/s
</el-form-item>
</el-form>
<!-- <div class="w-tag">{{ windDirection }}</div>
@@ -26,31 +26,48 @@
</template>
<script>
import { FactorDatas } from '@/model/FactorDatas';
+import { windDir } from '@/constant/wind-dir';
export default {
props: {
loading: Boolean,
- factorDatas: FactorDatas
+ factorDatas: FactorDatas,
+ temprature: {
+ type: String,
+ default: '--'
+ },
+ humidity: {
+ type: String,
+ default: '--'
+ },
+ windDirection: {
+ type: String,
+ default: '--'
+ },
+ windSpeed: {
+ type: String,
+ default: '--'
+ }
},
data() {
- return {
- temprature: '--鈩�',
- humidity: '--%',
- windDirection: '--',
- windSpeed: '--m/s'
- };
+ return {};
},
watch: {
factorDatas: {
handler(nV) {
- this.temprature = this.lastOne(nV, '8') + '鈩�';
- this.humidity = this.lastOne(nV, '9') + '%';
- this.windDirection = this.lastOne(nV, '17');
- this.windSpeed = this.lastOne(nV, '16') + 'm/s';
+ // this.temprature = this.lastOne(nV, '8') + '鈩�';
+ // this.humidity = this.lastOne(nV, '9') + '%';
+ // this.windDirection = this.lastOne(nV, '17');
+ // this.windSpeed = this.lastOne(nV, '16') + 'm/s';
},
deep: true
}
},
+ computed: {
+ _windDir() {
+ return windDir(this.windDirection);
+ }
+ },
methods: {
lastOne(factorDatas, key) {
const f = factorDatas.factor[key];
--
Gitblit v1.9.3