From 317c325513e754020815a6851f02bb38cdabbe48 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 九月 2024 14:28:03 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |   70 ++---------------------------------
 Monitor-APP/pages/home/home.css   |    4 +-
 Monitor-APP/pages/home/home.vue   |    8 ++--
 3 files changed, 10 insertions(+), 72 deletions(-)

diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 2830136..45b065a 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -6,7 +6,7 @@
 }
 .swiper-head {
 	width: 100%;
-	height: 6%;
+	height: 10%;
 	background-color: rgba(54, 94, 226, 0.5);
 	display: flex;
 	/* grid-template-columns: 2fr 3fr 2fr 2fr 1fr; */
@@ -15,7 +15,7 @@
 }
 .swiper-body {
 	width: 100%;
-	height: 94%;
+	height: 90%;
 	/* background-color: #aa0000; */
 }
 .swiper-body-main {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 1c9a05c..e4fcfec 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -418,10 +418,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 f954189..80bda58 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -11,81 +11,19 @@
 				"locNo": null,
 				"sourceLocNo": "1500502",
 				"barcode": "80009901",
-				"matDtos": [{
+				"matDtos": [
+					{
 						"orderNo": "020101000001",
 						"matnr": "020101000001",
 						"maknx": "63-90鍨嬪崟绔嬫煴",
-						"batch": null,
 						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "绾㈣壊",
 						"total" : 200
 					},
 					{
 						"orderNo": "020101000001",
-						"matnr": "LPJ.SLJ.XG.037",
-						"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
-						"batch": null,
+						"matnr": "020101000001",
+						"maknx": "63-90鍨嬪崟绔嬫煴",
 						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "鏆傚瓨",
-						"total" : 200
-					},
-					{
-						"orderNo": "020101000001",
-						"matnr": "LPJ.SLJ.XG.037",
-						"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
-						"batch": null,
-						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "绾㈣壊",
-						"total" : 200
-					},
-					{
-						"orderNo": "020101000001",
-						"matnr": "LPJ.SLJ.XG.037",
-						"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
-						"batch": null,
-						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "",
-						"total" : 200
-					},
-					{
-						"orderNo": "020101000001",
-						"matnr": "LPJ.SLJ.XG.037",
-						"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
-						"batch": null,
-						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "",
-						"total" : 200
-					},
-					{
-						"orderNo": "020101000001",
-						"matnr": "LPJ.SLJ.XG.037",
-						"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
-						"batch": null,
-						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "",
-						"total" : 200
-					},
-					{
-						"orderNo": "020101000001",
-						"matnr": "LPJ.SLJ.XG.037",
-						"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
-						"batch": null,
-						"count": 40.0,
-						"specs": "gcslxwt",
-						"info": "娴欐睙涓壃",
-						"bz": "17鍙锋",
 						"total" : 200
 					}
 				],

--
Gitblit v1.9.1