From 741be74404d34f1215edde634bec5b3937201c4b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 23 九月 2023 16:04:52 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 33cb71f..1a6ebe3 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -220,11 +220,11 @@
<view>宸ヤ綔鍙�: {{infoText.workNo}}</view>
<view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
<view>鐩爣绔�: {{infoText.staNo}}</view>
- <view v-show="infoText.ctnNo" style="color: red;">閿佺爜鐗╂枡</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 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
@@ -236,12 +236,16 @@
<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>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
@@ -407,7 +411,8 @@
swiperList: [],
timeOut: false,
times: 0,
- currDate: ''
+ currDate: '',
+ textred: 'textred'
}
},
onShow() {
@@ -437,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)
@@ -486,8 +491,10 @@
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
@@ -515,6 +522,7 @@
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
+
if (that.infoType == 1) {
that.infoType = 3
that.infoText.title = "鍏朵粬淇℃伅"
@@ -569,11 +577,13 @@
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].matDtos[0].barcode
+ 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
@@ -991,6 +1001,9 @@
width: 3.5vw;
height: 3.5vw;
}
+ .red{
+ color: red
+ }
@@ -1161,5 +1174,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