From bef5c99167df50cce9761a2adc05ba679914dfa7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 05 六月 2024 13:35:26 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index aad59ba..253fffa 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: 20%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
-									<view style="width: 35%;">鍟嗗搧缂栧彿</view>
-									<view style="width: 35%;">鍟嗗搧鍚嶇О</view>
-									<!-- <view style="width: 20%;">瑙勬牸</view> -->
-									<view style="width: 10%;">鏁伴噺</view>
+									<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>
 								<!-- body -->
 								<view class="swiper-body">
@@ -230,14 +228,20 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="8"
-									circular="true" :autoplay="true" :interval="3000" :duration="1000">
+									display-multiple-items="1"
+									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">No:{{i+1}}</view>
-											<view style="width: 35%;">{{item.matnr}}</view>
-											<view style="width: 35%;">{{item.maknx}}</view>
-											<!-- <view style="width: 20%;">{{item.specs}}</view> -->
-											<view style="width: 10%;">{{item.count}}</view>
+											<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
+											<view style="width: 100%; font-size: 88rpx;">DI鍗曞彿: {{item.orderNo}}</view>
+											<view style="width: 100%; font-size: 88rpx;">鎹嗗寘鍙风爜: {{item.matnr}}</view>
+											<view style="width: 100%; font-size: 88rpx;">AS400: {{item.brand}}</view>
+											
+											<view style="width: 100%; font-size: 88rpx;">鏈虹鍙�: {{item.maknx}}</view>
+											<view style="width: 50%; font-size: 88rpx;">鍙版暟: {{item.number}}</view>
+											<view style="width: 50%; font-size: 88rpx;">鍑�閲�: {{item.weight}}KG</view>
+											
+											
 										</swiper-item>
 									</swiper>
 								</view>
@@ -276,7 +280,7 @@
 				<!-- 寮瑰嚭title -->
 				<view class="eject-title">淇敼 / 閰嶇疆</view>
 				<!-- input -->
-				<view class="eject-input">
+				<scroll-view scroll-y class="eject-input">
 					<view class="item">
 						<view class="desc">ip锛�</view>
 						<view class="input">
@@ -307,7 +311,7 @@
 							<input type="text" v-model="baseUrl">
 						</view>
 					</view>
-				</view>
+				</scroll-view>
 				<!-- button -->
 				<view class="eject-button">
 					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -387,7 +391,8 @@
 				swiperList: [],
 				timeOut: false,
 				times: 0,
-				currDate: ''
+				currDate: '',
+				
 			}
 		},
 		onShow() {
@@ -464,6 +469,9 @@
 						that.infoText.title = '绌烘墭鍑哄簱'
 					}
 					that.infoText.barcode = res.data[0].barcode
+					that.infoText.workNo = res.data[0].workNo
+					that.infoText.sourceLocNo = res.data[0].sourceLocNo
+					that.infoText.staNo = res.data[0].staNo
 					that.swiperList = res.data[0].matDtos
 					// that.infoText.matnr = res.data[0].matDtos[0].matnr
 					// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -530,6 +538,9 @@
 								that.infoText.title = '绌烘墭鍑哄簱'
 							}
 							that.infoText.barcode = res.data[0].barcode
+							that.infoText.workNo = res.data[0].workNo
+							that.infoText.sourceLocNo = res.data[0].sourceLocNo
+							that.infoText.staNo = res.data[0].staNo
 							that.swiperList = res.data[0].matDtos
 							// that.infoText.matnr = res.data[0].matDtos[0].matnr
 							// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -544,7 +555,7 @@
 					},
 					fail(err) {
 						that.timeOut = true
-						that.times = that.times+3
+						that.times = that.times+1
 						that.infoType = 0
 					}
 				})
@@ -797,6 +808,7 @@
 						ledId: that.baseLedId,
 					},
 					success(result) {
+						console.log(result);
 						var res = result.data
 						if (res.code === 200) {
 							that.baseInfo.xDistance = res.data.xDistance
@@ -1048,12 +1060,15 @@
 		text-align: center;
 	}
 	.eject-input {
-		
+		margin-top: 2vh;
+		height: 25vh;
+		/* background-color: #00163E; */
+		::-webkit-scrollbar{display:none}
 	}
 	.item {
 		display: flex;
 		align-items: center;
-		margin: 2vh 0 0 0;
+		margin: 1vh 0 0 0;
 		font-size: 1.5vw;
 		color: #363636;
 	}

--
Gitblit v1.9.1