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/home/home.vue | 172 ++++++++++++++++++++++++++-------------------------------
1 files changed, 78 insertions(+), 94 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e9ea281..6de7340 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -220,10 +220,11 @@
<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 -->
- <view class="swiper-body">
+ <view class="swiper-body" :class="textred" >
<!-- swiper 涓�浜涜鏄�
circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
@@ -235,21 +236,20 @@
<view>
<view>鏂欏彿锛歿{infoText.matnr}}</view>
<view class="swiper-margin">瑙勬牸锛歿{infoText.specs}}</view>
+ <view v-show="!infoText.orderNo" class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
</view>
<view>
<view>鎵规锛歿{infoText.batch}}</view>
<view class="swiper-margin">鍑哄簱鏁伴噺锛歿{infoText.count}}</view>
</view>
</swiper-item>
+ <!-- <swiper-item class="swiper-item" v-show="!infoText.orderNo">
+
+ </swiper-item> -->
<swiper-item class="swiper-item" v-show="infoText.orderNo">
<view>
- <view>璁㈠崟鍙凤細</view>
- <view class="swiper-margin">{{infoText.orderNo}}</view>
-
- </view>
- <view>
- <view>宸插嚭鎵樼洏鏁帮細{{infoText.doneOfTray}}</view>
- <view class="swiper-margin">鎬绘墭鐩樻暟锛歿{infoText.totalOfTray}}</view>
+ <view>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
+ <view class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
</view>
<view>
<view>宸插嚭绠辨暟锛歿{infoText.doneOfTray}}</view>
@@ -405,12 +405,14 @@
doneOfTray: '',
totalOfTray: '',
doneOfUnit: '',
- totalOfUnit: ''
+ totalOfUnit: '',
+ ctnNo: '1'
},
swiperList: [],
timeOut: false,
times: 0,
- currDate: ''
+ currDate: '',
+ textred: 'textred'
}
},
onShow() {
@@ -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() {
@@ -464,46 +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.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 : '--'
- 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
- that.infoText.orderNo = res.data[0].orderNo
-
-
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
},
getError2 () {
let that = this
@@ -511,6 +474,7 @@
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
+
if (that.infoType == 1) {
that.infoType = 3
that.infoText.title = "鍏朵粬淇℃伅"
@@ -539,52 +503,65 @@
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.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
- 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
- that.infoText.orderNo = res.data[0].orderNo
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
},
fail(err) {
that.timeOut = true
- that.times = that.times+3
+ that.times = that.times+1
that.infoType = 0
}
})
+ },
+ 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
@@ -981,6 +958,9 @@
width: 3.5vw;
height: 3.5vw;
}
+ .red{
+ color: red
+ }
@@ -1151,5 +1131,9 @@
.info-box-text-item {
height: 20%;font-size: 8vh;
justify-content: center;
+ white-space: pre-line;
+ }
+ .textred{
+ color: red;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1