From 5e0781fa9eb1f1fd3ce89ffa9245e00206679d5a Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Tue, 2 Jul 2024 14:48:56 +0800
Subject: [PATCH] =?UTF-8?q?[feature]=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=9C=9FB1?=
 =?UTF-8?q?5=E6=8A=80=E6=94=B9,=E7=BB=84=E4=B8=B2=E6=95=B0=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/station/item1.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pages/station/item1.vue b/pages/station/item1.vue
index 7cadb13..5e44e99 100644
--- a/pages/station/item1.vue
+++ b/pages/station/item1.vue
@@ -75,7 +75,7 @@
 							<u-collapse-item
 									name="index"
 									:title="envData.environmentName"
-									
+
 							>
 							<view class="flex flex-center">
 									<table border="1"  class="env-table" >
@@ -113,15 +113,15 @@
 											</tr>
 										  </table>
 								</view>
-							
+
 							</u-collapse-item>
 						</u-collapse>
-					
+
 				</uni-section>
 			</view>
-			
+
 			<view class="station-content">
-				
+
 				<uni-section title="采集器" type="line">
 					<template v-slot:right >
 						<view class="second-status" :class="allOffLineState ? 'z4' : 'z1'" v-show="showSecond"  @click="handleGetStatus">
@@ -404,17 +404,25 @@ export default {
 		handleFilterSecondArr(arr) {
 			const item = arr[0]
 			let maxNum = 1
+      let itemNum = 1
 			for (let i = 1; i<= 50; i++) {
 				if (!item['dayEnergy' + i]) {
 					maxNum = i-1
 					break
 				}
 			}
-
+      for (let i = 25; i> 0; i--) {
+        if (item['electricQuantity1_' + i]) {
+          itemNum = i
+          break
+        }
+      }
+      // this.itemNum = eightNumArr.includes(this.selectStations[0]) ? 8 : sixteenNumArr.includes(this.selectStations[1]) ? 16 : 12
+      this.itemNum = itemNum
 			// width: 183px;
 			const eightNumArr = ['1052758023'] // 塞纳8个组串
 			const sixteenNumArr = ['30'] // 16个组串
-			this.itemNum = eightNumArr.includes(this.selectStations[0]) ? 8 : sixteenNumArr.includes(this.selectStations[1]) ? 16 : 12
+			// this.itemNum = eightNumArr.includes(this.selectStations[0]) ? 8 : sixteenNumArr.includes(this.selectStations[1]) ? 16 : 12
 			this.secondList = Array.from(Array(maxNum)).map((v, inde) => {
 				const index = inde + 1
 				const cList = Array.from(Array(this.itemNum)).map((cv, cIndex) => {