From fd082c657a3bdcae4a6ba03c0e18ec2424e9a07c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 九月 2024 13:04:37 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 7 +++++++
Monitor-APP/pages/home/home.css | 10 ++++++----
Monitor-APP/pages/home/home.vue | 38 +++++++++++++++++---------------------
3 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 758aeeb..2830136 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,12 +1,12 @@
.text-content {
width: 100%;
height: 100%;
- font-size: 44rpx;
+ font-size: 12px;
/* background-color: aliceblue; */
}
.swiper-head {
width: 100%;
- height: 10%;
+ height: 6%;
background-color: rgba(54, 94, 226, 0.5);
display: flex;
/* grid-template-columns: 2fr 3fr 2fr 2fr 1fr; */
@@ -15,7 +15,7 @@
}
.swiper-body {
width: 100%;
- height: 90%;
+ height: 94%;
/* background-color: #aa0000; */
}
.swiper-body-main {
@@ -25,11 +25,13 @@
}
.swiper-item {
display: flex;
+ align-items: center;
+ /* display: flex;
flex-wrap: wrap;
align-items: center;
text-align: start;
border-bottom: 2px solid #000;
- background-color: rgba(0, 0, 0, .2);
+ background-color: rgba(0, 0, 0, .2); */
}
.swiper-item:nth-child(2n-1) {
/* background-color: rgba(255, 255, 255, .1); */
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 0cc7db0..1c9a05c 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -215,11 +215,11 @@
<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 style="width: 10%;">鏁伴噺</view> -->
+ <view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
+ <view style="flex: 2;">鍟嗗搧缂栧彿</view>
+ <view style="flex: 2;">鍟嗗搧鍚嶇О</view>
+ <view style="flex: 1;">浣滀笟鏁伴噺</view>
+ <view style="flex: 1;">鍓╀綑鏁伴噺</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -228,20 +228,16 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
+ display-multiple-items="4"
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>
-
-
+ <view style="flex: 2;word-break: break-all;">
+ {{item.orderNo ? item.orderNo : '--'}}
+ </view>
+ <view style="flex: 2;">{{item.matnr}}</view>
+ <view style="flex: 2;">{{item.maknx}}</view>
+ <view style="flex: 1;">{{item.count}}</view>
+ <view style="flex: 1;">{{item.total}}</view>
</swiper-item>
</swiper>
</view>
@@ -422,10 +418,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()
// 娴嬭瘯鐢�
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index d8a5284..f954189 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -12,6 +12,7 @@
"sourceLocNo": "1500502",
"barcode": "80009901",
"matDtos": [{
+ "orderNo": "020101000001",
"matnr": "020101000001",
"maknx": "63-90鍨嬪崟绔嬫煴",
"batch": null,
@@ -22,6 +23,7 @@
"total" : 200
},
{
+ "orderNo": "020101000001",
"matnr": "LPJ.SLJ.XG.037",
"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
"batch": null,
@@ -32,6 +34,7 @@
"total" : 200
},
{
+ "orderNo": "020101000001",
"matnr": "LPJ.SLJ.XG.037",
"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
"batch": null,
@@ -42,6 +45,7 @@
"total" : 200
},
{
+ "orderNo": "020101000001",
"matnr": "LPJ.SLJ.XG.037",
"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
"batch": null,
@@ -52,6 +56,7 @@
"total" : 200
},
{
+ "orderNo": "020101000001",
"matnr": "LPJ.SLJ.XG.037",
"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
"batch": null,
@@ -62,6 +67,7 @@
"total" : 200
},
{
+ "orderNo": "020101000001",
"matnr": "LPJ.SLJ.XG.037",
"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
"batch": null,
@@ -72,6 +78,7 @@
"total" : 200
},
{
+ "orderNo": "020101000001",
"matnr": "LPJ.SLJ.XG.037",
"maknx": "宸ョ▼濉戞枡涓嬪集澶�",
"batch": null,
--
Gitblit v1.9.1