zhuguifei
2025-08-22 8304eac2a45a32b00563c03a2f3fd303ecd5872a
pages/tabBar/device.vue
@@ -182,7 +182,7 @@
                  </view>
                  <view class="right" style="min-width: 240rpx;">
                     <view class="title text-sm">更新时间:</view>
                     <view class="title text-sm text-gray">{{ refreshTime}}</view>
                     <view class="title text-sm text-gray">{{ item.refreshTime}}</view>
                  </view>
               </view>
@@ -205,8 +205,7 @@
            isProcessing: false,
            // key->设备租户+code 
            dataMap: new Map(),
            // 更新时间
            refreshTime: '',
            alarmEquCount: 0,
            faultEquCount: 0,
            timer: null
@@ -242,6 +241,7 @@
         },
         // 设备数据和mtqq实时数据合并
         mergeMqttRealData(mqttData) {
            const {
               tenantid,
               machineid
@@ -251,11 +251,15 @@
            const targetItem = this.dataList.find(item =>
               item.tenantId === tenantid && item.code === machineid
            );
            if (targetItem && !targetItem.online) {
               mqttData = {};
            }
            if (targetItem) {
               const updatedItem = {
                  ...targetItem,
                  realData: mqttData
               };
               updatedItem.refreshTime = dayjs().format('HH:mm:ss');
               this.$set(this.dataList, this.dataList.indexOf(targetItem), updatedItem);
            }
@@ -406,9 +410,13 @@
               if (targetItem) {
                  const updatedItem = {
                     ...targetItem,
                     errorData: faults.filter(f => f.faultType === 1).map(n => n.faultName),
                     warnData: faults.filter(f => f.faultType === 2).map(n => n.faultName),
                     errorData: targetItem.online ? faults.filter(f => f.faultType === 1).map(n => n.faultName) : [],
                     warnData: targetItem.online ? faults.filter(f => f.faultType === 2).map(n => n.faultName) : [],
                  };
                  if(targetItem.online){
                     updatedItem.refreshTime = dayjs().format('HH:mm:ss');
                  }
                  this.$set(this.dataList, this.dataList.indexOf(targetItem), updatedItem);
               }
            });