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/index/data.json | 26 ++++++++++++++++++++++++--
Monitor-APP/pages/home/home.css | 3 +++
Monitor-APP/pages/home/home.vue | 21 ++++++++++++++++++---
3 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index e47e9c7..7120134 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -40,3 +40,6 @@
.swiper-margin {
margin-top: 50px;
}
+.textred {
+ color: red;
+}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index c344f78..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() {
@@ -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
@@ -570,8 +577,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.infoText.matnr = res.data[0].matDtos[0].matnr
that.infoText.barcode = res.data[0].barcode
@@ -992,6 +1001,9 @@
width: 3.5vw;
height: 3.5vw;
}
+ .red{
+ color: red
+ }
@@ -1164,4 +1176,7 @@
justify-content: center;
white-space: pre-line;
}
+ .textred{
+ color: red;
+ }
</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6e06fe9..2783b4a 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,5 +1,27 @@
{
- "dataInfo3": {"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":8317,"orderNo":"P6011809230002","ioType":101,"staNo":100,"sourceStaNo":null,"locNo":null,"sourceLocNo":"2600502","ctnNo":null,"barcode":"F16331500109","matDtos":[{"matnr":"FF11002R","maknx":null,"specs":"150/48 SDR","batch":"A-N-16--","count":315.0,"total":315.0}],"emptyMk":false,"doneOfTray":5,"totalOfTray":9,"doneOfUnit":1422.0,"totalOfUnit":2862.0}]}},
+ "dataInfo3": {"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{
+ "title":"鍏ㄦ澘鍑哄簱",
+ "workNo":8317,
+ "orderNo":"2600502",
+ "ioType":101,
+ "staNo":100,
+ "sourceStaNo":null,
+ "locNo":null,
+ "sourceLocNo":"2600502",
+ "ctnNo":"N",
+ "barcode":"F16331500109",
+ "matDtos":[
+ {"matnr":"FF11002R",
+ "maknx":null,
+ "specs":"150/48 SDR",
+ "batch":"A-N-16--",
+ "count":315.0,
+ "total":315.0}],
+ "emptyMk":false,
+ "doneOfTray":5,
+ "totalOfTray":9,
+ "doneOfUnit":1422.0,
+ "totalOfUnit":2862.0}]}},
"dataInfo2": {
"data": {
"msg": "鎿嶄綔鎴愬姛",
@@ -92,7 +114,7 @@
"data": {
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
- "data": "1鍙峰爢鍨涙満鍦伴潰绔欐�ュ仠\n2鍙峰爢鍨涙満鍦伴潰绔欐�ュ仠"
+ "data": ""
}
},
"lineData": {
--
Gitblit v1.9.1