From 638985210855baa6d1eee9bf0bb0936c6702cbc6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 12 十二月 2023 19:12:34 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9f9b4ff..79edc7f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -35,18 +35,18 @@
</view>
</view>
- <view class="flex-col" style="width: 100%;" v-if="item.agvWaitPakin">
+ <view class="flex-col" style="width: 100%;" v-if="item.agvWaitPakins">
<view class="flex-row" style="background-color: #007aff;">
<view style="flex: 3;">璁㈠崟鍙�</view>
<view style="flex: 3;">鐗╂枡鍙�</view>
<view style="flex: 1;">鏁伴噺</view>
<view style="flex: 1;">缁撲綑</view>
</view>
- <view class="flex-row" v-for="k in item.agvWaitPakin.orderNo">
- <view style="flex: 3;">{{k.orderNo}}</view>
- <view style="flex: 3;">{{item.agvWaitPakin.matnr}}</view>
+ <view class="flex-row" v-for="k in item.agvWaitPakins">
+ <view style="flex: 3;">{{k.orderNo ? k.orderNo : '--'}}</view>
+ <view style="flex: 3;">{{k.matnr}}</view>
<view style="flex: 1;">{{k.anfme}}</view>
- <view style="flex: 1;">{{item.agvWaitPakin.volume}}</view>
+ <view style="flex: 1;">{{k.volume}}</view>
</view>
</view>
@@ -57,11 +57,11 @@
<view style="flex: 1;">鏁伴噺</view>
<view style="flex: 1;">缁撲綑</view>
</view>
- <view class="flex-row" v-for="k in item.agvWrkDetl.orderNo">
+ <view class="flex-row" v-for="k in item.agvWrkDetls">
<view style="flex: 3;">{{k.orderNo}}</view>
- <view style="flex: 3;">{{item.agvWrkDetl.matnr}}</view>
+ <view style="flex: 3;">{{k.matnr}}</view>
<view style="flex: 1;">{{k.anfme}}</view>
- <view style="flex: 1;">{{item.agvWrkDetl.volume}}</view>
+ <view style="flex: 1;">{{k.volume}}</view>
</view>
</view>
<view style="align-self: center;margin-top: auto;width: 100%;display: flex;align-items: center;justify-content: center;" v-if="item.agvWrkMast && item.agvWrkMast.ioType == 103 && item.agvWrkDetl">
@@ -365,30 +365,36 @@
success(res) {
res = res.data
that.result = res
+ console.log(res);
if (res.code === 200 && res.data.body.length>0) {
that.locs = [];
for (let k of res.data.body) {
for (let i of k.loc) {
- if (i.agvWrkDetl) {
- let a = i.agvWrkDetl.orderNo
- if (RegExp(/{/).test(a)) {
- i.agvWrkDetl.orderNo = JSON.parse(a)
- } else {
- i.agvWrkDetl.orderNo = []
- // console.log(i.agvWrkDetl);
- i.agvWrkDetl.orderNo.push({anfme:i.agvWrkDetl.anfme,orderNo:a})
- }
- }
- if (i.agvWaitPakin) {
- let a = i.agvWaitPakin.orderNo
- if (RegExp(/{/).test(a)) {
- i.agvWaitPakin.orderNo = JSON.parse(a)
- } else {
- i.agvWaitPakin.orderNo = []
- // console.log(i.agvWrkDetl);
- i.agvWaitPakin.orderNo.push({anfme:i.agvWaitPakin.anfme,orderNo:a})
- }
- }
+ // if (i.agvWrkDetl) {
+ // let a = i.agvWrkDetl.orderNo
+ // if (RegExp(/{/).test(a)) {
+ // i.agvWrkDetl.orderNo = JSON.parse(a)
+ // } else {
+ // i.agvWrkDetl.orderNo = []
+ // // console.log(i.agvWrkDetl);
+ // i.agvWrkDetl.orderNo.push({anfme:i.agvWrkDetl.anfme,orderNo:a})
+ // }
+ // }
+ // if (i.agvWaitPakin) {
+ // let a = i.agvWaitPakin.orderNo
+ // if (RegExp(/{/).test(a)) {
+ // i.agvWaitPakin.orderNo = JSON.parse(a)
+ // } else {
+ // i.agvWaitPakin.orderNo = []
+ // // console.log(i.agvWrkDetl);
+ // i.agvWaitPakin.orderNo.push({anfme:i.agvWaitPakin.anfme,orderNo:a})
+ // }
+ // }
+ // if (i.agvWaitPakins) {
+ // for (let y of i.agvWaitPakins) {
+
+ // }
+ // }
if(i.locSts == 'F') {
i['color'] = 'pakin'
}
--
Gitblit v1.9.1