From f0e7e8f2042454bff37b844a10b8f4232407c86b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 26 六月 2023 13:46:33 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |   21 ++++++++++++++-------
 Monitor-APP/pages/home/home.vue   |   16 ++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6a7f3fa..e7d7992 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -233,15 +233,15 @@
 									display-multiple-items="3"
 									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">{{i+1}}\{{swiperList.length}}</view>
+											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
 											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
 											<view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
-											<view style="width: 40%;">瀹㈡埛: {{item.manu}}</view>
+											<view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
 											
 											
-											<view style="width: 20%;">鏁伴噺: {{item.count}}</view>
+											<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
 											<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
-											<view style="width: 40%;">澶囨敞: {{item.memo}}</view>
+											<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
 											
 											
 										</swiper-item>
@@ -424,10 +424,10 @@
 				this.getOther()
 				// this.getDate()
 				this.getDate2()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
+				// this.getInfo()
+				// this.getError()
+				this.getInfo2()
+				this.getError2()
 				this.getUrl()
 				this.controller()
 				// 娴嬭瘯鐢�
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 7394f42..6a4f283 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -18,7 +18,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": "绾㈣壊"
+						"bz": "绾㈣壊",
+						"total" : 200
 					},
 					{
 						"matnr": "LPJ.SLJ.XG.037",
@@ -27,7 +28,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": "鏆傚瓨"
+						"bz": "鏆傚瓨",
+						"total" : 200
 					},
 					{
 						"matnr": "LPJ.SLJ.XG.037",
@@ -36,7 +38,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": "绾㈣壊"
+						"bz": "绾㈣壊",
+						"total" : 200
 					},
 					{
 						"matnr": "LPJ.SLJ.XG.037",
@@ -45,7 +48,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": ""
+						"bz": "",
+						"total" : 200
 					},
 					{
 						"matnr": "LPJ.SLJ.XG.037",
@@ -54,7 +58,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": ""
+						"bz": "",
+						"total" : 200
 					},
 					{
 						"matnr": "LPJ.SLJ.XG.037",
@@ -63,7 +68,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": ""
+						"bz": "",
+						"total" : 200
 					},
 					{
 						"matnr": "LPJ.SLJ.XG.037",
@@ -72,7 +78,8 @@
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",
-						"bz": "17鍙锋"
+						"bz": "17鍙锋",
+						"total" : 200
 					}
 				],
 				"emptyMk": false,

--
Gitblit v1.9.1