蓝牙调试页面初步完成
This commit is contained in:
@@ -48,13 +48,17 @@
|
||||
|
||||
</view>
|
||||
|
||||
<scroll-view scroll-y scroll-into-view="{{toView}}" id="myScroll" style="height:{{scrollHeight}}rpx;" >
|
||||
<view class='nav-list1 bg-white' bindtouchstart="handleTouchStart"
|
||||
bindtouchend="handleTouchEnd" style="margin-top: 20rpx;">
|
||||
<scroll-view scroll-y scroll-into-view="{{toView}}" id="myScroll" style="height:{{scrollHeight-30}}rpx;" >
|
||||
<view class='nav-list1' bindtouchstart="handleTouchStart"
|
||||
bindtouchend="handleTouchEnd" style="margin-bottom: 30rpx;">
|
||||
<view bindtap="goProcess" bindlongtap="GetMAC_long" data-room="{{item.RoomNumber}}" data-hotel="{{Hotelinfo.HotelName}}"
|
||||
data-status="{{item.Status}}" data-HotelCode="{{Hotelinfo.Code}}" data-roomtypeid="{{item.RoomTypeID}}" hover-class="navigator-hover" class="nav-li4 bg-{{item.Status===1? 'cyan':'gray'}}" wx:for="{{HostsDataFilters}}" id="msg-{{index}}" wx:key>
|
||||
<view style="font-size: 32rpx;justify-content:start" >{{item.RoomNumber}}</view>
|
||||
<view style="font-size: 20rpx;justify-content:start" >{{item.MAC}}</view>
|
||||
data-status="{{item.Status}}" data-HotelCode="{{Hotelinfo.Code}}" data-roomtypeid="{{item.RoomTypeID}}" hover-class="navigator-hover" class="nav-li4 {{item.Status===1? 'online':'offline'}}" wx:for="{{HostsDataFilters}}" id="msg-{{index}}" wx:key>
|
||||
<view style="font-size: 32rpx;justify-content:start" >{{item.RoomNumber}}</view>
|
||||
<view style="font-size: 20rpx;justify-content:start; color: {{(!item.MAC && item.Status !== 1) ? '#FF3B30' : '#666666'}};" >
|
||||
{{item.MAC || (item.Status !== 1 ? '点击扫码绑定主机' : '')}}
|
||||
</view>
|
||||
<!-- 升级进度显示(若当前正在升级此房间) -->
|
||||
<view wx:if="{{CurrentUpgradeDev == item.RoomNumber}}" class="upgrade-badge">升级: {{CurrentUpgradeDevStart}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -103,30 +107,47 @@ bindtouchend="handleTouchEnd" style="margin-top: 20rpx;">
|
||||
|
||||
</view>
|
||||
<view class=" flex align-center " style="height: 70rpx;background: aquamarine;" >
|
||||
|
||||
<view class="flex-treble margin-xs" style="height: 50rpx;" bindtap="ALLcheckboxSub" >
|
||||
<checkbox checked="{{Allcheckbox}}" ></checkbox>
|
||||
|
||||
<checkbox checked="{{Allcheckbox}}" ></checkbox>
|
||||
<text >全选</text>
|
||||
</view>
|
||||
<view class="flex-eight" >正在升级房号:{{CurrentUpgradeDev}}:{{CurrentUpgradeDevStart}}</view>
|
||||
<view class="flex-treble " style="justify-content: flex-end">已升级设备: {{UpgradeCount}} </view>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="flex" style="margin-left: 12rpx; align-items: center;">
|
||||
<text style="margin-right:12rpx">已勾选: {{checkedCount}}/{{totalCount}}</text>
|
||||
<text style="margin-right:12rpx">成功: {{successCount}}</text>
|
||||
<text>失败: {{failCount}}</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<!-- 排序卡片 -->
|
||||
<view class=" flex align-center " style="height: 40rpx;background: aquamarine; justify-content:flex-end; padding-right:12rpx;" >
|
||||
<view style="display:flex; align-items:center; margin-left:12rpx;">
|
||||
<checkbox checked="{{Allcheckbox}}"></checkbox>
|
||||
<text style="margin-left:6rpx;">房号排序</text>
|
||||
</view>
|
||||
<view style="display:flex; align-items:center; margin-left:12rpx;">
|
||||
<checkbox checked="{{Allcheckbox}}"></checkbox>
|
||||
<text style="margin-left:6rpx;">固件版本排序</text>
|
||||
</view>
|
||||
<view style="display:flex; align-items:center; margin-left:12rpx;">
|
||||
<checkbox checked="{{Allcheckbox}}"></checkbox>
|
||||
<text style="margin-left:6rpx;">配置版本排序</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<scroll-view id="myScroll" scroll-into-view="{{toView}}" scroll-y="true" style="height:{{scrollHeight-100}}rpx;" >
|
||||
<view wx:for="{{devlist.length}}" wx:key="index" class=" bg-white padding-5" >
|
||||
<view wx:for="{{devlist.length}}" wx:key="index" class=" nav-list1 padding-5" >
|
||||
|
||||
<view class="bg-white" >
|
||||
<view class="cubarN bg-white " >
|
||||
<view style="width: 98%;" >
|
||||
<view class="cubarN bg-white" >
|
||||
<view class="flex-xsub margin-xs" data-id ="{{index}}" bindtap="checkboxSub" >
|
||||
<checkbox style="top:25%;" checked="{{devlist[index].checkbox}}" ></checkbox>
|
||||
</view>
|
||||
<view class="cubarN bg-white flex-9" data-id ="{{index}}" bindtap="HideOrOpen" style="background:{{devlist[index].UpgradeStatus ==0? 'white':devlist[index].UpgradeStatus ==1? 'green':'red' }} ;">
|
||||
<view class="cubarN flex-9" data-id ="{{index}}" bindtap="HideOrOpen" style="background:{{devlist[index].UpgradeStatus ==0? 'white':devlist[index].UpgradeStatus ==1? 'green':'red' }} ;">
|
||||
<view class="flex-5" style="font-weight: bold;" >房号:{{devlist[index].RoomNumber}}</view>
|
||||
<view class="flex flex-xis">
|
||||
<view class="flex-xis" >
|
||||
@@ -147,6 +168,20 @@ bindtouchend="handleTouchEnd" style="margin-top: 20rpx;">
|
||||
</view>
|
||||
<view class="cubarN bg-white solid-bottom "> <!-- wx:if="{{devlist[index].show==0}}"> -->
|
||||
<view class="flex-eight" style="font-size: 22rpx;" >固件版本:{{devlist[index].Version}}</view>
|
||||
<view >
|
||||
<view wx:if="{{devlist[index].UpgradeStatus==2}}">
|
||||
<text class="text-green">升级完成</text>
|
||||
</view>
|
||||
<view wx:elif="{{devlist[index].UpgradeStatus==3}}">
|
||||
<text class="text-red">升级失败</text>
|
||||
</view>
|
||||
<view wx:elif="{{devlist[index].UpgradeStatus==1}}">
|
||||
<text class="text-green">升级中{{devlist[index].UpgradeProgress}}{{devlist[index].UpgradeProgress? '%':''}}</text>
|
||||
</view>
|
||||
<view wx:else>
|
||||
<text></text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user