From 895091877435b8ed71b34fd476f0de17a1df8962 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 16:31:14 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |   60 +++++++++++++++---------------
 Monitor-APP/pages/home/home.vue   |   12 +++---
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index f7614f1..f44947d 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -219,7 +219,7 @@
 									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
 									<view style="flex: 2;">绠辩爜</view>
 									<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
-									<view style="flex: 1;">瑙勬牸</view>
+									<view style="flex: 2;">瑙勬牸</view>
 									<view style="flex: 1;">浣滀笟鏁伴噺</view>
 									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view>
@@ -237,7 +237,7 @@
 											<view style="flex: 2;">{{item.matNo}}</view>
 											<view style="flex: 2;">{{item.containerCode}}</view>
 											<view style="flex: 2;">{{item.maknx}}</view>
-											<view style="flex: 1;">{{item.specs}}</view>
+											<view style="flex: 2;">{{item.specs}}</view>
 											<view style="flex: 1;">{{item.count}}</view>
 											<view style="flex: 1;">{{item.total}}</view>
 										</swiper-item>
@@ -445,10 +445,10 @@
 			setInterval(()=>{
 				this.getDate2()
 				this.getUrl()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
+				// this.getInfo()
+				// this.getError()
+				this.getInfo2()
+				this.getError2()
 				this.controller()
 			},1000)
 			
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index d4987fb..4b9e2aa 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -10,68 +10,68 @@
 																"barcode": "80009901",
 																"matDtos":[
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
+																			"matNo":"230309103100005",
+																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
+																			"matNo":"230309103100005",
+																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
+																			"matNo":"230309103100005",
+																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
+																			"matNo":"230309103100005",
+																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
+																			"matNo":"230309103100005",
+																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
+																			"matNo":"230309103100005",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
+																			"matNo":"230309103100005",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 88954455
+																			"containerCode": 1000000268
 																		},
 																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
+																			"matNo":"230309103100005",
+																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
+																			"specs":"8024-閾佸績闀�75mm",
 																			"total": 1055,
-																			"containerCode": 8895445
+																			"containerCode": 1000000268
 																		},
 																		{
 																			"matNo":"LPJ.SLJ.XG.037",

--
Gitblit v1.9.1