From e78f3af460ebc1dfad2c8a7eda170a30500833cb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 09:05:36 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 74 +++++++++++++++++-------------------
1 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index bc3131f..2384fb6 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -2,32 +2,34 @@
<view class="container">
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
- <view class="head">
+ <!-- <view class="head">
<text>鑷姩浠撳簱鐩戞帶骞冲彴</text>
- </view>
+ </view> -->
<!-- 鏃ュ巻 -->
- <view class="time-tools">{{calendar}}</view>
+ <!-- <view class="time-tools">{{calendar}}</view>
<view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ejected()"></view>
-
- <view class="main">
+ <view class="button-right" @click="ejected()"></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%;">
+ <view class="flex-col" style="width: 100%;font-size: 5rpx;">
<view class="flex-row">
- <view style="flex: 1;">{{item.devNo}}</view>
+ <view style="flex: 1;" @click="ejected()">{{item.devNo}}</view>
<view style="flex: 1;">{{item.locSts$}}</view>
- <!-- <view style="flex: 1;" v-if="item.agvWrkMast">{{item.agvWrkMast.wrkNo}}</view> -->
- <view style="flex: 1;"></view>
</view>
<view class="flex-row">
<view style="flex: 1;" v-if="item.agvWrkMast">宸ヤ綔鍙凤細{{item.agvWrkMast.wrkNo}}</view>
<view style="flex: 1;" v-if="item.agvWrkMast" >{{item.agvWrkMast.wrkSts$}}</view>
- <view style="flex: 1;" v-if="item.agvWrkMast">{{item.agvWrkMast.ioType$}}</view>
- <view style="flex: 1;" v-if="!item.agvWrkMast"></view>
</view>
<view class="flex-row">
<view style="flex: 1;" v-if="item.agvWaitPakin">鏂欑鐮�: {{item.agvWaitPakin.suppCode}}</view>
<view style="flex: 1;" v-if="item.agvWrkDetl">鏂欑鐮侊細{{item.agvWrkDetl.suppCode}}</view>
+ <view style="flex: 1;" v-if="!item.agvWaitPakin && !item.agvWrkDetl"></view>
+
+ <view style="flex: 1;" v-if="item.agvWrkMast">{{item.agvWrkMast.ioType$}}</view>
+ <view style="flex: 1;" v-if="!item.agvWrkMast"></view>
+ </view>
+ <view class="flex-row">
<view style="flex: 1;" ></view>
<view style="flex: 1;" ></view>
</view>
@@ -35,16 +37,14 @@
<view class="flex-col" style="width: 100%;" v-if="item.agvWaitPakin">
<view class="flex-row" style="background-color: #007aff;">
- <view style="flex: 2;">璁㈠崟鍙�</view>
- <view style="flex: 2;">鐗╂枡鍙�</view>
- <view style="flex: 1;">鎵瑰彿</view>
+ <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: 2;">{{k.orderNo}}</view>
- <view style="flex: 2;">{{item.agvWaitPakin.matnr}}</view>
- <view style="flex: 1;">{{item.agvWaitPakin.batch ? item.agvWaitPakin.batch : '--'}}</view>
+ <view style="flex: 3;">{{k.orderNo}}</view>
+ <view style="flex: 3;">{{item.agvWaitPakin.matnr}}</view>
<view style="flex: 1;">{{k.anfme}}</view>
<view style="flex: 1;">{{item.agvWaitPakin.anfme + item.agvWaitPakin.volume}}</view>
</view>
@@ -52,29 +52,25 @@
<view class="flex-col" style="width: 100%;" v-if="item.agvWrkDetl">
<view class="flex-row" style="background-color: #007aff;">
- <view style="flex: 2;">璁㈠崟鍙�</view>
- <view style="flex: 2;">鐗╂枡鍙�</view>
- <view style="flex: 1;">鎵瑰彿</view>
+ <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 style="flex: 2;">{{k.orderNo}}</view>
- <view style="flex: 2;">{{item.agvWrkDetl.matnr}}</view>
- <view style="flex: 1;">{{item.agvWrkDetl.batch ? item.agvWrkDetl.batch : '--'}}</view>
+ <view style="flex: 3;">{{k.orderNo}}</view>
+ <view style="flex: 3;">{{item.agvWrkDetl.matnr}}</view>
<view style="flex: 1;">{{k.anfme}}</view>
<view style="flex: 1;">{{item.agvWrkDetl.anfme + item.agvWrkDetl.volume}}</view>
</view>
</view>
- <view style="position: absolute;bottom: 0;left: 0;width: 100%;display: flex;justify-content: center;" v-if="item.agvWrkMast && item.agvWrkMast.ioType == 103 && item.agvWrkDetl">
- <!-- <button type="primary" size="mini">鎷ｆ枡鍥炲簱</button> -->
- <view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 30rpx;
+ <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="position: absolute;bottom: 0;left: 0;width: 100%;display: flex;justify-content: center;" v-if="item.agvWrkMast && item.agvWrkMast.ioType == 101 && item.agvWrkDetl">
- <!-- <button type="primary" size="mini">瀹瑰櫒绂诲満</button> -->
- <view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 30rpx;
+ <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">
+ <view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 10rpx;
border-radius: 8rpx;" @click="containerMoveOut(item.devNo)">瀹瑰櫒绂诲満</view>
</view>
@@ -485,12 +481,12 @@
}
.main-b {
- font-size: 22rpx;
+ font-size: 10rpx;
background-color: rgba(255, 255, 255, .05);
/* background-color: rgba(0, 189, 47, 0.3); */
- width:19vw;
- height: 28vh;
- margin-top: 4px;
+ width:19.8vw;
+ height: 33vh;
+ /* margin-top: 4px; */
backdrop-filter: blur(3px);
display: flex;
flex-direction: column;
@@ -537,7 +533,7 @@
.home-view {
width: 100vw;
min-height: 100vh;
- background-image: url(../../static/background.png);
+ /* background-image: url(../../static/background.png); */
background-size: 100vw 100vh;
}
.home-right {
@@ -649,11 +645,11 @@
/* 鍏辩敤 */
.main {
- height: 88vh;
- margin: 16rpx;
+ height: 100vh;
display: flex;
flex-wrap: wrap;
justify-content: space-around;
+ position: relative;
}
.mian-item {
width: 50%;
--
Gitblit v1.9.1