From a8027483a733f4a743a0232a21edfb363c08a118 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 30 八月 2023 14:11:15 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e9ea281..447e60d 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -220,6 +220,7 @@
 									<view>宸ヤ綔鍙�: {{infoText.workNo}}</view>
 									<view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
 									<view>鐩爣绔�: {{infoText.staNo}}</view>
+									<view v-show="infoText.ctnNo" style="color: red;">閿佺爜鐗╂枡</view>
 									<!-- <view style="width: 10%;">鏁伴噺</view> -->
 								</view>
 								<!-- body -->
@@ -405,7 +406,8 @@
 					doneOfTray: '',
 					totalOfTray: '',
 					doneOfUnit: '',
-					totalOfUnit: ''
+					totalOfUnit: '',
+					ctnNo: '1'
 				},
 				swiperList: [],
 				timeOut: false,
@@ -440,16 +442,16 @@
 				this.initPieChart()
 				this.getOther()
 				this.getDate2()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
+				// this.getInfo()
+				// this.getError()
+				this.getInfo2()
+				this.getError2()
 				this.getUrl()
 				this.controller()
 			},1000)
 		},
 		methods: {
-			timeOut() {
+			timeOuts() {
 				console.log(this.times);
 			},
 			getUrl() {
@@ -486,6 +488,12 @@
 					that.infoText.workNo = res.data[0].workNo
 					that.infoText.sourceLocNo = res.data[0].sourceLocNo
 					that.infoText.staNo = res.data[0].staNo
+					that.infoText.ctnNo = res.data[0].ctnNo
+					if (res.data[0].ctnNo) {
+						that.infoText.orderNo = ''
+					} else {
+						that.infoText.orderNo = res.data[0].orderNo
+					}
 					that.swiperList = res.data[0].matDtos
 					that.infoText.matnr = res.data[0].matDtos[0].matnr
 					that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
@@ -495,7 +503,7 @@
 					that.infoText.totalOfTray = res.data[0].totalOfTray
 					that.infoText.doneOfUnit = res.data[0].doneOfUnit
 					that.infoText.totalOfUnit = res.data[0].totalOfUnit
-					that.infoText.orderNo = res.data[0].orderNo
+					
 					
 
 				} else {
@@ -580,7 +588,7 @@
 					},
 					fail(err) {
 						that.timeOut = true
-						that.times = that.times+3
+						that.times = that.times+1
 						that.infoType = 0
 					}
 				})

--
Gitblit v1.9.1