From 8314972d343283fa7c15b41dac8e311b8b329086 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 19 八月 2025 17:25:15 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 1096155..3b3ab0e 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -221,11 +221,12 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->	
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="2"
-									circular="true" :autoplay="true" :interval="5000" :duration="2000">
+									display-multiple-items="1"
+									circular="true" :autoplay="true" :interval="10000" :duration="3000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
 											<view style="width: 100%;">{{i+1}} / {{swiperList.length}}</view>
-											<view style="width: 100%;">鍗曞彿: {{item.orderNo}}</view>
+											<view style="width: 50%;">鍗曞彿: {{item.orderNo}}</view>
+											<view style="width: 50%;">搴撳瓨鐘舵��: {{item.cstateid}}</view>
 											<view style="width: 50%;">鍟嗗搧缂栧彿: {{item.matnr}}</view>
 											<view style="width: 50%;">鍟嗗搧鍚嶇О: {{item.maktx}}</view>
 											<view style="width: 50%;">瑙勬牸: {{item.specs}}</view>
@@ -233,10 +234,11 @@
 											<view style="width: 100%;">鍨嬪彿: {{item.model}}</view>
 											<view style="width: 100%;color: red;font-size: 3.1vw;">瀹㈡埛鍚嶇О: {{item.supp}}</view>
 											<view style="width: 100%;color: red;font-size: 3.1vw;">寮�绁ㄥ鎴�: {{item.kpCstmrName}}</view>
-											<view style="width: 25%;">涓绘暟閲�: {{item.count}}</view>
-											<view style="width: 25%;color: red;font-size: 3.1vw;">杈呮暟閲�: {{item.weight}}</view>
-											<view style="width: 25%;">搴撳瓨: {{item.total}}</view>
-											<view style="width: 25%;">杈呭簱瀛�: {{item.totalWeight}}</view>
+											<!-- <view style="width: 25%;">涓绘暟閲�: {{item.count}}</view> -->
+											<view style="width: 25%;color: red;font-size: 3.1vw;">杈呮暟閲�: {{item.allWeight}}</view>
+											<view style="width: 25%;">搴撳瓨: {{item.allStock}}</view>
+											<view style="width: 25%;">鍓╀綑: {{item.lessStock}}</view>
+											<!-- <view style="width: 25%;">杈呭簱瀛�: {{item.totalWeight}}</view> -->
 										</swiper-item>
 									</swiper>
 								</view>
@@ -454,7 +456,7 @@
 					if (res.data[0].ioType === 101) {
 						that.infoText.title = '鍏ㄦ澘鍑哄簱'
 					} else if(res.data[0].ioType === 103) {
-						that.infoText.title = '妫�鏂欏嚭搴�'
+						that.infoText.title = '鎷f枡鍑哄簱'
 					} else if(res.data[0].ioType === 107) {
 						that.infoText.title = '鐩樼偣鍑哄簱'
 					} else if(res.data[0].ioType === 1) {
@@ -537,7 +539,7 @@
 							if (res.data[0].ioType === 101) {
 								that.infoText.title = '鍏ㄦ澘鍑哄簱'
 							} else if(res.data[0].ioType === 103) {
-								that.infoText.title = '妫�鏂欏嚭搴�'
+								that.infoText.title = '鎷f枡鍑哄簱'
 							} else if(res.data[0].ioType === 107) {
 								that.infoText.title = '鐩樼偣鍑哄簱'
 							} else if(res.data[0].ioType === 1) {
@@ -551,7 +553,24 @@
 							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
+							
+							let matDtos = res.data[0].matDtos;
+							
+							let allWeight = 0;
+							let allStock = 0;
+							matDtos.forEach((item) => {
+								allWeight += item.weight;
+								allStock += item.totalWeight;
+							})
+							
+							let lessStock = allStock - allWeight;
+							
+							let matDto = matDtos[0];
+							matDto.allWeight = allWeight;
+							matDto.allStock = allStock;
+							matDto.lessStock = lessStock;
+							that.swiperList = [matDto]
+							
 							// 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

--
Gitblit v1.9.1