From 59106f4f1c9e7daaf50da15b8d3f3b5fc329aa65 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 07 十一月 2023 10:19:12 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |   14 ++++++++++++++
 Monitor-APP/pages/home/home.vue   |   29 ++++++++++++++++-------------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 59a0271..9379e94 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -215,11 +215,12 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<view style="width: 25%;">鐩爣绔欙細{{infoText.staNo}}</view>
-									<view style="width: 25%;">鍟嗗搧缂栧彿</view>
-									<view style="width: 25%;">鍟嗗搧鍚嶇О</view>
-									<!-- <view style="width: 20%;">瑙勬牸</view> -->
-									<view style="width: 25%;">鏁伴噺</view>
+									<view style="width: 10vw;">鐩爣绔欙細{{infoText.staNo}}</view>
+									<view style="flex: 1;">鍟嗗搧缂栧彿</view>
+									<view style="flex: 1;">鍟嗗搧鍚嶇О</view>
+									<view style="width: 10vw;">鏁伴噺</view>
+									<view style="flex: 1;">绠辩爜</view>
+									<view style="width: 10vw;">搴撳瓨鏁伴噺</view>
 								</view>
 								<!-- body -->
 								<view class="swiper-body">
@@ -231,11 +232,13 @@
 									display-multiple-items="8"
 									circular="true" :autoplay="true" :interval="3000" :duration="1000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 25%;">No:{{i+1}}</view>
-											<view style="width: 25%;">{{item.matNo}}</view>
-											<view style="width: 25%;">{{item.maknx}}</view>
+											<view style="width: 10vw;">No:{{i+1}}</view>
+											<view style="flex: 1;">{{item.matNo}}</view>
+											<view style="flex: 1;">{{item.maknx}}</view>
 											<!-- <view style="width: 20%;">{{item.specs}}</view> -->
-											<view style="width: 25%;">{{item.count}}</view>
+											<view style="width: 10vw;">{{item.count}}</view>
+											<view style="flex: 1;">{{item.zpallet}}</view>
+											<view style="width: 10vw;">{{item.anfme}}</view>
 										</swiper-item>
 									</swiper>
 								</view>
@@ -244,10 +247,10 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="btn"> -->
+			<view class="btn">
 				<!-- <button >鎷f枡鍥炲簱</button> -->
-				<!-- <button  size="mini" type="primary" @click="">鎷f枡鍥炲簱</button> -->
-			<!-- </view> -->
+				<button  size="mini" type="primary" @click="">鐩樼偣鍥炲簱</button>
+			</view>
 		</uni-transition>
 		<!-- 寮傚父淇℃伅 -->
 		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
@@ -1022,7 +1025,7 @@
 	}
 	.info-main {
 		width: 100vw;
-		height: 88vh;
+		height: 80vh;
 		display: flex;
 		justify-content: center;
 		align-items: center;
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 4ae0f5b..57a83d0 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -9,30 +9,44 @@
 																"sourceLocNo":"1500502",
 																"barcode": "80009901",
 																"matDtos": [{
+																			"anfme": 10000,
+																			"zpallet": "T2_1231231231",
 																			"matNo": "040609000182",
 																			"maknx": "鍏铻烘瘝",
 																			"count": 1072.0
 																		}, {
+																			"anfme": 2000,
+																			"zpallet": "T2_1231231232",
 																			"matNo": "040619000007",
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 870.0
 																		}, {
+																			"anfme": 100000,
+																			"zpallet": "T2_1231231233",
 																			"matNo": "040619000008",
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 39600.0
 																		}, {
+																			"anfme": 10000,
+																			"zpallet": "T2_1231231234",
 																			"matNo": "040619000009",
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 8090.0
 																		}, {
+																			"anfme": 600,
+																			"zpallet": "T2_1231231235",
 																			"matNo": "040619000010",
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 430.0
 																		}, {
+																			"anfme": 26500,
+																			"zpallet": "T2_1231231236",
 																			"matNo": "040619000011",
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 16030.0
 																		}, {
+																			"anfme": 390,
+																			"zpallet": "T2_1231231237",
 																			"matNo": "040619000012",
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 235.0

--
Gitblit v1.9.1