From 6e229822c315f85465d27f2c411e0c9382acf7f5 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 26 Oct 2023 13:39:14 +0800
Subject: [PATCH] fix:实时风场图点击弹窗修改

---
 src/components/Wind/WRatingArr.js |   47 ++++++++++++++++++++++++++++-------------------
 src/components/Wind/Map.vue       |    8 +++++---
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index ea6a88a..218f1e7 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -1489,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(
@@ -1621,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>
          
diff --git a/src/components/Wind/WRatingArr.js b/src/components/Wind/WRatingArr.js
index ecee90c..769dab9 100644
--- a/src/components/Wind/WRatingArr.js
+++ b/src/components/Wind/WRatingArr.js
@@ -100,121 +100,128 @@
 WWindUtil.WRatingArr = [
   {
     "min": 0,
+    "max": 0.2,
+    "level": 0,
+    "name": "������",
+    "landScene": "������������"
+  },
+  {
+    "min": 0.3,
     "max": 1.5,
     "level": 1,
-    "name": "������",
+    "name": "1���",
     "landScene": "������������"
   },
   {
     "min": 1.6,
     "max": 3.3,
     "level": 2,
-    "name": "������",
+    "name": "2���",
     "landScene": "������������"
   },
   {
     "min": 3.4,
     "max": 5.4,
     "level": 3,
-    "name": "������",
+    "name": "3���",
     "landScene": "������������"
   },
   {
     "min": 5.5,
     "max": 7.9,
     "level": 4,
-    "name": "������",
+    "name": "4���",
     "landScene": "������������"
   },
   {
     "min": 8.0,
     "max": 10.7,
     "level": 5,
-    "name": "������",
+    "name": "5���",
     "landScene": "������������"
   },
   {
     "min": 10.8,
     "max": 13.8,
     "level": 6,
-    "name": "������",
+    "name": "6���",
     "landScene": "������������"
   },
   {
     "min": 13.9,
     "max": 17.1,
     "level": 7,
-    "name": "������",
+    "name": "7���",
     "landScene": "������������"
   },
   {
     "min": 17.2,
     "max": 20.7,
     "level": 8,
-    "name": "������",
+    "name": "8���",
     "landScene": "������������"
   },
   {
     "min": 20.8,
     "max": 24.4,
     "level": 9,
-    "name": "������",
+    "name": "9���",
     "landScene": "������������"
   },
   {
     "min": 24.5,
     "max": 28.4,
     "level": 10,
-    "name": "������",
+    "name": "10���",
     "landScene": "������������"
   },
   {
     "min": 28.5,
     "max": 32.6,
     "level": 11,
-    "name": "������",
+    "name": "11���",
     "landScene": "������������"
   },
   {
     "min": 32.7,
     "max": 36.9,
-    "level": 0,
-    "name": "������",
+    "level": 12,
+    "name": "12���",
     "landScene": "������������"
   },
   {
     "min": 37.0,
     "max": 41.4,
     "level": 13,
-    "name": "",
+    "name": "13���",
     "landScene": ""
   },
   {
     "min": 41.5,
     "max": 46.1,
     "level": 14,
-    "name": "",
+    "name": "14���",
     "landScene": ""
   },
   {
     "min": 46.2,
     "max": 50.9,
     "level": 15,
-    "name": "",
+    "name": "15���",
     "landScene": ""
   },
   {
     "min": 51.0,
     "max": 56.0,
     "level": 16,
-    "name": "",
+    "name": "16���",
     "landScene": ""
   },
   {
     "min": 56.1,
     "max": null,
     "level": 17,
-    "name": "",
+    "name": "17 ���",
     "landScene": ""
   }
 ]
@@ -381,7 +388,9 @@
  * @param {Object} value ��������� (m/s)
  */
 WWindUtil.WindtoLevel = function (value) {
-  let vl = Number(value);
+  let vl = Number(value)
+    .toFixed(1);
+  console.log('vl:', vl);
   if (!vl || vl < 0) { return null; }
   let arr = WWindUtil.WRatingArr;
   if (vl >= arr[arr.length - 1].min) {

--
Gitblit v1.8.0