|
|
@@ -291,7 +291,7 @@
|
|
|
</view> -->
|
|
|
</view>
|
|
|
<scroll-view scroll-y="true" style="height: 520rpx;">
|
|
|
- <u-collapse class="u-collapse-bot3span" v-if='indexData4Obj.value=="bot3span"' style="padding-bottom: 30rpx;" >
|
|
|
+ <u-collapse class="u-collapse-bot3span" v-if='indexData4Obj.value=="bot3span"||indexData4Obj.value=="bot1span"' style="padding-bottom: 30rpx;" >
|
|
|
<u-collapse-item class="contentItem" v-for="(item,index) in indexData4List"
|
|
|
|
|
|
v-show="item.queryNum" :key="index" >
|
|
|
@@ -320,8 +320,9 @@
|
|
|
<span v-if="gun.sortNo">{{gun.sortNo}}号<text>/</text></span>{{gun.deviceName}}{{'枪'+gun.channelNo}}
|
|
|
</view>
|
|
|
|
|
|
- <view class="body3" >{{gun.workStatusText}}</view>
|
|
|
-
|
|
|
+ <view class="body3" v-if='indexData4Obj.value=="bot1span"' >{{gun.soc?gun.soc+'%':'充电中'}}</view>
|
|
|
+ <view class="body3" v-if='indexData4Obj.value=="bot3span"' >{{gun.workStatusText}}</view>
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
</u-collapse-item>
|
zhengkaixin