From dfc04867c739f03cbc46751cb4b8d3034a1c525e Mon Sep 17 00:00:00 2001
From: chenzhihao <1798906853@qq.com>
Date: Mon, 5 Jan 2026 10:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 colorui/main.wxss                         |  3 +++
 pages/basics/HostUpgrade/HostUpgrade.js   |  4 +++-
 pages/basics/HostUpgrade/HostUpgrade.wxml | 10 ++++++++--
 utils/upgrade.js                          |  5 ++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/colorui/main.wxss b/colorui/main.wxss
index 46fb8f1..05d7d7d 100644
--- a/colorui/main.wxss
+++ b/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;
 }
diff --git a/pages/basics/HostUpgrade/HostUpgrade.js b/pages/basics/HostUpgrade/HostUpgrade.js
index 64d918a..8049f24 100644
--- a/pages/basics/HostUpgrade/HostUpgrade.js
+++ b/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 {
diff --git a/pages/basics/HostUpgrade/HostUpgrade.wxml b/pages/basics/HostUpgrade/HostUpgrade.wxml
index ea10388..c878395 100644
--- a/pages/basics/HostUpgrade/HostUpgrade.wxml
+++ b/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}}"> -->
diff --git a/utils/upgrade.js b/utils/upgrade.js
index 47878a5..f764c72 100644
--- a/utils/upgrade.js
+++ b/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]