From 7e468598a9e8d86c6789c48b898b7eab9346640e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 22 八月 2023 11:20:11 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 26 +++++++++++++
Monitor-APP/pages/home/home.css | 7 +++
Monitor-APP/pages/home/home.vue | 78 ++++++++++++++++++++++++--------------
3 files changed, 81 insertions(+), 30 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index e34c0e7..dd7d447 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -11,6 +11,7 @@
display: flex;
/* grid-template-columns: 2fr 3fr 2fr 2fr 1fr; */
align-items: center;
+ justify-content: space-around;
}
.swiper-body {
@@ -25,12 +26,16 @@
}
.swiper-item {
display: flex;
- flex-wrap: wrap;
align-items: center;
text-align: start;
+ justify-content: space-around;
border-bottom: 2px solid #000;
background-color: rgba(0, 0, 0, .2);
}
+
.swiper-item:nth-child(2n-1) {
/* background-color: rgba(255, 255, 255, .1); */
}
+.swiper-margin {
+ margin-top: 50px;
+}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 2ef9df5..478087a 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -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,30 @@
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: 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>
-
-
+ <swiper-item class="swiper-item">
+ <view>
+ <view>鏂欏彿锛歿{infoText.matnr}}</view>
+ <view class="swiper-margin">鍚嶇О锛歿{infoText.maknx}}</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>
+ 璁㈠崟鍙凤細{{infoText.orderNo}}
+ </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>
@@ -388,7 +397,13 @@
specs: "",
count: "",
error: "",
- barcode: ""
+ barcode: "",
+ orderNo: '',
+ batch: '',
+ doneOfTray: '',
+ totalOfTray: '',
+ doneOfUnit: '',
+ totalOfUnit: ''
},
swiperList: [],
timeOut: false,
@@ -424,10 +439,10 @@
this.getOther()
// this.getDate()
this.getDate2()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
@@ -448,7 +463,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 +484,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.maknx = res.data[0].matDtos[0].maknx
+ 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,7 +559,6 @@
} 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
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6a4f283..a5c2d9c 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,4 +1,30 @@
{
+ "dataInfo3": {"data":{"msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data":[{
+ "title": "鍏ㄦ澘鍑哄簱",
+ "workNo": 8282,
+ "orderNo": "202207280921",
+ "ioType": 101,
+ "staNo": 177,
+ "sourceStaNo": null,
+ "locNo": null,
+ "sourceLocNo": "1208602",
+ "matDtos": [{
+ "matnr": "1101488-10000",
+ "maknx": "A4F-DQ",
+ "batch": null,
+ "count": 16.0,
+ "total": 32.0
+ }],
+
+
+ "emptyMk": false,
+ "doneOfTray": 22,
+ "totalOfTray": 23,
+ "doneOfUnit": 352.0,
+ "totalOfUnit": 560.0
+ }]}},
"dataInfo2": {
"data": {
"msg": "鎿嶄綔鎴愬姛",
--
Gitblit v1.9.1