APPbug反馈修改

pages/index/comp/indexZhuanZhi.vue

@@ -1,67 +1,61 @@
 <template>
     <view class="index-zhuanzhi">
         <view class="canneng-index-title mb20">所有工程统计信息</view>
-        <div class="header">
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.allDevCount || 0 }}</div>
-                <div class="header-item-label">设备总数</div>
-            </div>
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.onLineCount || 0 }}</div>
-                <div class="header-item-label">正常设备</div>
-            </div>
-            <div class="header-item" @click="jump('alarmLineDevs')">
-                <div class="header-item-value">{{ devCount.alarmLineCount || 0 }}</div>
-                <div class="header-item-label">报警设备</div>
-            </div>
-            <div class="header-item" @click="jump('offLineDevs')">
-                <div class="header-item-value">{{ devCount.offLineCount || 0 }}</div>
-                <div class="header-item-label">离线设备</div>
-            </div>
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.alarmEventCount || 0 }}</div>
-                <div class="header-item-label">告警数量</div>
-            </div>
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.eventCount || 0 }}</div>
-                <div class="header-item-label">事件数量</div>
-            </div>
-            <div class="header-item" @click="projectNum">
-                <div class="header-item-value">{{ devCount.projectCount || 0 }}</div>
-                <div class="header-item-label">项目个数</div>
-            </div>
-        </div>
+        <view class="header">
+            <view class="header-item">
+                <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+                <view class="header-item-label">设备总数</view>
+            </view>
+            <view class="header-item" @click="jump('onLineDevs')">
+                <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+                <view class="header-item-label">在线设备</view>
+            </view>
+            <view class="header-item" @click="jump('offLineDevs')">
+                <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+                <view class="header-item-label">离线设备</view>
+            </view>
+            <view class="header-item">
+                <view class="header-item-value">{{ devCount.alarmCount || 0 }}</view>
+                <view class="header-item-label">告警数量</view>
+            </view>
+            <view class="header-item">
+                <view class="header-item-value">{{ devCount.eventCount || 0 }}</view>
+                <view class="header-item-label">事件数量</view>
+            </view>
+            <view class="header-item" @click="projectNum">
+                <view class="header-item-value">{{ devCount.projectCount || 0 }}</view>
+                <view class="header-item-label">项目个数</view>
+            </view>
+        </view>
         <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
-        <div class="header">
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.allDevCount || 0 }}</div>
-                <div class="header-item-label">设备总数</div>
-            </div>
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.onLineCount || 0 }}</div>
-                <div class="header-item-label">正常设备</div>
-            </div>
-            <div class="header-item" @click="jump('alarmLineDevs')">
-                <div class="header-item-value">{{ devCount.alarmLineCount || 0 }}</div>
-                <div class="header-item-label">报警设备</div>
-            </div>
-            <div class="header-item" @click="jump('offLineDevs')">
-                <div class="header-item-value">{{ devCount.offLineCount || 0 }}</div>
-                <div class="header-item-label">离线设备</div>
-            </div>
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.alarmEventCount || 0 }}</div>
-                <div class="header-item-label">告警数量</div>
-            </div>
-            <div class="header-item">
-                <div class="header-item-value">{{ devCount.eventCount || 0 }}</div>
-                <div class="header-item-label">事件数量</div>
-            </div>
-            <div class="header-item" @click="projectNum">
-                <div class="header-item-value">{{ devCount.projectCount || 0 }}</div>
-                <div class="header-item-label">项目个数</div>
-            </div>
-        </div>
+        <view class="header">
+            <view class="header-item">
+                <view class="header-item-value">{{
+                    devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
+                }}</view>
+                <view class="header-item-label">设备总数</view>
+            </view>
+            <view class="header-item" @click="jump('currentOnLineDevs')">
+                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
+                <view class="header-item-label">在线设备</view>
+            </view>
+            <view class="header-item" @click="jump('currentOffLineDevs')">
+                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
+                <view class="header-item-label">离线设备</view>
+            </view>
+            <view class="header-item">
+                <view class="header-item-value">{{ devCount.currentAlarmCount || 0 }}</view>
+                <view class="header-item-label">告警数量</view>
+            </view>
+            <view class="header-item">
+                <view class="header-item-value">{{ devCount.currentEventCount || 0 }}</view>
+                <view class="header-item-label">事件数量</view>
+            </view>
+            <view class="header-item" @click="projectNum">
+                <view class="header-item-value">{{ devCount.currentProjectCount || 0 }}</view>
+                <view class="header-item-label">项目个数</view>
+            </view>
+        </view>
     </view>
 </template>
 <script>
@@ -90,22 +84,14 @@ export default {
         },
         jump(type) {
             switch (type) {
-                case 'alarmLineDevs':
-                    uni.navigateTo({
-                        url:
-                            '/pages/device/list?type=alarmLineDevs&projectList=' +
-                            encodeURIComponent(JSON.stringify(this.devCount.alarmLineDevs)),
-                    })
-                    break
-                case 'offLineDevs':
-                    uni.navigateTo({
-                        url:
-                            '/pages/device/list?type=offLineDevs&projectList=' +
-                            encodeURIComponent(JSON.stringify(this.devCount.offLineDevs)),
-                    })
-                    break
-
                 default:
+                    uni.navigateTo({
+                        url:
+                            '/pages/device/list?type=' +
+                            type +
+                            '&projectList=' +
+                            encodeURIComponent(JSON.stringify(this.devCount[type])),
+                    })
                     break
             }
         },