From 8db4f8cbd8adde0d907b3439a4d86024e1c8e184 Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Wed, 12 Jul 2023 13:56:16 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0=E4=BC=9F=E5=88=9B?=
 =?UTF-8?q?=E5=8A=9B=E8=BD=A6=E6=A3=9A=EF=BC=8C=E5=8F=8A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/station/item1.vue | 20 ++++++++++++++++----
 pages/station/item2.vue | 12 ++++++++++--
 pages/station/list.vue  |  6 +++++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pages/station/item1.vue b/pages/station/item1.vue
index 61757d4..040af2a 100644
--- a/pages/station/item1.vue
+++ b/pages/station/item1.vue
@@ -87,7 +87,9 @@
 								           			<div class="item flex" :class="itemStateClass(item.state).clas"  v-for="item in secondList" :key="item.id">
 								           				<div class="item-img">
 								           					<div class="img-list flex flex-wrap base-item" 
-															:class="item.list.length > 8 ? '' : 'eight-item'"
+															:class="item.list.length === 12 ? 'base-item' :
+															 item.list.length === 16 ? 'sixteen-item' :
+															 'eight-item'"
 															>
 								           						<div  :class="['img-it'
 														  ,  itemClass(it.electricQuantity)
@@ -308,6 +310,7 @@
 				this.$router.replace('/pages/station/list')
 			},
 			initData() {
+				
 				const hasLocalData = this.selectStations.length
 				const stationId = hasLocalData ? this.selectStations[0] : this.$route.query.id
 				const station = this.stationData.filter(v => {
@@ -321,7 +324,9 @@
 				this.station = this.stationData.filter(v => {
 					return v.id === data[0]
 				})[0]
-				this.type = FIRST_STATIONS.includes(data[0]) ? 'first' : 'second'
+				const AREA_SECOND_STATIONS = ['30']
+				 this.type = AREA_SECOND_STATIONS.includes(data[1]) ? 'second' : FIRST_STATIONS.includes(data[0]) ? 'first' : 'second'
+				// this.type = FIRST_STATIONS.includes(data[0]) ? 'first' : 'second'
 				this.getDataInfo(this.type)
 				
 			},
@@ -360,7 +365,8 @@
 				  
 			      // width: 183px;
 				const eightNumArr = ['1052758023'] // 塞纳8个组串
-				this.itemNum = eightNumArr.includes(this.selectStations[0]) ? 8 : 12
+				const sixteenNumArr = ['30'] // 16个组串
+				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) => {
@@ -377,7 +383,7 @@
 			        return {
 						list: cList,
 						dayEnergy: item[`dayEnergy${index}`],
-						equipmentName: item[`equipmentName${index}`].split(' ')[1],
+						equipmentName: item[`equipmentName${index}`] ? item[`equipmentName${index}`].split(' ')[1] : '-',
 						id: item[`inverterInfoId${index}`],
 						state: item[`state${index}`],
 						totalHavePower: item[`totalHavePower${index}`],
@@ -634,6 +640,12 @@
 		                  &.eight-item {
 		                    width: 300upx;
 		                  }
+						  &.sixteen-item {
+						    width: 450upx;
+							.img-it { 
+								width: 52upx;
+							}
+						  }
 		                  .img-it {
 		                    width: 70upx;
 		                    height: 40upx;
diff --git a/pages/station/item2.vue b/pages/station/item2.vue
index 46cc87d..15f8f8a 100644
--- a/pages/station/item2.vue
+++ b/pages/station/item2.vue
@@ -273,6 +273,7 @@
 	const UN_SHOW_STATIONS = [
 	  '23', '22', '2'
 	]
+	const AREA_SECOND_STATIONS = ['30']
 	const END_NUM = 65535
 	let SECOND_VALUE = ''
 	let timer = null
@@ -369,7 +370,8 @@
 				uni.setStorageSync('_pro_selectStation', this.selectStations)
 				this.isChange = true
 				SECOND_VALUE = null
-				this.type = FIRST_STATIONS.includes(this.selectStations[0]) ? 'first' : 'second'
+				
+				 this.type = AREA_SECOND_STATIONS.includes(this.selectStations[1]) ? 'second' : FIRST_STATIONS.includes(this.selectStations[0]) ? 'first' : 'second'
 				this.getDataListInfo(this.type, 'change')
 				scrollSmoothTo()
 				
@@ -391,7 +393,7 @@
 				this.station = this.stationData.filter(v => {
 				 	return v.id === data[0]
 				 })[0] 
-				this.type = FIRST_STATIONS.includes(data[0]) ? 'first' : 'second'
+				  this.type = AREA_SECOND_STATIONS.includes(data[1]) ? 'second' : FIRST_STATIONS.includes(data[0]) ? 'first' : 'second'
 				uni.setStorageSync('_pro_selectStation', this.selectStations)
 				this.getDataListInfo(this.type)
 			},
@@ -533,6 +535,12 @@
 
 				},
 			_getMaxNum(item, text = 'dayEnergy') {
+				if (text !== 'dayEnergy') {
+				      const eightNumArr = ['1052758023'] // 塞纳8个组串
+				      const sixteenNumArr = ['30'] // 16个组串
+				      return  eightNumArr.includes(this.selectStations[0]) ? 8 :
+				        sixteenNumArr.includes(this.selectStations[1]) ? 16 : 12
+				    }
 				let maxNum = 1
 				for (let i = 1; i<= 50; i++) {
 					if (!item[text + i]) {
diff --git a/pages/station/list.vue b/pages/station/list.vue
index 4018e84..40a70f3 100644
--- a/pages/station/list.vue
+++ b/pages/station/list.vue
@@ -106,6 +106,10 @@
 	      id: '5',
 	      stationName: '伟创力超毅厂区'
 	    },
+		 {
+		      id: '30',
+		      stationName: '三期中央车棚'
+		    }
 	  ],
 	  '1052758019': [
 	    {
@@ -200,7 +204,7 @@
 	    ],
 	   '1052758029': [ {
 	     id: '24',
-	     stationName: '枫泾兴塔厂'
+	     stationName: '汉钟兴塔厂'
 	   }],
 	    '1052758031': [ {
 	       id: '28',