From b829e0e3879ac18ab4711a04b23ce8d334ec55f3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 18 四月 2025 09:14:46 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  139 ++++++++++++++++++++++-----------------------
 1 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 2ef9df5..c5ef810 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,58 +15,31 @@
 						<view class="mian-item-box">
 							<y-box>
 								<view class="box-item">
-									<text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
-									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
-									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
-								</view>
+									<text class="item-title">鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
+									<text class="item-subTitle">Intelligent LargeScreen Display System</text>
+									</view>
 								<view class="box-item">
 									<text class="item-title">浠撳簱鏁版嵁</text>
 									<text class="item-subTitle">warehouse data</text>
-									<view class="img-box">
+									<view class="img-box">										
+										<!-- swiper 涓�浜涜鏄�
+										circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+										vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
+										display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+										<swiper class="swiper-body-main" vertical="true" 
+										display-multiple-items="3"
+										circular="true" :autoplay="true" :interval="3000" :duration="2000">
+											<swiper-item class="swiper-item" v-for="(item,i) in locList" :key="i">
+												<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+												<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
+												<view style="width: 70%; font-size: 2vw;">鏂欏彿: {{item.matnr}}</view>
+												<view style="width: 30%; font-size: 2vw;">鏁伴噺: {{item.matnrCount}}</view>
+												
+												
+												
+											</swiper-item>
+										</swiper>
 										
-										<view class="item-img">
-											<image src="../../static/a1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(鍗冪背)</view>
-											</view>
-										</view>
-										
-										<view class="item-img">
-											<image src="../../static/b1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(鍗冪背)</view>
-											</view>
-										</view>
-										
-										<view class="item-img">
-											<image src="../../static/c1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(灏忔椂)</view>
-											</view>
-										</view>
-										
-										<view class="item-img">
-											<image src="../../static/d1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(灏忔椂)</view>
-											</view>
-										</view>
 										
 									</view>
 								</view>
@@ -83,7 +56,7 @@
 											<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
 												<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
 												<text class="item-title">{{baseInfo.usedPr}}%</text>
-												<text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text>
+												<!-- <text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text> -->
 											</view>
 										</view>
 									</view>
@@ -119,8 +92,8 @@
 													<!-- 鐧惧垎姣� -->
 													<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
 														<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
-														<text class="item-title">31</text>
-														<text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
+														<!-- <text class="item-title">31</text>
+														<text class="item-subTitle">浠婃棩璁㈠崟鏁�</text> -->
 													</view>
 												</view>
 											</view>
@@ -183,14 +156,13 @@
 									</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;">
-											<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
-											鑷姩浠撳簱WCS鐩戞帶骞冲彴
-											<!-- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image> -->
-										</view>
-									</y-box>
+								<view style="height: 18%;display: flex;justify-content: space-around;align-items: center;">
+									<view style="font-size: 4vh">
+										鑷姩浠撳簱WCS鐩戞帶骞冲彴
+									</view>
+									<view style="height: 50%;">
+										<image style="height: 100%;" src="../../static/img/logo-bai.png" mode="aspectFit"></image>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -230,18 +202,17 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="3"
+									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: 30%;">{{i+1}} / {{swiperList.length}}</view>
+											<!-- <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: 50%; font-size: 3vw;">鐗╂枡缂栫爜: {{item.matnr}}</view>
+											<view style="width: 50%; font-size: 3vw;">鎵瑰彿: {{item.batch}}</view>											
+											<view style="width: 100%; font-size: 3vw;">瑙勬牸: {{item.specs}}</view>
+											<view style="width: 50%; font-size: 3vw;">鏁伴噺: {{item.anfme}}</view>
+											<view style="width: 50%; font-size: 3vw;">鍗曚綅: {{item.sku}}</view>
 											
-											
-											<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
-											<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
-											<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
 											
 											
 										</swiper-item>
@@ -393,7 +364,9 @@
 				swiperList: [],
 				timeOut: false,
 				times: 0,
-				currDate: ''
+				currDate: '',
+				locList:[]
+				
 			}
 		},
 		onShow() {
@@ -430,11 +403,33 @@
 				// this.getError2()
 				this.getUrl()
 				this.controller()
+				this.statisticalModel()
 				// 娴嬭瘯鐢�
 				
 			},1000)
+			
+			setInterval(()=> {
+				setTimeout(()=>{
+					plus.runtime.restart();
+				},100)
+				
+			},1000*60*60*4)
 		},
 		methods: {
+			statisticalModel() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/locDetl/pda/statisticalModel",
+					method:'GET',
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							console.log(res.data)
+							that.locList = res.data
+						}
+					}
+				})
+			},
 			timeOut() {
 				console.log(this.times);
 			},
@@ -556,7 +551,7 @@
 					},
 					fail(err) {
 						that.timeOut = true
-						that.times = that.times+3
+						that.times = that.times+1
 						that.infoType = 0
 					}
 				})
@@ -809,6 +804,7 @@
 						ledId: that.baseLedId,
 					},
 					success(result) {
+						// console.log(result);
 						var res = result.data
 						if (res.code === 200) {
 							that.baseInfo.xDistance = res.data.xDistance
@@ -903,6 +899,7 @@
 		height: 8.5%;
 	}
 	.img-box {
+		height: 23vw;
 		width: 100%;
 		/* background-color: #666666; */
 		display: flex;
@@ -946,7 +943,7 @@
 	  margin-left: 10%;
 	} 
 	.charts-box-ring {
-		width: 50%;
+		width: 60%;
 		height: 24vh;
 		/* background-color: #00ffff; */
 	}

--
Gitblit v1.9.1