odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 修复气体展示' (#372) from dengjie into dev

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/372
This commit is contained in:
odjbin
2024-08-26 15:13:49 +00:00
parent f1425ae60b b2fd0bba85
commit 535b214c40
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/content/airInfo/AirInfo.vue
View File

@@ -324,7 +324,7 @@ const timeSelect = (index) => {
const changeData = (item) => { const changeData = (item) => {
return { return {
equipmentId: item.equipmentId, equipmentId: item.equipmentId,
icon: changeIcon(item.equipmentType), icon: changeIcon(item.equipmentType,item.equipmentName),
name: item.equipmentName.slice(0, 2), name: item.equipmentName.slice(0, 2),
max: item.maxRange, max: item.maxRange,
value: item.value, value: item.value,
@@ -332,7 +332,7 @@ const changeData = (item) => {
unit: item.unit unit: item.unit
} }
} }
const changeIcon = (type) => { const changeIcon = (type,name) => {
switch (type) { switch (type) {
case "oxygen": case "oxygen":
return 'o2-icon.png'; return 'o2-icon.png';
@@ -340,6 +340,12 @@ const changeIcon = (type) => {
return 'tempture-icon.png'; return 'tempture-icon.png';
case "humidness": case "humidness":
return 'water-icon.png'; return 'water-icon.png';
case "humiture":
if(name==='温度传感器'){
return 'tempture-icon.png';
}else if(name==='湿度传感器'){
return 'water-icon.png';
}
} }
} }
const getAirInfo = (now) => { const getAirInfo = (now) => {
@@ -347,15 +353,15 @@ const getAirInfo = (now) => {
let airObj = {} let airObj = {}
let airArr = [] let airArr = []
now?.map(item => { 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) airObj = changeData(item)
airArr.push(airObj) airArr.push(airObj)
} else if (item.equipmentType === "windSpeed") { } else if (item.equipmentType === "windSpeed"||item.equipmentName==="风速传感器") {
windSpeedType.value = item.equipmentType windSpeedType.value = item.equipmentType
windSpeedId.value = item.equipmentId windSpeedId.value = item.equipmentId
windSpeed.value = item.value windSpeed.value = item.value
windSpeedUnit.value = item.unit windSpeedUnit.value = item.unit
} else if (item.equipmentType === "windDirection") { } else if (item.equipmentType === "windDirection"||item.equipmentName==="风向传感器") {
windDirectionSpeedType.value = item.equipmentType windDirectionSpeedType.value = item.equipmentType
windDirectionSpeedId.value = item.equipmentId windDirectionSpeedId.value = item.equipmentId
windDirection.value = item.value windDirection.value = item.value

4
src/views/debug/index.vue
View File

@@ -75,8 +75,8 @@ const handleSend = () => {
} }
const initWebSocket = () => { const initWebSocket = () => {
// let wsUrl = `ws://192.168.31.176:9000/websocket/debug/${token}/${serialNumber.value}` // 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 = 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 = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/debug/${token}/${serialNumber.value}`
console.log(wsUrl) console.log(wsUrl)
socket = new WebSocket(wsUrl) socket = new WebSocket(wsUrl)
//连接发生错误的回调方法 //连接发生错误的回调方法