From 5f172d0730ad6f240e6d62feaa0824bc98b86bfc Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 16:33:51 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   55 ++++++++++++++++++++-----------------------------------
 1 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index c01479b..732fe94 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -3,7 +3,7 @@
 		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
 				<view class="head">
-					<text>涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
+					<text>鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
 				</view>
 				<!-- 鏃ュ巻 -->
 				<view class="time-tools">{{calendar}}</view>
@@ -15,7 +15,7 @@
 						<view class="mian-item-box">
 							<y-box>
 								<view class="box-item">
-									<text class="item-title">涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
+									<text class="item-title">鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
 									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
 									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
 								</view>
@@ -136,7 +136,7 @@
 								<view style="height: 2%;"></view>
 								
 								
-								<view style="height: 43%;">
+								<view style="height: 61%;">
 									<y-box>
 										<view class="box-item">
 											<view class="flex-row" style="width: 100%;">
@@ -182,20 +182,7 @@
 										
 									</y-box>
 								</view>
-								<view style="height: 2%;"></view>
-								<view style="height: 18%;">
-									<y-box>
-										<!-- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
-											涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
-										</view> -->
-										
-										<view style="display: flex;align-items: center;justify-content: center;width: 100%;height: 100%;">
-											<view style="flex: 1;">浣滀笟涓暟閲忥細 {{useInfo.count1 ? useInfo.count1 : '--'}}</view>
-											<view style="flex: 1;">鏈彇璐ф暟閲忥細 {{useInfo.count2 ? useInfo.count2 : '--'}}</view>
-										</view>
-										
-									</y-box>
-								</view>
+								<view style="height: 2%;"></view>								
 							</view>
 						</view>
 					</view>
@@ -220,11 +207,11 @@
 							<!-- 鏂囨湰瀹瑰櫒 -->
 							<view class="text-content">
 								<!-- head -->
-								<view class="swiper-head">
-									<view style="width: 30%;">娴佹按鍙�: {{infoText.orderNo}}</view>
+								<view class="swiper-head">									
 									<view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
 									<view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
 									<view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
+									<view style="width: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
 									<!-- <view style="width: 10%;">鏁伴噺</view> -->
 								</view>
 								<!-- body -->
@@ -234,24 +221,22 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->	
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="3"
+									display-multiple-items="2"
 									circular="true" :autoplay="true" :interval="5000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 25%;">{{i+1}} / {{swiperList.length}}</view>
-											<view style="width: 25%;">鏂欏彿: {{item.matnr}}</view>
-											<view style="width: 25%;">绠卞彿: {{item.batch}}</view>
-											<view style="width: 25%;">鏁伴噺: {{item.count}}</view>
-											
-											<view style="width: 25%;">鍗峰彿: {{item.specs}}</view>
-											<view style="width: 25%;">璁㈠崟鍙�	: {{item.orderNo}}</view>
-											<view style="width: 25%;">瀹㈡埛鍚嶇О: {{item.cstmrName}}</view>
-											<view style="width: 25%;">鎬讳綔涓氫腑: {{item.count1}}</view>
-											
-											<view style="width: 25%;">鐮佸灈鍚庢湭鍙栬揣: {{item.count3}}</view>
-											<view style="width: 25%;">璁㈠崟浣滀笟涓�: {{item.count2}}</view>
-											<view style="width: 25%;">澶囨敞: {{item.memo}}</view>
-											
-											
+											<view style="width: 100%;">{{i+1}} / {{swiperList.length}}</view>
+											<view style="width: 100%;">鍗曞彿: {{item.orderNo}}</view>
+											<view style="width: 50%;">鍟嗗搧缂栧彿: {{item.matnr}}</view>
+											<view style="width: 50%;">鍟嗗搧鍚嶇О: {{item.maktx}}</view>
+											<view style="width: 50%;">瑙勬牸: {{item.specs}}</view>
+											<view style="width: 50%;">U8鏃у搧鍚�: {{item.sku}}</view>
+											<view style="width: 100%;">鍨嬪彿: {{item.model}}</view>
+											<view style="width: 50%;color: red;font-weight: bolder;">瀹㈡埛鍚嶇О: {{item.supp}}</view>
+											<view style="width: 50%;color: red;font-weight: bolder;">寮�绁ㄥ鎴�: {{item.kpCstmrName}}</view>
+											<view style="width: 25%;">涓绘暟閲�: {{item.count}}</view>
+											<view style="width: 25%;color: red;font-weight: bolder;">杈呮暟閲�: {{item.weight}}</view>
+											<view style="width: 25%;">搴撳瓨: {{item.total}}</view>
+											<view style="width: 25%;">杈呭簱瀛�: {{item.totalWeight}}</view>
 										</swiper-item>
 									</swiper>
 								</view>

--
Gitblit v1.9.1