|
|
@@ -54,11 +54,11 @@
|
|
|
<template #bodyCell="{ column, text }">
|
|
|
<template v-if="column.dataIndex === 'valueJc' && text">
|
|
|
<div v-for="item in text.split(',')" :key="item">
|
|
|
- <span v-if="item.substring(item.indexOf(':') + 1)"
|
|
|
- style="display: inline-block;width: 48%;text-align: right; color:rgb(0, 242, 255);margin-right:5px">{{
|
|
|
+ <span v-if="item.substring(item.indexOf(':') + 1) && !isNaN(parseFloat(item.substring(item.indexOf(':') + 1)))"
|
|
|
+ style="display: inline-block;width: 45%;text-align: right; color:rgb(0, 242, 255);margin-right:5px">{{
|
|
|
item.substring(0, item.indexOf(':') + 1) }}</span>
|
|
|
- <span v-if="item.substring(item.indexOf(':') + 1)"
|
|
|
- style="display: inline-block; width:47%;text-align: left; color:#fff">{{
|
|
|
+ <span v-if="item.substring(item.indexOf(':') + 1) && !isNaN(parseFloat(item.substring(item.indexOf(':') + 1)))"
|
|
|
+ style="display: inline-block; width:50%;text-align: left; color:#fff">{{
|
|
|
item.substring(item.indexOf(':') + 1) }} </span>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -195,7 +195,7 @@ async function getStationList() {
|
|
|
v.linkstatus = v.linkId
|
|
|
v.linkstatusC = v.linkstatus == '0' ? '待启用' : v.linkstatus == '1' ? '连接' : '断开'
|
|
|
v.updateTime = v.time
|
|
|
- v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''},风速:${v.windSpeed || ''},气压:${v.pa || ''},温度:${v.temperature || ''},湿度:${v.humidity || ''},断面积:${v.area || ''}`
|
|
|
+ v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}kPa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`
|
|
|
|
|
|
})
|
|
|
})
|
