From 9f15452849c52c687df8b605b5e425b13af3d5d4 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 13 六月 2025 16:47:04 +0800
Subject: [PATCH] 大屏显示修改
---
Monitor-APP/pages/home/home.vue | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 77095e0..f6e5834 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -106,7 +106,7 @@
<view class="flex-col"
style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
<!-- 杩涘害鏉� -->
- <view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
+ <view class="flex-row" style="width: 100%;position: relative;">
<view class="progressBar" style="width: 80%;height: 2vw;">
<view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
</view>
@@ -248,14 +248,32 @@
<view class="info-box">
<y-box>
<!-- 鏂囨湰瀹瑰櫒 -->
- <view class="text-content" v-for="item in swiperList">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
- <view>鍟嗗搧缂栫爜锛歿{item.matnr}}</view>
- <view>鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view>
-
-
+ <view class="text-content" style="font-size: 3vw;" v-for="item in swiperList">
+ <view style="display: flex;text-align: left;">
+ <view>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
+<!-- <view style="width: 40%;">瀹㈡埛鍚嶇О锛歿{infoText.cstmrName}}</view>
+ <view style="width: 30%;">宸插畬鎴�/鎬绘暟锛歿{infoText.finish}}/{{infoText.count}}</view> -->
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 30%;">浠诲姟鍙凤細{{infoText.workNo}}</view>
+ <view style="width: 38%;">璐х墿锛歿{item.maknx}}</view>
+ <view style="width: 32%;white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">鐢熶骇鏃ユ湡锛歿{item.manuDate}}</view>
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 30%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
+ <view style="width: 38%;">鎵规锛歿{item.batch}}</view>
+ <view style="width: 32%;">鏁伴噺锛歿{item.anfme}}</view>
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 30%;">婧愮珯锛歿{infoText.sourceStaNo}}</view>
+ <view style="width: 38%;">鍑�閲嶏細{{item.weight}}</view>
+ <view style="width: 32%;">姣涢噸锛歿{item.grossWeight}}</view>
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 30%;">鐩爣绔欙細{{infoText.staNo}}</view>
+ <view style="width: 38%;">婧愬簱浣嶏細{{infoText.sourceLocNo}}</view>
+ <view style="width: 32%;">鐩爣搴撲綅锛歿{infoText.locNo}}</view>
+ </view>
<!-- head -->
<!-- <view class="swiper-head">
@@ -418,20 +436,17 @@
text: '',
infoText: {
title: '',
+ sourceStaNo:'',
staNo: "",
- matnr: "",
- maknx: "",
- specs: "",
count: "",
error: "",
barcode: "",
orderNo: '',
- batch: '',
- doneOfTray: '',
- totalOfTray: '',
- doneOfUnit: '',
- totalOfUnit: '',
- ctnNo: '1'
+ cstmrName:'',
+ finish:'',
+ workNo:'',
+ locNo:'',
+ sourceLocNo:''
},
swiperList: [],
timeOut: false,
@@ -463,10 +478,10 @@
this.getDate2()
setTimeout(() => {
- // this.getServerData()
- // this.initlineChart()
- // this.initPieChart()
- // this.getOther()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
setTimeout(() => {
this.getServerData()
this.initlineChart()
@@ -477,9 +492,9 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- }, 3000)
- }, 1000)
- }, 1000)
+ }, 500)
+ }, 500)
+ }, 500)
},
onLoad() {
setInterval(() => {
@@ -497,7 +512,7 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- }, 3600000)
+ }, 1800000)
},
methods: {
timeOuts() {
@@ -596,14 +611,18 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if (res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- } else if (res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- }
+ that.infoText.title = res.data[0].title
that.infoText.staNo = res.data[0].staNo
+ that.infoText.sourceStaNo = res.data[0].sourceStaNo
+ that.infoText.count = res.data[0].count
+ that.infoText.error = res.data[0].error
+ that.infoText.barcode = res.data[0].barcode
+ that.infoText.orderNo = res.data[0].orderNo
+ that.infoText.cstmrName = res.data[0].cstmrName
+ that.infoText.workNo = res.data[0].workNo
+ that.infoText.locNo = res.data[0].locNo
+ that.infoText.sourceLocNo = res.data[0].sourceLocNo
+
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -991,7 +1010,7 @@
}
.progressBar {
- margin-top: 9%;
+ margin-top: 5%;
/* width: 100%; */
height: 20%;
background-color: #233751;
--
Gitblit v1.9.1