From 7a6fa0eef283bec6b91474522e11e5fa8ed88c08 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 30 八月 2023 14:14:01 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 447e60d..8a6adc9 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -442,10 +442,10 @@
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)
@@ -570,6 +570,12 @@
that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.infoText.staNo = res.data[0].staNo
that.swiperList = res.data[0].matDtos
+ that.infoText.ctnNo = res.data[0].ctnNo
+ if (res.data[0].ctnNo) {
+ that.infoText.orderNo = ''
+ } else {
+ that.infoText.orderNo = res.data[0].orderNo
+ }
that.infoText.matnr = res.data[0].matDtos[0].matnr
that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
that.infoText.specs = res.data[0].matDtos[0].specs
@@ -578,7 +584,6 @@
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 {
if (that.infoType == 2 || that.infoType == 3) {
return;
--
Gitblit v1.9.1