From 9b40da79d1501d30fec345b3fc0c3c3aa98fa4a5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 27 六月 2024 15:03:48 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |    5 +++--
 Monitor-APP/pages/home/home.vue   |   19 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 8ebb333..7aa8a24 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -233,10 +233,13 @@
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
 											<view style="width: 100%;display: flex;flex-direction: column;
 											align-items: center;justify-content: space-around;">
-												<view style="width: 60%;font-size:4vw" v-show="!pakoutShow">搴撲綅鍙�: {{item.locNo}}</view>
-												<view style="width: 60%;font-size:4vw" v-show="pakoutShow">浜у搧浠e彿: {{item.matnr}}</view>
-												<view style="width: 60%;font-size:4vw" v-show="pakoutShow">浜у搧鍚嶇О: {{item.maknx}}</view>
-												<view style="width: 60%;font-size:4vw" v-show="pakoutShow">鏁伴噺: [{{item.count}} / {{item.total}}]</view>
+												<view style="font-size:3vw" >鍟嗗搧缂栧彿: {{item.matnr}}</view>
+												<view style="font-size:3vw" >{{item.maknx}}</view>
+												<view style="font-size:3vw" >鎵瑰彿: {{item.batch}}</view>
+												<view style="font-size:3vw" >绛夌骇: {{item.sku}}</view>
+												<view style="font-size:3vw" >鎿嶄綔鍛�: {{item.color}}</view>
+												<view style="font-size:3vw" >鐢熶骇绾垮彿: {{item.brand}}</view>
+												<view style="font-size:3vw" >閲嶉噺: {{item.anfme}}</view>
 											</view>
 										</swiper-item>
 									</swiper>
@@ -419,10 +422,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 1cd6fc0..07d9464 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -14,8 +14,9 @@
 				"matDtos": [{
 						"matnr": "020101000001",
 						"locNo": "0100101",	
-						"maknx": "63-90鍨嬪崟绔嬫煴",
-						"batch": null,
+						"maknx": "63-90鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄�63-90鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄�",
+						"batch": 20240627,
+						"sku": "6699",
 						"count": 40.0,
 						"specs": "gcslxwt",
 						"info": "娴欐睙涓壃",

--
Gitblit v1.9.1