From 435267f34f42665722d151c3f1f58621eeba907c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E8=8A=B1=E4=B8=80=E4=B8=96=E6=9C=88?=
 <1149505133@qq.com>
Date: Mon, 15 Jul 2024 23:37:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A6=96=E9=A1=B5-=E7=89=A9=E8=81=94?=
 =?UTF-8?q?=E7=BD=91):=20=E5=88=B7=E6=96=B0=E9=A6=96=E9=A1=B5=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=88=97=E8=A1=A8=EF=BC=88=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BA=91=E5=8F=B0=E6=A0=B7=E5=BC=8F=E3=80=81=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E4=BA=91=E5=8F=B0=E6=8E=A7=E5=88=B6=E6=8F=90=E7=A4=BA=E5=A4=AA?=
 =?UTF-8?q?=E5=A4=9A=E3=80=81=E4=BA=91=E5=8F=B0=E6=8C=89=E9=92=AE=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=80=89=E4=B8=AD=E9=97=AE=E9=A2=98=E5=9C=A8h5?=
 =?UTF-8?q?=E4=B8=AD=E6=9B=B4=E6=96=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                 |  4 ++--
 pages/tabbar/module/iots2.vue | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index e11dff6..bc37c43 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "物联网可视化",
     "appid" : "__UNI__604B8F1",
     "description" : "",
-    "versionName" : "1.0.27",
-    "versionCode" : 1027,
+    "versionName" : "1.0.28",
+    "versionCode" : 1028,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/tabbar/module/iots2.vue b/pages/tabbar/module/iots2.vue
index 8d5c26f..d05fb44 100644
--- a/pages/tabbar/module/iots2.vue
+++ b/pages/tabbar/module/iots2.vue
@@ -176,6 +176,9 @@
 				// this.timer = setInterval(() => {
 				// 	this.mescroll.resetUpScroll();
 					this.getDeviceInfo();
+					if(this.dataList.length>0){
+						this.resetDeviceList();
+					}
 					console.log("当前起始项Index为", this.showStartIndex, this.showEndIndex);
 				// }, 5000)
 			},
@@ -317,6 +320,23 @@
 						this.mescroll.endErr();
 					}
 				}, error => {})
+			},
+			resetDeviceList(){
+				let params = {
+					"pk": this.productPk,
+					"page": 1,
+					"pageSize": this.dataList.length,
+				}
+				this.$api.iotsApi.getDeviceList(params).then(res => {
+					if (res.code === 0) {
+						let curPageData = (res.data && res.data.list)||[];
+						let totalSize = res.data.totalCount;
+						this.dataList = curPageData; //追加新数据
+						this.total = totalSize;
+					} else {
+						this.$u.toast(res.msg);
+					}
+				}, error => {})
 			}
 		}
 	}