|
@@ -16,7 +16,7 @@
|
|
|
<view class="sensor-min" v-for="(item,index) in sensorData" :key="index">
|
|
<view class="sensor-min" v-for="(item,index) in sensorData" :key="index">
|
|
|
<img class="sensor-l" :src="baseUrl+item.icon" />
|
|
<img class="sensor-l" :src="baseUrl+item.icon" />
|
|
|
<view class="sensor-r" :class="item.type?'color-B':'color-A'">{{item.deviceName}}:
|
|
<view class="sensor-r" :class="item.type?'color-B':'color-A'">{{item.deviceName}}:
|
|
|
- {{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}
|
|
|
|
|
|
|
+ {{item.deviceValue?item.deviceValue:'--'}}{{item.unit&&item.deviceValue?item.unit:''}}
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -530,18 +530,19 @@
|
|
|
width: 42rpx;
|
|
width: 42rpx;
|
|
|
height: 42rpx;
|
|
height: 42rpx;
|
|
|
margin-right: 20rpx;
|
|
margin-right: 20rpx;
|
|
|
|
|
+ margin-top:12rpx;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.sensor-r {
|
|
.sensor-r {
|
|
|
|
|
+ display: inline-block;
|
|
|
font-family: PingFang SC;
|
|
font-family: PingFang SC;
|
|
|
font-weight: 500;
|
|
font-weight: 500;
|
|
|
font-size: 28rpx;
|
|
font-size: 28rpx;
|
|
|
-
|
|
|
|
|
|
|
+ height:30rpx;
|
|
|
line-height: 30rpx;
|
|
line-height: 30rpx;
|
|
|
|
|
+ margin-top:18rpx;
|
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
|
-
|
|
|
|
|
text-overflow: ellipsis;
|
|
text-overflow: ellipsis;
|
|
|
-
|
|
|
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
|
}
|
|
}
|
|
|
|
|
|