From 1acf4b385762ec1faf1d8b5df63c19f29d021f04 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 27 六月 2024 14:02:41 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6146452..8ebb333 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,7 +217,7 @@
<view class="swiper-head">
<view style="width: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
<view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
- <view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+ <view style="width: 30%;" v-show="pakoutShow">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
<view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
<!-- <view style="width: 10%;">鏁伴噺</view> -->
</view>
@@ -228,20 +228,16 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ display-multiple-items="1"
+ circular="true" :autoplay="false" :interval="3000" :duration="2000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
- <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
-
-
- <view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 30%;">澶囨敞: {{item.memo}}</view>
-
-
+ <view style="width: 100%;display: flex;flex-direction: column;
+ align-items: center;justify-content: space-around;">
+ <view style="width: 60%;font-size:4vw" v-show="!pakoutShow">搴撲綅鍙�: {{item.locNo}}</view>
+ <view style="width: 60%;font-size:4vw" v-show="pakoutShow">浜у搧浠ｅ彿: {{item.matnr}}</view>
+ <view style="width: 60%;font-size:4vw" v-show="pakoutShow">浜у搧鍚嶇О: {{item.maknx}}</view>
+ <view style="width: 60%;font-size:4vw" v-show="pakoutShow">鏁伴噺: [{{item.count}} / {{item.total}}]</view>
+ </view>
</swiper-item>
</swiper>
</view>
@@ -319,7 +315,7 @@
</view>
</view>
</view>
- <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOuts">
杩炴帴瓒呮椂: {{times}} s
</view>
</view>
@@ -389,9 +385,10 @@
barcode: ""
},
swiperList: [],
- timeOut: false,
+ timeOuts: false,
times: 0,
- currDate: ''
+ currDate: '',
+ pakoutShow: false
}
},
onShow() {
@@ -456,12 +453,16 @@
that.infoType = 1
if (res.data[0].ioType === 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 1) {
that.infoText.title = '鍏ュ簱'
+ that.pakoutShow = false
} else if(res.data[0].ioType === 10) {
that.infoText.title = '绌烘墭鍏ュ簱'
} else if(res.data[0].ioType === 110) {
@@ -472,10 +473,6 @@
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.specs = res.data[0].matDtos[0].specs
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -525,12 +522,16 @@
that.infoType = 1
if (res.data[0].ioType === 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 1) {
that.infoText.title = '鍏ュ簱'
+ that.pakoutShow = false
} else if(res.data[0].ioType === 10) {
that.infoText.title = '绌烘墭鍏ュ簱'
} else if(res.data[0].ioType === 110) {
@@ -554,7 +555,7 @@
},
fail(err) {
that.timeOut = true
- that.times = that.times+3
+ that.times = that.times+1
that.infoType = 0
}
})
@@ -570,7 +571,6 @@
that.timeOut = false
that.times = 0
var res = result.data
- console.log(res);
if (res.data && res.data !== "") {
var errorInfo = res.data
if (that.infoType == 1) {
@@ -808,6 +808,7 @@
ledId: that.baseLedId,
},
success(result) {
+ console.log(result);
var res = result.data
if (res.code === 200) {
that.baseInfo.xDistance = res.data.xDistance
--
Gitblit v1.9.1