From 346f6ad5ce2d2dff712188909da2434d15199630 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 23 九月 2023 16:10:15 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 4
Monitor-APP/pages/home/home.vue | 155 ++++++++++++++++++---------------------------------
2 files changed, 58 insertions(+), 101 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 1a6ebe3..6de7340 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)
@@ -466,55 +466,7 @@
let that = this
var result = ycqdata.dataInfo3
var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
- that.infoType = 1
- if (res.data[0].ioType === 101) {
- 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.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 = ''
- that.textred = 'textred'
- } else {
- that.infoText.orderNo = res.data[0].orderNo
- that.textred = ''
- }
- that.swiperList = res.data[0].matDtos
- that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.barcode = res.data[0].barcode
- that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
- that.infoText.specs = res.data[0].matDtos[0].specs
- that.infoText.count = res.data[0].matDtos[0].count
- that.infoText.doneOfTray = res.data[0].doneOfTray
- that.infoText.totalOfTray = res.data[0].totalOfTray
- that.infoText.doneOfUnit = res.data[0].doneOfUnit
- that.infoText.totalOfUnit = res.data[0].totalOfUnit
-
-
-
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
},
getError2 () {
let that = this
@@ -551,52 +503,7 @@
that.timeOut = false
that.times = 0
var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
- that.infoType = 1
- if (res.data[0].ioType === 101) {
- 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.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.ctnNo = res.data[0].ctnNo
- if (res.data[0].ctnNo) {
- that.infoText.orderNo = ''
- that.textred = 'textred'
- } else {
- that.infoText.orderNo = res.data[0].orderNo
- that.textred = ''
- }
- that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.barcode = res.data[0].barcode
- that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
- that.infoText.specs = res.data[0].matDtos[0].specs
- that.infoText.count = res.data[0].matDtos[0].count
- that.infoText.doneOfTray = res.data[0].doneOfTray
- that.infoText.totalOfTray = res.data[0].totalOfTray
- that.infoText.doneOfUnit = res.data[0].doneOfUnit
- that.infoText.totalOfUnit = res.data[0].totalOfUnit
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
},
fail(err) {
that.timeOut = true
@@ -606,6 +513,56 @@
})
},
+ infoModel(res) {
+ let that = this
+ console.log(res);
+ if (res.data && res.data !== "") {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
+ that.infoType = 1
+ if (res.data[0].ioType === 101) {
+ 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.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.ctnNo = res.data[0].ctnNo
+ if (res.data[0].ctnNo) {
+ that.infoText.orderNo = ''
+ that.textred = 'textred'
+ } else {
+ that.infoText.orderNo = res.data[0].orderNo
+ that.textred = ''
+ }
+ that.infoText.matnr = res.data[0].matDtos[0].matnr
+ that.infoText.barcode = res.data[0].barcode
+ that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
+ that.infoText.specs = res.data[0].matDtos[0].specs
+ that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.doneOfTray = res.data[0].doneOfTray
+ that.infoText.totalOfTray = res.data[0].totalOfTray
+ that.infoText.doneOfUnit = res.data[0].doneOfUnit
+ that.infoText.totalOfUnit = res.data[0].totalOfUnit
+ } else {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ that.infoType = 0
+ }
+ },
getError() {
let that = this
uni.request({
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 2783b4a..a2b8bb8 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -2,13 +2,13 @@
"dataInfo3": {"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{
"title":"鍏ㄦ澘鍑哄簱",
"workNo":8317,
- "orderNo":"2600502",
+ "orderNo":"",
"ioType":101,
"staNo":100,
"sourceStaNo":null,
"locNo":null,
"sourceLocNo":"2600502",
- "ctnNo":"N",
+ "ctnNo":"",
"barcode":"F16331500109",
"matDtos":[
{"matnr":"FF11002R",
--
Gitblit v1.9.1