From 91e5bb3b8aef30ba85f809edbf903d9a596bc009 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 08 十二月 2023 08:15:09 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 130 +++++++++++++++++++++++++++++++++++++++++++
Monitor-APP/pages/home/home.css | 4
Monitor-APP/pages/home/home.vue | 14 +++-
3 files changed, 140 insertions(+), 8 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index b8ec8aa..1b997b9 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -6,7 +6,7 @@
}
.swiper-head {
width: 100%;
- height: 5%;
+ 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: 95%;
+ height: 94%;
/* background-color: #aa0000; */
}
.swiper-body-main {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9bbf081..4ad7fb8 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -214,11 +214,15 @@
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
+ <!-- <view class="swiper-head">
+ <view style="flex: 1;">浣滀笟鏁伴噺锛歿{infoText.barcode}}</view>
+ <view style="flex: 1;">鍓╀綑鏁伴噺</view>
+ </view> -->
<view class="swiper-head">
- <view style="flex: 1;">绔欏彿锛歿{infoText.staNo}}</view>
+ <view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
<view style="flex: 2;">鍟嗗搧缂栧彿</view>
<view style="flex: 2;">绠辩爜</view>
- <view style="flex: 4;">鍟嗗搧鍚嶇О</view>
+ <view style="flex: 2;">鍟嗗搧鍚嶇О</view>
<view style="flex: 5;">瑙勬牸</view>
<view style="flex: 1;">浣滀笟鏁伴噺</view>
<view style="flex: 1;">鍓╀綑鏁伴噺</view>
@@ -233,10 +237,10 @@
display-multiple-items="15"
circular="true" :autoplay="true" :interval="3000" :duration="1000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i" :style="item.color">
- <view style="flex: 1;">No:{{i+1}}</view>
+ <view style="flex: 2;word-break: break-all;">{{item.orderNo ? item.orderNo : '--'}}</view>
<view style="flex: 2;">{{item.matNo}}</view>
<view style="flex: 2;">{{item.containerCode}}</view>
- <view style="flex: 4;">{{item.maknx}}</view>
+ <view style="flex: 2;">{{item.maknx}}</view>
<view style="flex: 5;">{{item.specs}}</view>
<view style="flex: 1;">{{item.count}}</view>
<view style="flex: 1;">{{item.total}}</view>
@@ -565,8 +569,8 @@
res.data[0].matDtos[k]['color'] = 'color: #df741c'
}
}
- console.log(that.swiperList);
that.infoText.staNo = res.data[0].staNo
+ that.infoText.barcode = res.data[0].barcode
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 97952c5..9555da8 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -15,9 +15,137 @@
"batch":null,"count":40.0,
"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
"total": 1055,
- "containerCode": 1000000268
+ "containerCode": 1000000268,
+ "orderNo": "23129502652,23129502651,23129502652,23129502652"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
+ },
+ {
+ "matNo":"230309103100005",
+ "maknx":"瀹氬瓙绾垮湀",
+ "batch":null,"count":40.0,
+ "specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+ "total": 1055,
+ "containerCode": 1000000268,
+ "orderNo": "1699507854268"
}
+
],
"emptyMk":false,
"ioType":101
--
Gitblit v1.9.1