From b2fd0bba85ab205d8719752a122942e8603fd1b9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 26 Aug 2024 23:12:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=B0=94=E4=BD=93?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/airInfo/AirInfo.vue | 16 +++++++++++-----
 src/views/debug/index.vue                  |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index 5af5e27..94b3b54 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -324,7 +324,7 @@ const timeSelect = (index) => {
 const changeData = (item) => {
   return {
     equipmentId: item.equipmentId,
-    icon: changeIcon(item.equipmentType),
+    icon: changeIcon(item.equipmentType,item.equipmentName),
     name: item.equipmentName.slice(0, 2),
     max: item.maxRange,
     value: item.value,
@@ -332,7 +332,7 @@ const changeData = (item) => {
     unit: item.unit
   }
 }
-const changeIcon = (type) => {
+const changeIcon = (type,name) => {
   switch (type) {
     case "oxygen":
       return 'o2-icon.png';
@@ -340,6 +340,12 @@ const changeIcon = (type) => {
       return 'tempture-icon.png';
     case "humidness":
       return 'water-icon.png';
+    case "humiture":
+      if(name==='温度传感器'){
+        return 'tempture-icon.png';
+      }else if(name==='湿度传感器'){
+        return 'water-icon.png';
+      }
   }
 }
 const getAirInfo = (now) => {
@@ -347,15 +353,15 @@ const getAirInfo = (now) => {
   let airObj = {}
   let airArr = []
   now?.map(item => {
-    if (item.equipmentType === "oxygen" || item.equipmentType === "temperature" || item.equipmentType === "humidness") {
+    if (item.equipmentType === "oxygen" || item.equipmentType === "temperature" || item.equipmentType === "humidness"|| item.equipmentType === "humiture") {
       airObj = changeData(item)
       airArr.push(airObj)
-    } else if (item.equipmentType === "windSpeed") {
+    } else if (item.equipmentType === "windSpeed"||item.equipmentName==="风速传感器") {
       windSpeedType.value = item.equipmentType
       windSpeedId.value = item.equipmentId
       windSpeed.value = item.value
       windSpeedUnit.value = item.unit
-    } else if (item.equipmentType === "windDirection") {
+    } else if (item.equipmentType === "windDirection"||item.equipmentName==="风向传感器") {
       windDirectionSpeedType.value = item.equipmentType
       windDirectionSpeedId.value = item.equipmentId
       windDirection.value = item.value
diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue
index 740f05e..6e008f1 100644
--- a/src/views/debug/index.vue
+++ b/src/views/debug/index.vue
@@ -75,8 +75,8 @@ const handleSend = () => {
 }
 const initWebSocket = () => {
   // let wsUrl = `ws://192.168.31.176:9000/websocket/debug/${token}/${serialNumber.value}`
-  let wsUrl = import.meta.env.VITE_BASE_WSURL+`/${token}/${serialNumber.value}`;
-  // let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/debug/${token}/${serialNumber.value}`
+  // let wsUrl = import.meta.env.VITE_BASE_WSURL+`/${token}/${serialNumber.value}`;
+  let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/debug/${token}/${serialNumber.value}`
   console.log(wsUrl)
   socket = new WebSocket(wsUrl)
   //连接发生错误的回调方法