From 9bc437ba57bc912280de179cd3d289d29d864642 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 13:38:54 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 66 ++------------------------------
Monitor-APP/pages/home/home.css | 6 +-
Monitor-APP/pages/home/home.vue | 45 ++++++++++------------
3 files changed, 29 insertions(+), 88 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 758aeeb..0d2d14f 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,7 +1,7 @@
.text-content {
width: 100%;
height: 100%;
- font-size: 44rpx;
+ font-size: 56rpx;
/* background-color: aliceblue; */
}
.swiper-head {
@@ -26,8 +26,8 @@
.swiper-item {
display: flex;
flex-wrap: wrap;
- align-items: center;
- text-align: start;
+ /* align-items: center; */
+ /* text-align: start; */
border-bottom: 2px solid #000;
background-color: rgba(0, 0, 0, .2);
}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 0cc7db0..d583544 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -228,20 +228,16 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ display-multiple-items="1"
+ circular="true" :autoplay="false" :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>
-
-
+ <view style="width: 100%;display: flex;flex-direction: column;
+ align-items: center;justify-content: space-around;">
+ <view style="width: 60%;">搴撲綅鍙�: {{item.locNo}}</view>
+ <view style="width: 60%;" v-show="pakoutShow">浜у搧浠ｅ彿: {{item.matnr}}</view>
+ <view style="width: 60%;" v-show="pakoutShow">浜у搧鍚嶇О: {{item.maknx}}</view>
+ <view style="width: 60%;" v-show="pakoutShow">鏁伴噺: [{{item.anfme}} / {{item.memo}}]</view>
+ </view>
</swiper-item>
</swiper>
</view>
@@ -319,7 +315,7 @@
</view>
</view>
</view>
- <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOuts">
杩炴帴瓒呮椂: {{times}} s
</view>
</view>
@@ -389,9 +385,10 @@
barcode: ""
},
swiperList: [],
- timeOut: false,
+ timeOuts: false,
times: 0,
- currDate: ''
+ currDate: '',
+ pakoutShow: false
}
},
onShow() {
@@ -422,10 +419,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()
// 娴嬭瘯鐢�
@@ -456,12 +453,16 @@
that.infoType = 1
if (res.data[0].ioType === 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 1) {
that.infoText.title = '鍏ュ簱'
+ that.pakoutShow = false
} else if(res.data[0].ioType === 10) {
that.infoText.title = '绌烘墭鍏ュ簱'
} else if(res.data[0].ioType === 110) {
@@ -472,10 +473,6 @@
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
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index d8a5284..1cd6fc0 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -13,73 +13,17 @@
"barcode": "80009901",
"matDtos": [{
"matnr": "020101000001",
+ "locNo": "0100101",
"maknx": "63-90鍨嬪崟绔嬫煴",
"batch": null,
"count": 40.0,
"specs": "gcslxwt",
"info": "娴欐睙涓壃",
"bz": "绾㈣壊",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "鏆傚瓨",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "绾㈣壊",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "17鍙锋",
- "total" : 200
+ "total" : 200,
+ "anfme": 20,
+ "memo":30,
+ "ioType": 1
}
],
"emptyMk": false,
--
Gitblit v1.9.1