From fd082c657a3bdcae4a6ba03c0e18ec2424e9a07c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 九月 2024 13:04:37 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 81f23bb..1c9a05c 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>鑷姩浠撳簱WCS鐩戞帶骞冲彴</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>
@@ -186,9 +186,7 @@
 								<view style="height: 18%;">
 									<y-box>
 										<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
-											<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
-											鑷姩浠撳簱WCS鐩戞帶骞冲彴
-											<!-- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image> -->
+											涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
 										</view>
 									</y-box>
 								</view>
@@ -217,11 +215,11 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<view style="width: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
-									<view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
-									<view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
-									<view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
-									<!-- <view style="width: 10%;">鏁伴噺</view> -->
+									<view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
+									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
+									<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
+									<view style="flex: 1;">浣滀笟鏁伴噺</view>
+									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view>
 								<!-- body -->
 								<view class="swiper-body">
@@ -230,20 +228,16 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="3"
+									display-multiple-items="4"
 									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
-											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
-											<view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
-											<view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
-											
-											
-											<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
-											<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
-											<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
-											
-											
+											<view style="flex: 2;word-break: break-all;">
+												{{item.orderNo ? item.orderNo : '--'}}
+											</view>
+											<view style="flex: 2;">{{item.matnr}}</view>
+											<view style="flex: 2;">{{item.maknx}}</view>
+											<view style="flex: 1;">{{item.count}}</view>
+											<view style="flex: 1;">{{item.total}}</view>
 										</swiper-item>
 									</swiper>
 								</view>
@@ -556,7 +550,7 @@
 					},
 					fail(err) {
 						that.timeOut = true
-						that.times = that.times+3
+						that.times = that.times+1
 						that.infoType = 0
 					}
 				})
@@ -809,6 +803,7 @@
 						ledId: that.baseLedId,
 					},
 					success(result) {
+						console.log(result);
 						var res = result.data
 						if (res.code === 200) {
 							that.baseInfo.xDistance = res.data.xDistance

--
Gitblit v1.9.1