From ed17381fd47260f30a42e49663924ef6bbfd83c0 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 09:16:26 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  110 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 85 insertions(+), 25 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 76bb265..00e6de4 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,9 +218,9 @@
 									<view style="flex: 1;">浣滀笟鏁伴噺锛歿{infoText.barcode}}</view>
 									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view> -->
-								<view class="swiper-head">
+								<view class="swiper-head" v-show="swiperList.length > 0">
 									<view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
-									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
+									<view style="flex: 2;">{{infoText.title2}} <br />鍟嗗搧缂栧彿</view>
 									<view style="flex: 2;">绠辩爜</view>
 									<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
 									<view style="flex: 5;">瑙勬牸</view>
@@ -346,8 +346,8 @@
 				errorBoardShow: false,
 				carInfo: [],
 				series: [],
-				homeViewShow: true,
-				infoViewShow: false	,
+				homeViewShow: false,
+				infoViewShow: true	,
 				errorInfoViewShow: false,
 				homeMode: [],
 				infoMode: [],
@@ -393,7 +393,8 @@
 				infoType: 0,
 				text: '',
 				infoText: {
-					title: '',
+					title: '鑷姩浠撳簱WCS鐩戞帶骞冲彴',
+					title2: '',
 					staNo: "",
 					matnr: "",
 					maknx: "",
@@ -444,15 +445,15 @@
 				// this.initPieChart()
 				// this.getOther()
 				setTimeout(()=>{
-					this.getServerData()
-					this.initlineChart()
-					this.initPieChart()
-					this.getOther()
+					// this.getServerData()
+					// this.initlineChart()
+					// this.initPieChart()
+					// this.getOther()
 					setTimeout(()=>{
-						this.getServerData()
-						this.initlineChart()
-						this.initPieChart()
-						this.getOther()
+						// this.getServerData()
+						// this.initlineChart()
+						// this.initPieChart()
+						// this.getOther()
 					},3000)
 				},1000)
 			},1000)
@@ -467,7 +468,7 @@
 				// this.getCarInfoTest()
 				// this.getInfo2()
 				// this.getError2()
-				this.controller()
+				this.controller2()
 			},1000)
 			
 			// setInterval(()=>{
@@ -475,10 +476,10 @@
 			// },5000)
 			
 			setInterval(()=>{
-				this.getServerData()
-				this.initlineChart()
-				this.initPieChart()
-				this.getOther()
+				// this.getServerData()
+				// this.initlineChart()
+				// this.initPieChart()
+				// this.getOther()
 			},600000)
 		},
 		methods: {
@@ -594,7 +595,8 @@
 							if (that.infoType == 1) {
 								return
 							}
-							that.infoType = 0
+							that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
+							that.infoType = 1
 						}
 					}
 				})
@@ -610,30 +612,88 @@
 					that.infoType = 1
 					if (res.data[0].ioType === 101) {
 						that.infoText.title = '鍏ㄦ澘鍑哄簱'
+						that.infoText.title2 = '鍏ㄦ澘鍑哄簱'
 					} else if(res.data[0].ioType === 103) {
 						that.infoText.title = '妫�鏂欏嚭搴�'
+						that.infoText.title2 = '妫�鏂欏嚭搴�'
 					} else if(res.data[0].ioType === 107) {
 						that.infoText.title = '鐩樼偣鍑哄簱'
+						that.infoText.title2 = '鐩樼偣鍑哄簱'
 					}
 					res.data[0].matDtos
 					for(let k in res.data[0].matDtos) {
 						
-						if(res.data[0].matDtos[k].count != 0) {
+						if(res.data[0].matDtos[k].count == 0) {
 							res.data[0].matDtos[k]['color'] = 'color: #df741c'
 						}
 					}
 					that.infoText.staNo = res.data[0].staNo
 					that.infoText.barcode = res.data[0].barcode
 					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
+					that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
+					that.infoType = 1
+				}
+			},
+			controller2() {
+				switch(this.infoType) {
+					case 1: 
+						if (this.homeViewShow) {
+							this.homeViewShow = false
+							this.homeMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.infoViewShow = true
+								this.infoMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.errorInfoViewShow) {
+							this.errorInfoViewShow = false
+							this.errorInfoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.infoViewShow = true
+								this.infoMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
+						// 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
+					case 2:
+						if (this.homeViewShow) {
+							this.homeViewShow = false
+							this.homeMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.infoViewShow) {
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
+					// 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
+					case 3:
+						if (this.homeViewShow) {
+							this.homeViewShow = false
+							this.homeMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.infoViewShow) {
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
+					
 				}
 			},
 			// 鎺у埗鍣�

--
Gitblit v1.9.1