消息列表优化
This commit is contained in:
@@ -21,21 +21,26 @@
|
||||
<view class="grid-card-content-1">
|
||||
<view class="item">{{ item.label }}</view>
|
||||
<view class="item" v-for="(child, childIndex) in item.value" :key="childIndex">
|
||||
{{ child }}
|
||||
<text>{{ child.label }}</text>
|
||||
<text style="font-weight: 700">{{ child.value }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="module">
|
||||
<view class="module" v-if="IOData.length">
|
||||
<view class="grid-card">
|
||||
<view class="grid-card-content-2">
|
||||
<view class="grid-card-content-6">
|
||||
<template v-for="(item, index) in IOData">
|
||||
<view class="item">{{ item.clDid }}</view>
|
||||
<view class="item">
|
||||
<view style="width: 30rpx"> {{ item.value || '-' }}</view>
|
||||
<view class="item" style="font-weight: 700">
|
||||
{{ item.value || '-' }}
|
||||
<view v-if="item.value"> °C</view>
|
||||
</view>
|
||||
</template>
|
||||
<template v-for="(item, index) in 3 - (IOData.length % 3)">
|
||||
<view class="item"></view>
|
||||
<view class="item"> </view>
|
||||
</template>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -61,7 +66,7 @@
|
||||
<basic :basicData="basicData"></basic>
|
||||
</view>
|
||||
<view v-else-if="navMenuActive == 1">
|
||||
<xieBo :basicData="basicData"></xieBo>
|
||||
<xieBo :dataTime="dataTime" :basicData="basicData"></xieBo>
|
||||
</view>
|
||||
<view v-else-if="navMenuActive == 2">
|
||||
<power :basicData="basicData"></power>
|
||||
@@ -98,13 +103,24 @@
|
||||
@confirm="dialogInputConfirm"
|
||||
></uni-popup-dialog>
|
||||
</uni-popup> -->
|
||||
<!-- 输入框示例 -->
|
||||
<uni-popup ref="inputDialog" type="dialog">
|
||||
<uni-popup-dialog ref="inputClose" type="info" mode="input" :title="dialogType"
|
||||
value="对话框预置提示内容!"
|
||||
placeholder="请输入内容" @confirm="dialogInputConfirm">
|
||||
<uni-easyinput type="textarea" :maxlength="250" autoHeight v-model="remarkContent"
|
||||
placeholder="请输入备注"></uni-easyinput>
|
||||
<!-- 输入框示例 -->
|
||||
<uni-popup ref="inputDialog" type="dialog">
|
||||
<uni-popup-dialog
|
||||
ref="inputClose"
|
||||
type="info"
|
||||
mode="input"
|
||||
:title="dialogType"
|
||||
value="对话框预置提示内容!"
|
||||
placeholder="请输入内容"
|
||||
@confirm="dialogInputConfirm"
|
||||
>
|
||||
<uni-easyinput
|
||||
type="textarea"
|
||||
:maxlength="250"
|
||||
autoHeight
|
||||
v-model="remarkContent"
|
||||
placeholder="请输入备注"
|
||||
></uni-easyinput>
|
||||
</uni-popup-dialog>
|
||||
</uni-popup>
|
||||
</view>
|
||||
@@ -132,6 +148,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dataTime: '',
|
||||
remarkContent: '',
|
||||
dialogType: '',
|
||||
domLoading: true,
|
||||
@@ -425,12 +442,22 @@ export default {
|
||||
element.showKey.forEach((key) => {
|
||||
data.forEach((item) => {
|
||||
if (item.statisticalName === key && item.phase === 'avg') {
|
||||
if(key === 'Apf_RmsI_TolOut(A)'){
|
||||
arr.push( '总输出电流:' + item.statisticalData + 'A')
|
||||
}else{
|
||||
arr.push( '电流畸变率:' + item.statisticalData + '%')
|
||||
if (key === 'Apf_RmsI_TolOut(A)') {
|
||||
arr.push({
|
||||
label: '总输出电流:',
|
||||
value: item.statisticalData + 'A',
|
||||
})
|
||||
} else {
|
||||
arr.push({
|
||||
label: '电流畸变率:',
|
||||
value: item.statisticalData + '%',
|
||||
})
|
||||
// arr.push('电流畸变率:' + item.statisticalData + '%')
|
||||
}
|
||||
}
|
||||
if (item.time) {
|
||||
this.dataTime = item.time.seconds
|
||||
}
|
||||
})
|
||||
})
|
||||
element.value = arr
|
||||
@@ -582,10 +609,9 @@ export default {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 10rpx;
|
||||
width: 200rpx;
|
||||
opacity: 0.8;
|
||||
|
||||
.grid-card-content-2,
|
||||
.grid-card-content-6,
|
||||
.grid-card-content-1 {
|
||||
font-size: 16rpx;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user