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 |  184 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 149 insertions(+), 35 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 3f6886b..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,13 +218,11 @@
 									</y-box>
 								</view>
 								<view style="height: 2%;"></view>
-								<view style="height: 18%;">
-									<y-box>
-										<view class="flex-col"
-											style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
-											鑷姩浠撳簱WCS鐩戞帶骞冲彴
-										</view>
-									</y-box>
+								<view style="height: 18%"  class="flex-row">
+										<image style="height: 100%;"
+											src="" mode="aspectFit"></image>
+										<image style="height: 100%;"
+											src="../../static/zy_logo.png" mode="aspectFit"></image>
 								</view>
 							</view>
 						</view>
@@ -246,24 +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.count}} / {{item.total ? item.total : '--'}}</view>
-
+								<view>鍥惧彿锛歿{item.model ? item.model :''}}</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>
@@ -373,7 +405,9 @@
 				homeViewShow: true,
 				infoViewShow: false,
 				errorInfoViewShow: false,
+				errorBoardShow: false,
 				homeMode: [],
+				carInfo: [],
 				infoMode: [],
 				errorInfoMode: [],
 				baseInfo: {
@@ -412,6 +446,10 @@
 				baseLedId: '',
 				baseCrnId: '',
 				baseUrl: '',
+				apiIp: '10.10.0.189',
+				apiPort: '8080',
+				apiUrl: 'dlzwcs',
+				ledInfosApi: '/console/getLedInfos',
 				info: null,
 				error: null,
 				infoType: 0,
@@ -482,13 +520,15 @@
 			}, 500)
 		},
 		onLoad() {
+			this.getLedInfo()
+			
 			setInterval(() => {
 				this.getDate2()
 				this.getUrl()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
 				this.controller()
 			}, 1000)
 
@@ -500,6 +540,24 @@
 			}, 1800000)
 		},
 		methods: {
+			carInfoModel(res) {
+				let infoList = []
+
+				if (res.code == 200 && res.data != '') {
+					let str = ''
+					for (let k of res.data) {
+						str = `${k.deviceNo}鍙�${k.device}-${k.errorMsg}`
+						infoList.push(str)
+					}
+					this.carInfo = infoList
+					this.errorBoardShow = true
+				} else {
+					this.errorBoardShow = false
+				}
+			},
+			changeErrorShow() {
+				this.errorBoardShow = !this.errorBoardShow
+			},
 			timeOuts() {
 				console.log(this.times);
 			},
@@ -509,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() {
@@ -599,11 +676,25 @@
 					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) {
+						that.infoText.title = '鍏ㄦ澘鍏ュ簱'
+					} else if (res.data[0].ioType === 10) {
+						that.infoText.title = '绌烘澘鍏ュ簱'
+					} else if (res.data[0].ioType === 54) {
+						that.infoText.title = '骞舵澘鍏ュ簱'
+					} else if (res.data[0].ioType === 110) {
+						that.infoText.title = '绌烘澘鍑哄簱'
+					} else if (res.data[0].ioType === 53) {
+						that.infoText.title = '鎷f枡鍐嶅叆搴�'
+					} else if (res.data[0].ioType === 57) {
+						that.infoText.title = '鐩樼偣鍐嶅叆搴�'
 					}
+
 					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
@@ -749,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) {
@@ -926,7 +1018,7 @@
 	.head {
 		width: 100vw;
 		height: 11vh;
-		font-size: 4vw;
+		font-size: 3vw;
 		font-weight: 700;
 		display: flex;
 		align-items: center;
@@ -1100,7 +1192,7 @@
 
 	.info-box {
 		width: 98%;
-		height: 98%;
+		height: 90%;
 	}
 
 	/* 寮傚父淇℃伅 */
@@ -1234,4 +1326,26 @@
 	.textred {
 		color: red;
 	}
+
+	.board {
+		position: absolute;
+		top: 0;
+		right: 0;
+		/* background-color: #aa00ff; */
+		/* height: 13vh; */
+		width: 100%;
+		/* box-shadow: rgba(0,0,0,.35) 0px 5px 15px; */
+	}
+
+	.error-board {
+		margin: .2rem;
+		height: 11vh;
+		background-color: #F56C6C;
+		box-shadow: rgba(0, 0, 0, .35) 0px 5px 15px;
+		border-radius: .2rem;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		font-size: 2rem;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1