From ab3fe873abd359007fa16b284a5a465c23da8b68 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 九月 2025 15:06:24 +0800
Subject: [PATCH] 德力众led大屏更新

---
 Monitor-APP/pages/home/home.vue |  139 ++++++++++++++++++++++++++++-----------------
 1 files changed, 86 insertions(+), 53 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e84974a..a6a38bf 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -3,7 +3,7 @@
 		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
 				<view class="head">
-					<text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+					<text>寰峰埄浼楄嚜鍔ㄤ粨搴揥CS鐩戞帶骞冲彴</text>
 				</view>
 				<!-- 鏃ュ巻 -->
 				<view class="time-tools">{{calendar}}</view>
@@ -218,12 +218,11 @@
 									</y-box>
 								</view>
 								<view style="height: 2%;"></view>
-								<view style="height: 18%">
+								<view style="height: 18%"  class="flex-row">
 										<image style="height: 100%;"
-											src="../../static/barcode.png" mode="aspectFit"></image>
-										<image style="float:right; 100%;margin-top: -5vh;margin-right:5vh;"
+											src="" mode="aspectFit"></image>
+										<image style="height: 100%;"
 											src="../../static/zy_logo.png" mode="aspectFit"></image>
-
 								</view>
 							</view>
 						</view>
@@ -245,25 +244,54 @@
 				<!-- 涓讳綋 -->
 				<view class="info-main">
 					<view class="info-box">
+						<view class="swiper-head" style="height: 10%;width: 96%;margin-left: 2%;font-size: 2.5vb;">
+							<view style="width: 15%;">璁㈠崟鍙�</view>
+							<view style="width: 10%;">鍗曡ID</view>
+							<view style="width: 15%;">鍟嗗搧缂栧彿</view>
+							<view style="width: 15%;">鍟嗗搧鍚嶇О</view>
+							<view style="width: 10%;">鎵樼洏鐮�</view>
+							<view style="width: 15%;">鐗规畩璇存槑</view>
+							<view style="width: 10%;">浣滀笟鏁伴噺</view>
+							<view style="width: 10%;">鍓╀綑鏁伴噺</view>
+						</view>
 						<y-box>
 							<!-- 鏂囨湰瀹瑰櫒 -->
-							<view class="text-content" v-for="item in swiperList">
-								<view>鐩爣绔欙細{{infoText.staNo}}</view>
+							<!-- <view class="text-content" v-for="item in swiperList" style="font-size: 3vw;"> -->
+<!-- 								<view>鐩爣绔欙細{{infoText.staNo}}</view>
 								<view>鍟嗗搧缂栫爜锛歿{item.matnr}}</view>
 								<view>鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
 								<view>瑙勬牸锛歿{item.specs}}</view>
 								<view>鍥惧彿锛歿{item.model ? item.model :''}}</view>
-								<view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view>
-
+								<view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view> -->
+			<!-- 				<view style="display: flex;text-align: left;">
+								<view style="width: 50%;">璁㈠崟鍙凤細{{item.orderNo}}</view>
+								<view style="width: 50%;">鍗曡ID锛歿{item.memo}}</view>
+							</view>
+							<view style="display: flex;text-align: left;">
+									<view style="width: 50%;">鍟嗗搧缂栧彿锛歿{item.matnr}}</view>
+									<view style="width: 50%;">鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
+							</view>
+							<view style="display: flex;text-align: left;">
+									<view style="width: 50%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
+									<view style="width: 50%;">鐗规畩璇存槑锛歿{item.batch}}</view>
+							</view>
+							<view style="display: flex;text-align: left;">
+									<view style="width: 50%;">浣滀笟鏁伴噺锛歿{item.count}}</view>
+									<view style="width: 50%;">鍓╀綑鏁伴噺锛歿{item.total}}</view>
+							</view> -->
+							
 
 
 								<!-- head -->
-								<!-- <view class="swiper-head">
-									<view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
-									<view style="width: 30%;">鍟嗗搧缂栧彿</view>
-									<view style="width: 20%;">鍟嗗搧鍚嶇О</view>
-									<view style="width: 20%;">瑙勬牸</view>
-									<view style="width: 10%;">鏁伴噺</view>
+<!-- 								<view class="swiper-head" style="height: 15%;">
+									<view style="width: 15%;">璁㈠崟鍙�</view>
+									<view style="width: 10%;">鍗曡ID</view>
+									<view style="width: 15%;">鍟嗗搧缂栧彿</view>
+									<view style="width: 15%;">鍟嗗搧鍚嶇О</view>
+									<view style="width: 10%;">鎵樼洏鐮�</view>
+									<view style="width: 15%;">鐗规畩璇存槑</view>
+									<view style="width: 10%;">浣滀笟鏁伴噺</view>
+									<view style="width: 10%;">鍓╀綑鏁伴噺</view>
 								</view> -->
 								<!-- body -->
 								<!-- <view class="swiper-body"> -->
@@ -271,19 +299,23 @@
 									circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
-								<!-- <swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="8"
-									circular="true" :autoplay="true" :interval="3000" :duration="1000">
-										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">No:{{i+1}}</view>
-											<view style="width: 30%;">{{item.matNo}}</view>
-											<view style="width: 20%;">{{item.maknx}}</view>
-											<view style="width: 20%;">{{item.specs}}</view>
+								<swiper class="swiper-body-main" vertical="true" 
+									display-multiple-items="3"
+									circular="true" :autoplay="true" :interval="3000" :duration="1000" style="font-size: 2vb;">
+										<swiper-item  class="swiper-item" v-for="(item,i) in swiperList" :key="i">
+											<!-- <view>No:{{i+1}}</view> -->
+											<view style="width: 15%;">{{item.orderNo}}</view>
+											<view style="width: 10%;"> {{item.memo}}</view>
+											<view style="width: 15%;">{{item.matnr}}</view>
+											<view style="width: 15%;">{{item.maknx}}</view>
+											<view style="width: 10%;">{{infoText.barcode}}</view>
+											<view style="width: 15%;">{{item.batch}}</view>
 											<view style="width: 10%;">{{item.count}}</view>
+											<view style="width: 10%;">{{item.total}}</view>
 										</swiper-item>
 									</swiper>
-								</view> -->
-							</view>
+								<!-- </view> -->
+							<!-- </view> -->
 						</y-box>
 					</view>
 				</view>
@@ -357,14 +389,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 灏忚溅寮傚父 -->
-		<view class="board">
-			<uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
-				<view class="error-board">
-					<text v-for="item in carInfo">{{item}}</text>
-				</view>
-			</uni-transition>
-		</view>
 		<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
 			杩炴帴瓒呮椂: {{times}} s
 		</view>
@@ -422,6 +446,10 @@
 				baseLedId: '',
 				baseCrnId: '',
 				baseUrl: '',
+				apiIp: '10.10.0.189',
+				apiPort: '8080',
+				apiUrl: 'dlzwcs',
+				ledInfosApi: '/console/getLedInfos',
 				info: null,
 				error: null,
 				infoType: 0,
@@ -492,6 +520,8 @@
 			}, 500)
 		},
 		onLoad() {
+			this.getLedInfo()
+			
 			setInterval(() => {
 				this.getDate2()
 				this.getUrl()
@@ -500,7 +530,6 @@
 				// this.getInfo2()
 				// this.getError2()
 				this.controller()
-				this.getCarInfo()
 			}, 1000)
 
 			setInterval(() => {
@@ -511,23 +540,6 @@
 			}, 1800000)
 		},
 		methods: {
-			getCarInfoTest() {
-				let that = this
-				var result = ycqdata.carError
-				var res = result.data
-				that.carInfoModel(res)
-			},
-			getCarInfo() {
-				let that = this
-				uni.request({
-					url: that.commonUrl + "/monitor/device/error",
-					method: "GET",
-					success(result) {
-						var res = result.data
-						that.carInfoModel(res)
-					}
-				})
-			},
 			carInfoModel(res) {
 				let infoList = []
 
@@ -555,6 +567,25 @@
 			getServerData() {
 				this.chartsDataLine1 = JSON.parse(JSON.stringify(this.chartsData.Line))
 				this.chartsDataPie2 = JSON.parse(JSON.stringify(this.chartsData.Pie))
+			},
+			getLedInfo() {
+				let that = this
+				uni.request({
+					url: this.baseHttp +  that.apiIp + ":" + that.apiPort + "/" + that.apiUrl + "/" + that.ledInfosApi,
+					method: "GET",
+					data: {},
+					success(result) {
+						var res = result.data
+						let data = res.data;
+						
+						uni.setStorageSync('BaseIp', that.apiIp);
+						uni.setStorageSync('BaseLedId', data.staArr);
+						uni.setStorageSync('BasePort', that.apiPort);
+						uni.setStorageSync('BaseCrnId', data.crnId);
+						uni.setStorageSync('UPROJ', that.apiUrl);
+						this.getUrl()
+					}
+				})
 			},
 			// 鑾峰彇閿欒淇℃伅
 			getInfo2() {
@@ -663,6 +694,7 @@
 					}
 
 					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
@@ -808,6 +840,7 @@
 						var res = result.data.data
 						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res
 							.minute + ":" + res.second + " " + res.week
+						
 						that.currDate = res.year + "/" + res.month + "/" + res.day
 					},
 					fail(res) {
@@ -985,7 +1018,7 @@
 	.head {
 		width: 100vw;
 		height: 11vh;
-		font-size: 4vw;
+		font-size: 3vw;
 		font-weight: 700;
 		display: flex;
 		align-items: center;
@@ -1159,7 +1192,7 @@
 
 	.info-box {
 		width: 98%;
-		height: 98%;
+		height: 90%;
 	}
 
 	/* 寮傚父淇℃伅 */

--
Gitblit v1.9.1