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 |  297 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 188 insertions(+), 109 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e2d0281..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;">m</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;">m</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;">s</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;">s</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>
@@ -173,7 +146,7 @@
 													</view>
 													<view class="flex-row sub-info" style="margin-top: 2vh;">
 														<image src="../../static/e1.png" mode="aspectFit"></image>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;">绂佺敤</view>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
 														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</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/ruiyun.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>
@@ -217,11 +189,11 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<view>鐩爣绔欙細{{infoText.staNo}}</view>
-									<view>鍟嗗搧缂栧彿</view>
-									<view>鍟嗗搧鍚嶇О</view>
-									<view>瑙勬牸</view>
-									<view>鏁伴噺</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 +202,19 @@
 									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>No:{{i+1}}</view>
-											<view>{{item.matnr}}</view>
-											<view>{{item.maktx}}</view>
-											<view>{{item.specs}}</view>
-											<view>{{item.count}}</view>
+											<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</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>
+											
+											
+											
 										</swiper-item>
 									</swiper>
 								</view>
@@ -276,7 +253,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 +284,7 @@
 							<input type="text" v-model="baseUrl">
 						</view>
 					</view>
-				</view>
+				</scroll-view>
 				<!-- button -->
 				<view class="eject-button">
 					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -315,9 +292,12 @@
 				</view>
 			</view>
 		</view>
+		<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+			杩炴帴瓒呮椂: {{times}} s
+		</view>
 	</view>
 </template>
-
+<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
 <script>
 	import demodata from '@/mockdata/demodata.json';
 	import ycqdata from '@/pages/index/data.json';
@@ -378,9 +358,15 @@
 					maknx: "",
 					specs: "",
 					count: "",
-					error: ""
+					error: "",
+					barcode: ""
 				},
-				swiperList: []
+				swiperList: [],
+				timeOut: false,
+				times: 0,
+				currDate: '',
+				locList:[]
+				
 			}
 		},
 		onShow() {
@@ -409,18 +395,44 @@
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
-				this.getDate()
+				// this.getDate()
+				this.getDate2()
 				this.getInfo()
 				this.getError()
 				// this.getInfo2()
 				// 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);
+			},
 			getUrl() {
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
 			},
@@ -443,7 +455,18 @@
 						that.infoText.title = '鍏ㄦ澘鍑哄簱'
 					} else if(res.data[0].ioType === 103) {
 						that.infoText.title = '妫�鏂欏嚭搴�'
+					} else if(res.data[0].ioType === 107) {
+						that.infoText.title = '鐩樼偣鍑哄簱'
+					} else if(res.data[0].ioType === 1) {
+						that.infoText.title = '鍏ュ簱'
+					} else if(res.data[0].ioType === 10) {
+						that.infoText.title = '绌烘墭鍏ュ簱'
+					} else if(res.data[0].ioType === 110) {
+						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
@@ -465,12 +488,14 @@
 					var errorInfo = res.data
 					if (that.infoType == 1) {
 						that.infoType = 3
-						that.infoText.title = "寮傚父"
+						that.infoText.title = "鍏朵粬淇℃伅" 
+						// that.infoText.title = "寮傚父"
 						that.infoText.error = errorInfo
 						return
 					}
 					that.infoType = 2
-					that.infoText.title = "寮傚父"
+					that.infoText.title = "鍏朵粬淇℃伅"
+					// that.infoText.title = "寮傚父"
 					that.infoText.error = errorInfo
 				} else {
 					if (that.infoType == 1) {
@@ -486,6 +511,8 @@
 					method:"GET",
 					data: {ledId:that.baseLedId},
 					success(result) {
+						that.timeOut = false
+						that.times = 0
 						var	res = result.data
 						if (res.data && res.data !== "") {
 							if (that.infoType == 2 || that.infoType == 3) {
@@ -497,18 +524,35 @@
 								that.infoText.title = '鍏ㄦ澘鍑哄簱'
 							} else if(res.data[0].ioType === 103) {
 								that.infoText.title = '妫�鏂欏嚭搴�'
+							} else if(res.data[0].ioType === 107) {
+								that.infoText.title = '鐩樼偣鍑哄簱'
+							} else if(res.data[0].ioType === 1) {
+								that.infoText.title = '鍏ュ簱'
+							} else if(res.data[0].ioType === 10) {
+								that.infoText.title = '绌烘墭鍏ュ簱'
+							} else if(res.data[0].ioType === 110) {
+								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.infoText.matnr = res.data[0].matDtos[0].matnr
-							that.infoText.specs = res.data[0].matDtos[0].specs
-							that.infoText.maknx = res.data[0].matDtos[0].maknx
-							that.infoText.count = res.data[0].matDtos[0].count
+							that.swiperList = res.data[0].matDtos
+							// that.infoText.matnr = res.data[0].matDtos[0].matnr
+							// that.infoText.specs = res.data[0].matDtos[0].specs
+							// that.infoText.maknx = res.data[0].matDtos[0].maknx
+							// that.infoText.count = res.data[0].matDtos[0].count
 						} else {
 							if (that.infoType == 2 || that.infoType == 3) {
 								return;
 							}
 							that.infoType = 0
 						}
+					},
+					fail(err) {
+						that.timeOut = true
+						that.times = that.times+1
+						that.infoType = 0
 					}
 				})
 				
@@ -520,18 +564,21 @@
 					data: {ledId:that.baseLedId},
 					method:"GET",
 					success(result) {
+						that.timeOut = false
+						that.times = 0
 						var	res = result.data
-						console.log(res);
 						if (res.data && res.data !== "") {
 							var errorInfo = res.data
 							if (that.infoType == 1) {
 								that.infoType = 3
-								that.infoText.title = "寮傚父"
+								that.infoText.title = "鍏朵粬淇℃伅" 
+								// that.infoText.title = "寮傚父"
 								that.infoText.error = errorInfo
 								return
 							}
 							that.infoType = 2
-							that.infoText.title = "寮傚父"
+							that.infoText.title = "鍏朵粬淇℃伅"
+							// that.infoText.title = "寮傚父"
 							that.infoText.error = errorInfo
 						} else {
 							if (that.infoType == 1) {
@@ -539,6 +586,10 @@
 							}
 							that.infoType = 0
 						}
+					},
+					fail(err) {
+						that.timeOut = true
+						that.infoType = 0
 					}
 				})
 				
@@ -547,6 +598,31 @@
 			controller() {
 				switch(this.infoType) {
 					// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+					case 0: 
+						if (this.errorInfoViewShow) {
+							this.errorInfoViewShow = false
+							this.errorInfoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.homeViewShow = true
+								this.homeMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.infoViewShow) {
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.homeViewShow = true
+								this.homeMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.errorInfoViewShow && this.infoViewShow) {
+							this.errorInfoViewShow = false
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.homeViewShow = true
+								this.homeMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
 					case 1: 
 						if (this.homeViewShow) {
 							this.homeViewShow = false
@@ -601,23 +677,7 @@
 							},1000)
 						}
 						return;
-					default :
-						if (this.errorInfoViewShow) {
-							this.errorInfoViewShow = false
-							this.errorInfoMode = ['fade', 'slide-bottom']
-							setTimeout(()=>{
-								this.homeViewShow = true
-								this.homeMode = ['fade', 'slide-bottom']
-							},1000)
-						} else if (this.infoViewShow) {
-							this.infoViewShow = false
-							this.infoMode = ['fade', 'slide-bottom']
-							setTimeout(()=>{
-								this.homeViewShow = true
-								this.homeMode = ['fade', 'slide-bottom']
-							},1000)
-						}
-						return;
+					
 				}
 				
 			},
@@ -654,6 +714,20 @@
 				this.getUrl()
 				this.ejectShow = false
 			},
+			// 鏃ュ巻 鏈嶅姟鍣�
+			getDate2() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/date",
+					method:"GET",
+					success(result) {
+						var res = result.data.data
+						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+						that.currDate = res.year + "/" + res.month + "/" + res.day
+					}
+				})
+			},
+			
 			// 鏃ュ巻
 			getDate() {
 				var dt = new Date();
@@ -677,7 +751,7 @@
 				this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
 			},
 			getDateFormat(value) {
-				var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
+				var date = new Date(this.currDate);// 鑾峰彇褰撳墠鏃堕棿
 				date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
 				var m = date.getMonth() + 1
 				var d = date.getDate()
@@ -730,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
@@ -824,6 +899,7 @@
 		height: 8.5%;
 	}
 	.img-box {
+		height: 23vw;
 		width: 100%;
 		/* background-color: #666666; */
 		display: flex;
@@ -867,7 +943,7 @@
 	  margin-left: 10%;
 	} 
 	.charts-box-ring {
-		width: 50%;
+		width: 60%;
 		height: 24vh;
 		/* background-color: #00ffff; */
 	}
@@ -981,12 +1057,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