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 | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index cc1db29..79edc7f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -9,7 +9,7 @@
<!-- <view class="time-tools">{{calendar}}</view>
<view class="button-left" @click="ejected()"></view>
<view class="button-right" @click="ejected()"></view> -->
- <view v-if="!locs"><button size="mini" @click="ejected()" >閰嶇疆</button></view>
+ <view v-if="locs.length==0"><button size="mini" @click="ejected()" >閰嶇疆</button></view>
<view class="main" v-if="locs" >
<view class="main-b" v-for="item in locs" :class="item.color">
<view class="flex-col" style="width: 100%;font-size: 5rpx;">
@@ -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 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.anfme + item.agvWaitPakin.volume}}</view>
+ <view style="flex: 1;">{{k.volume}}</view>
</view>
</view>
@@ -55,18 +55,23 @@
<view style="flex: 3;">璁㈠崟鍙�</view>
<view style="flex: 3;">鐗╂枡鍙�</view>
<view style="flex: 1;">鏁伴噺</view>
- <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.anfme + 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">
<view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 10rpx;
border-radius: 8rpx;" @click="pickIn(item.devNo)">鎷ｆ枡鍥炲簱</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 == 107 && item.agvWrkDetl">
+ <view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 10rpx;
+ border-radius: 8rpx;" @click="pickIn(item.devNo)">鐩樼偣鍥炲簱</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 == 101 && item.agvWrkDetl">
@@ -186,7 +191,7 @@
return {
locs: [],
floors: [{value: 1,name:'1妤�'},{value:2,name:'3妤�'}],
- rows: [{value: 'cs-101',name:'1鍙�'},{value: 'cs-102',name:'2鍙�'}],
+ rows: [{value: 'cs-101',name:'101'},{value: 'cs-102',name:'102'}],
ck1: true,
ck2: false,
current: 'cs-101',
@@ -320,11 +325,14 @@
// 瀹瑰櫒绂诲満
containerMoveOut(e) {
let _this = this
+ let devNo = {devNo:[e]}
+ // console.log(JSON.stringify(devNo));
uni.request({
url: `${_this.commonUrl}/agv/basDevp/visualized/container/moveOut`,
- data: {devNo: e},
+ data: JSON.stringify(devNo),
method: 'POST',
success(res) {
+
}
})
},
@@ -333,9 +341,9 @@
this.ck1 = this.ck2
this.ck2 = temp
if (this.ck1) {
- this.rows = [{value: 'cs-101',name:'1鍙�'},{value: 'cs-102',name:'2鍙�'}]
+ this.rows = [{value: 'cs-101',name:'101'},{value: 'cs-102',name:'102'}]
} else {
- this.rows = [{value: 'CS-305',name:'1鍙�'},{value: 'CS-306',name:'2鍙�'},{value: 'CS-307',name:'3鍙�'}]
+ this.rows = [{value: 'CS-305',name:'305'},{value: 'CS-306',name:'306'},{value: 'CS-307',name:'307'},{value: 'CS-308',name:'308'},{value: 'CS-309',name:'309'}]
}
},
radioChange(evt) {
@@ -357,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