From df4e3452ecdc510faa09c7310ba4857ed432553d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 12 Apr 2025 17:47:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard

---
 src/components/CommonWeather.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/CommonWeather.vue b/src/components/CommonWeather.vue
index 3d179c9..473e729 100644
--- a/src/components/CommonWeather.vue
+++ b/src/components/CommonWeather.vue
@@ -6,7 +6,7 @@
 			<img src="@/assets/images/home/homeLeft/tq.png" alt="" />
 			<span class="tq">{{ weather }}</span>
 			<span class="tq">风速:{{ windVelocity }} </span>
-			<span v-if="flylevel > 6" :class="[isFly === '建议飞行' ? 'qk' : isFly === '禁止飞行' ? 'redqk' : 'yellowqk']">{{
+			<span v-if="flylevel >= 5" :class="[isFly === '适合飞行' ? 'qk' : isFly === '禁止飞行' ? 'redqk' : 'yellowqk']">{{
 				isFly
 			}}</span>
 		</div>
@@ -37,7 +37,9 @@
 		weather.value = res.data.data.weather
 		isFly.value = res.data.data.flightAdvice
 		windVelocity.value = res.data.data.windPower
-		flylevel.value = res.data.data.adcode.length
+		flylevel.value = res.data.data.adcode.replace(/0+$/, "").length
+		
+			
 	})
 }
 
@@ -57,7 +59,7 @@
 <style scoped lang="scss">
 .time-weather {
 	margin-left: 45px;
-	width: 350px;
+	// width: 350px;
 	font-size: 14px;
 	height: 36px;
 	line-height: 36px;

--
Gitblit v1.9.3