From 1289c40801a6f0da5ba786fb4a9e8203e3e2620a Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 08 五月 2025 15:04:29 +0800
Subject: [PATCH] 新xiugai
---
src/views/bigScreen/components/screen.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/src/views/bigScreen/components/screen.vue b/src/views/bigScreen/components/screen.vue
index eae6748..ac0ea94 100644
--- a/src/views/bigScreen/components/screen.vue
+++ b/src/views/bigScreen/components/screen.vue
@@ -175,14 +175,16 @@
<div></div>
<div></div>
<div></div>
+ <div></div>
</div>
<table class="weather">
- <tr class="weatherTit"><td>时间</td><td>温度</td><td>湿度</td><td>风速</td><td>风向</td><td>气压</td></tr>
+ <tr class="weatherTit"><td>时间</td><td>温度</td><td>湿度</td><td>风速</td><td>风力等级</td><td>风向</td><td>气压</td></tr>
<tr v-for="(item,index) in weatherData" :key="index" class="weatherRow">
<td>{{item.time}}</td>
<td>{{item.temp}}</td>
<td>{{item.humidity}}</td>
<td>{{item.windSpeed}}</td>
+ <td>{{item.level}}</td>
<td>{{ getDirectionName(item.windDirection)+'('+ item.windDirection +'度)'}}</td>
<td>{{item.pressure}}</td>
</tr>
@@ -649,6 +651,7 @@
temp: item.temp?item.temp:'--',
humidity: item.humidity?item.humidity:'--',
windSpeed: item.windSpeed?item.windSpeed:'--',
+ level: item.windSpeed ? handelLevel(item.windSpeed) : '--',
windDirection: item.windDirection?item.windDirection:'--',
pressure: item.pressure?item.pressure:'--'
}
@@ -668,6 +671,47 @@
message: res.data.msg
});
}
+ }
+ const handelLevel = (level) => {
+ let l = null
+ if(level>=0 && level<=0.2) {
+ l = '0级'
+ }else if(level>=0.3 && level<=1.5) {
+ l = '1级'
+ }else if(level>=1.6 && level<=3.3){
+ l = '2级'
+ }else if(level>=3.4 && level<=5.4){
+ l = '3级'
+ }else if(level>=5.5 && level<=7.9){
+ l = '4级'
+ }else if(level>=8.0 && level<=10.7){
+ l = '5级'
+ }else if(level>=10.8 && level<=13.8){
+ l = '6级'
+ }else if(level>=13.9 && level<=17.1){
+ l = '7级'
+ }else if(level>=17.2 && level<=20.7){
+ l = '8级'
+ }else if(level>=20.8 && level<=24.4){
+ l = '9级'
+ }else if(level>=24.5 && level<=28.4){
+ l = '10级'
+ }else if(level>=28.5 && level<=32.6){
+ l = '11级'
+ }else if(level>=32.7 && level<=36.9){
+ l = '12级'
+ }else if(level>=37.0 && level<=41.4){
+ l = '13级'
+ }else if(level>=41.5&& level<=46.1){
+ l = '14级'
+ }else if(level>=46.2 && level<=50.9){
+ l = '15级'
+ }else if(level>=51.0 && level<=56.0){
+ l = '16级'
+ }else if(level>=56.1 && level<=61.2){
+ l = '17级'
+ }
+ return l
}
const getGasTlData = async ()=>{
@@ -896,6 +940,7 @@
temp: item.temp?item.temp:'--',
humidity: item.humidity?item.humidity:'--',
windSpeed: item.windSpeed?item.windSpeed:'--',
+ level: item.windSpeed ? handelLevel(item.windSpeed) : '--',
windDirection: item.windDirection?item.windDirection:'--',
pressure: item.pressure?item.pressure:'--'
}
@@ -1967,12 +2012,16 @@
background: url("../../../assets/warningScreen/data-6.png") no-repeat center;
background-size: 90% 90%;
}
+ div:nth-of-type(7){
+ background: url("../../../assets/warningScreen/data-7.png") no-repeat center;
+ background-size: 90% 90%;
+ }
}
.weather{
width: 100%;
height: calc(100% - 60px);
- background: url("../../../assets/warningScreen/scroll-bg.png") no-repeat bottom;
- background-size: 100% 82%;
+ //background: url("../../../assets/warningScreen/scroll-bg.png") no-repeat bottom;
+ //background-size: 100% 82%;
tr{
width: 100%;
@@ -1984,7 +2033,7 @@
width: calc(100% / 6);
text-align: center;
box-sizing: border-box;
- font-size: 12px;
+ font-size: 11px;
}
}
.weatherTit{
@@ -1992,6 +2041,7 @@
}
.weatherRow{
color: #fff;
+ background: rgb(18,90,145);
}
}
@@ -2212,4 +2262,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2