From f8f44457bb8a4eb1779bf50c0c1bcfe5b34a7b25 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 24 八月 2023 16:32:12 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 103 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 38 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6a7f3fa..e9ea281 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -187,8 +187,8 @@
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
- 鑷姩浠撳簱WCS鐩戞帶骞冲彴
- <!-- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image> -->
+ <!-- 鑷姩浠撳簱WCS鐩戞帶骞冲彴 -->
+ <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image>
</view>
</y-box>
</view>
@@ -217,10 +217,9 @@
<view class="text-content">
<!-- head -->
<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: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
+ <view>宸ヤ綔鍙�: {{infoText.workNo}}</view>
+ <view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+ <view>鐩爣绔�: {{infoText.staNo}}</view>
<!-- <view style="width: 10%;">鏁伴噺</view> -->
</view>
<!-- body -->
@@ -230,20 +229,32 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
+ display-multiple-items="2"
circular="true" :autoplay="true" :interval="3000" :duration="2000">
- <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 20%;">{{i+1}}\{{swiperList.length}}</view>
- <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 40%;">瀹㈡埛: {{item.manu}}</view>
-
-
- <view style="width: 20%;">鏁伴噺: {{item.count}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 40%;">澶囨敞: {{item.memo}}</view>
-
-
+ <swiper-item class="swiper-item">
+ <view>
+ <view>鏂欏彿锛歿{infoText.matnr}}</view>
+ <view class="swiper-margin">瑙勬牸锛歿{infoText.specs}}</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">
+ <view>
+ <view>璁㈠崟鍙凤細</view>
+ <view class="swiper-margin">{{infoText.orderNo}}</view>
+
+ </view>
+ <view>
+ <view>宸插嚭鎵樼洏鏁帮細{{infoText.doneOfTray}}</view>
+ <view class="swiper-margin">鎬绘墭鐩樻暟锛歿{infoText.totalOfTray}}</view>
+ </view>
+ <view>
+ <view>宸插嚭绠辨暟锛歿{infoText.doneOfTray}}</view>
+ <view class="swiper-margin">鎬荤鏁帮細{{infoText.totalOfTray}}</view>
+ </view>
</swiper-item>
</swiper>
</view>
@@ -282,7 +293,7 @@
<!-- 寮瑰嚭title -->
<view class="eject-title">淇敼 / 閰嶇疆</view>
<!-- input -->
- <view class="eject-input">
+ <scroll-view scroll-y class="eject-input">
<view class="item">
<view class="desc">ip锛�</view>
<view class="input">
@@ -313,7 +324,7 @@
<input type="text" v-model="baseUrl">
</view>
</view>
- </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -388,7 +399,13 @@
specs: "",
count: "",
error: "",
- barcode: ""
+ barcode: "",
+ orderNo: '',
+ batch: '',
+ doneOfTray: '',
+ totalOfTray: '',
+ doneOfUnit: '',
+ totalOfUnit: ''
},
swiperList: [],
timeOut: false,
@@ -422,7 +439,6 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- // this.getDate()
this.getDate2()
this.getInfo()
this.getError()
@@ -430,8 +446,6 @@
// this.getError2()
this.getUrl()
this.controller()
- // 娴嬭瘯鐢�
-
},1000)
},
methods: {
@@ -448,7 +462,7 @@
// 鑾峰彇閿欒淇℃伅
getInfo2() {
let that = this
- var result = ycqdata.dataInfo2
+ var result = ycqdata.dataInfo3
var res = result.data
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
@@ -469,15 +483,21 @@
} else if(res.data[0].ioType === 110) {
that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.barcode = res.data[0].barcode
that.infoText.workNo = res.data[0].workNo
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
+ that.infoText.matnr = res.data[0].matDtos[0].matnr
+ that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
+ that.infoText.specs = res.data[0].matDtos[0].specs
+ that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.doneOfTray = res.data[0].doneOfTray
+ that.infoText.totalOfTray = res.data[0].totalOfTray
+ that.infoText.doneOfUnit = res.data[0].doneOfUnit
+ that.infoText.totalOfUnit = res.data[0].totalOfUnit
+ that.infoText.orderNo = res.data[0].orderNo
+
+
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -538,15 +558,19 @@
} else if(res.data[0].ioType === 110) {
that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.barcode = res.data[0].barcode
that.infoText.workNo = res.data[0].workNo
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
+ that.infoText.matnr = res.data[0].matDtos[0].matnr
+ that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
+ that.infoText.specs = res.data[0].matDtos[0].specs
+ that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.doneOfTray = res.data[0].doneOfTray
+ that.infoText.totalOfTray = res.data[0].totalOfTray
+ that.infoText.doneOfUnit = res.data[0].doneOfUnit
+ that.infoText.totalOfUnit = res.data[0].totalOfUnit
+ that.infoText.orderNo = res.data[0].orderNo
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -1060,12 +1084,15 @@
text-align: center;
}
.eject-input {
-
+ margin-top: 2vh;
+ height: 25vh;
+ /* background-color: #00163E; */
+ ::-webkit-scrollbar{display:none}
}
.item {
display: flex;
align-items: center;
- margin: 2vh 0 0 0;
+ margin: 1vh 0 0 0;
font-size: 1.5vw;
color: #363636;
}
--
Gitblit v1.9.1