From 8cf990477e17db8607b874a01ec48dc20785181b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 10 十一月 2023 16:06:13 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |  114 -------------------------------------
 Monitor-APP/pages/home/home.css   |    6 +-
 Monitor-APP/pages/home/home.vue   |    8 +-
 3 files changed, 8 insertions(+), 120 deletions(-)

diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 48b4fd0..b8ec8aa 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,12 +1,12 @@
 .text-content {
 	width: 100%;
 	height: 100%;
-	font-size: 16px;
+	font-size: 12px;
 	/* background-color: aliceblue;	 */
 }
 .swiper-head {
 	width: 100%;
-	height: 10%;
+	height: 5%;
 	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: 90%;
+	height: 95%;
 	/* background-color: #aa0000; */
 }
 .swiper-body-main {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index cb932f9..9bbf081 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,8 +218,8 @@
 									<view style="flex: 1;">绔欏彿锛歿{infoText.staNo}}</view>
 									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
 									<view style="flex: 2;">绠辩爜</view>
-									<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
-									<view style="flex: 2;">瑙勬牸</view>
+									<view style="flex: 4;">鍟嗗搧鍚嶇О</view>
+									<view style="flex: 5;">瑙勬牸</view>
 									<view style="flex: 1;">浣滀笟鏁伴噺</view>
 									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view>
@@ -236,8 +236,8 @@
 											<view style="flex: 1;">No:{{i+1}}</view>
 											<view style="flex: 2;">{{item.matNo}}</view>
 											<view style="flex: 2;">{{item.containerCode}}</view>
-											<view style="flex: 2;">{{item.maknx}}</view>
-											<view style="flex: 2;">{{item.specs}}</view>
+											<view style="flex: 4;">{{item.maknx}}</view>
+											<view style="flex: 5;">{{item.specs}}</view>
 											<view style="flex: 1;">{{item.count}}</view>
 											<view style="flex: 1;">{{item.total}}</view>
 										</swiper-item>
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 4b9e2aa..97952c5 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -13,121 +13,9 @@
 																			"matNo":"230309103100005",
 																			"maknx":"瀹氬瓙绾垮湀",
 																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
+																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
 																			"total": 1055,
 																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"8024-閾佸績闀�75mm",
-																			"total": 1055,
-																			"containerCode": 1000000268
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":0,
-																			"specs":"gcslxwt",
-																			"total": 1055,
-																			"containerCode": 88954455
 																		}
 																		
 																	],

--
Gitblit v1.9.1