From 41d3232a6ffd25d9d0f3612b59d17e3515b5bb89 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 26 Oct 2023 16:28:23 +0800
Subject: [PATCH] Merge branch 'feature_1.0'

---
 src/components/Wind/WRatingArr.js |    2 +-
 src/components/Wind/Map.vue       |   20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index 218f1e7..f658980 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -1485,11 +1485,12 @@
           let colorliststyleBgColor = this.styleBgColor(res.data)
           console.log('colorliststyleBgColor', colorliststyleBgColor)
           let deviceDetails = res.data
+          let windTip = 'inline'
           let windDeg = 0
           let windDir = ''
           let dushu = deviceDetails.a01008 === '-' ? '-' : JSON.parse(deviceDetails.a01008)
             .toFixed(0)
-          let levelNumber = deviceDetails.a01007 === '0.0' ? '-' : Number(deviceDetails.a01007)
+          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)
@@ -1499,22 +1500,31 @@
             )
             // console.log(windDirs)
             windDeg = windDirs
+            windTip = 'inline'
             if (windDirs === 0 || windDirs === '-') {
-              windDir = '������'
+              windDir = '-'
+              windTip = 'none'
             } else if (windDirs > 0 && windDirs < 90) {
               windDir = '���������'
+              windTip = 'inline'
             } else if (windDirs === 90) {
               windDir = '������'
+              windTip = 'inline'
             } else if (windDirs > 90 && windDirs < 180) {
               windDir = '���������'
+              windTip = 'inline'
             } else if (windDirs === 180) {
               windDir = '������'
+              windTip = 'inline'
             } else if (windDirs > 180 && windDirs < 270) {
               windDir = '���������'
+              windTip = 'inline'
             } else if (windDirs === 270) {
               windDir = '������'
+              windTip = 'inline'
             } else if (windDirs > 270 && windDirs < 360) {
               windDir = '���������'
+              windTip = 'inline'
             }
           }
           // ������������������������������
@@ -1617,13 +1627,13 @@
           <div class='windBox'>
             <div style="position: relative;width: 50%;text-align: center;color: #999;border-right: 1px dotted #999;" clss='windIcon'>
               <img style="width:140px; height:140px" src=${this.compassBg}>
-              <img style="width: 40px;height: 40px;position: absolute;left: 51%;top: 49%;transform: translate(-50%, -50%) rotate(${windDeg}deg)"
+              <img style="width: 40px;height: 40px;position: absolute;left: 51%;top: 49%;transform: translate(-50%, -50%) rotate(${windDeg}deg);display: ${windTip};"
                 src=${this.compassDirection}
               >
             </div>
             <div class='windInfor'>
-              <div>������: ${windDir} (${dushu}���)</div>
-              <div>������: ${levelNumber}m/s</div>
+              <div>������: ${windDir} ( ${dushu} �� )</div>
+              <div>������: ${levelNumber} m/s</div>
               <div>������: ${level}</div>
             </div>
           </div>
diff --git a/src/components/Wind/WRatingArr.js b/src/components/Wind/WRatingArr.js
index 769dab9..79529be 100644
--- a/src/components/Wind/WRatingArr.js
+++ b/src/components/Wind/WRatingArr.js
@@ -109,7 +109,7 @@
     "min": 0.3,
     "max": 1.5,
     "level": 1,
-    "name": "1���",
+    "name": "1&nbsp���",
     "landScene": "������������"
   },
   {

--
Gitblit v1.8.0