修复配置升级进度查询异常

colorui/main.wxss

@@ -2957,6 +2957,9 @@ scroll-view.cu-steps .cu-item {
 .flex-6 {
 	flex: 6;
 }
+.flex-5 {
+	flex: 5;
+}
 .flex-9 {
 	flex: 9;
 }

pages/basics/HostUpgrade/HostUpgrade.js

@@ -61,6 +61,7 @@ Page({
  input: 0, 
  bdHosts: [], 
  address: "",
+ UpgradeType:"",
   },
 
   /**
@@ -605,7 +606,8 @@ Page({
         _this.setData({ 
         //升级计数
         CurrentUpgradeDev:element.RoomNumber, //当前升级设备
-        CurrentUpgradeDevStart:'升级就绪',//当前升级设备状态      
+        CurrentUpgradeDevStart:'升级就绪',//当前升级设备状态    
+        UpgradeType:UpgradeType
       }) 
 
         try {

pages/basics/HostUpgrade/HostUpgrade.wxml

@@ -127,9 +127,15 @@ bindtouchend="handleTouchEnd"  style="margin-top: 20rpx;">
         <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="flex-9" style="font-weight: bold;" >房号：{{devlist[index].RoomNumber}}</view>      
-      <view class="flex-sub text-{{devlist[index].Status==true? 'green':'red'}}"  >{{devlist[index].Status==true? "在线":"离线"}}</view>
+      <view class="flex-5" style="font-weight: bold;" >房号：{{devlist[index].RoomNumber}}</view>  
+      <view class="flex flex-xis">
+      <view class="flex-xis"  >
+            <view wx:if="{{CurrentUpgradeDev==devlist[index].RoomNumber}}">{{UpgradeType=='firmware'? '固件':'配置'}}升级:{{CurrentUpgradeDevStart}}</view>           
+      </view>
+        <view class="flex-sub text-{{devlist[index].Status==true? 'green':'red'}}"  >{{devlist[index].Status==true? "在线":"离线"}}</view>
     </view>
+      </view>    
+    
        </view>
 
 <view class="cubarN bg-white" >    <!-- wx:if="{{devlist[index].show==0}}"> -->

utils/upgrade.js

@@ -177,13 +177,12 @@ export default class DeviceUpgrader extends EventEmitter {
             return 0;
           }
       
-    }
-    else{
+    } else{
       throw new Error('查询进度失败');
     }
     }else{
       
-      if (res.total ==1) {      
+      if (res.total >0) {      
         var getnode 
           if (res.rows.length>0) {
             getnode=res.rows[0]