From affe7eef31c5912eb9428e3569d0b561deaf1c54 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 28 八月 2025 08:33:08 +0800
Subject: [PATCH] 1

---
 Monitor-APP/pages/home/home.vue |  203 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 130 insertions(+), 73 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index bb29374..ecf81f5 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,14 +217,16 @@
 
 									</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: 2%;" ></view>
+								<view style="height: 18%"  class="flex-row">
+									<view>
+										<image style="height: 95%;"
+											src="../../static/barcode.png" mode="aspectFit"></image>
+									</view>
+									<view>
+										<image style="height: 95%;"
+											src="../../static/zy_logo.png" mode="aspectFit"></image>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -359,13 +361,21 @@
 			</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 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 class="board2">
+			<uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="staModeShow">
+				<view class="error-board2">
+					<text >{{staMode}}</text>
+				</view>
+			</uni-transition>
+		</view>
 		<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
 			杩炴帴瓒呮椂: {{times}} s
 		</view>
@@ -383,6 +393,7 @@
 				infoViewShow: false,
 				errorInfoViewShow: false,
 				errorBoardShow: false,
+				staModeShow: false,
 				homeMode: [],
 				carInfo: [],
 				infoMode: [],
@@ -448,7 +459,8 @@
 				timeOut: false,
 				times: 0,
 				currDate: '',
-				textred: 'textred'
+				textred: 'textred',
+				staMode: ''
 			}
 		},
 		onShow() {
@@ -498,9 +510,11 @@
 				this.getUrl()
 				this.getInfo()
 				this.getError()
+				this.getStaMode()
 				// this.getInfo2()
 				// this.getError2()
 				this.controller()
+				this.getCarInfo()
 			}, 1000)
 
 			setInterval(() => {
@@ -512,40 +526,40 @@
 		},
 		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)
-								}
-							})
-						},
+				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 = []
-			
-							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
-							}
-						},
+				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
-						},
+				this.errorBoardShow = !this.errorBoardShow
+			},
 			timeOuts() {
 				console.log(this.times);
 			},
@@ -634,6 +648,26 @@
 				})
 
 			},
+			getStaMode() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/sta/mode",
+					data: {
+						ledId: that.baseLedId
+					},
+					method: "GET",
+					success(result) {
+						var res = result.data
+						if (res.data && res.data !== "") {
+							that.staMode = res.data
+							that.staModeShow =true
+						}else{
+							that.staModeShow =false
+						}
+					}
+				})
+			
+			},
 			infoModel(res) {
 				let that = this
 				if (res.data && res.data !== "") {
@@ -648,20 +682,20 @@
 						that.infoText.title = '鎷f枡鍑哄簱'
 					} else if (res.data[0].ioType === 107) {
 						that.infoText.title = '鐩樼偣鍑哄簱'
-					}else if (res.data[0].ioType === 1) {
+					} else if (res.data[0].ioType === 1) {
 						that.infoText.title = '鍏ㄦ澘鍏ュ簱'
-					}else if (res.data[0].ioType === 10) {
+					} else if (res.data[0].ioType === 10) {
 						that.infoText.title = '绌烘澘鍏ュ簱'
-					}else if (res.data[0].ioType === 54) {
+					} else if (res.data[0].ioType === 54) {
 						that.infoText.title = '骞舵澘鍏ュ簱'
-					}else if (res.data[0].ioType === 110) {
+					} else if (res.data[0].ioType === 110) {
 						that.infoText.title = '绌烘澘鍑哄簱'
-					}else if (res.data[0].ioType === 53) {
+					} else if (res.data[0].ioType === 53) {
 						that.infoText.title = '鎷f枡鍐嶅叆搴�'
-					}else if (res.data[0].ioType === 57) {
+					} else if (res.data[0].ioType === 57) {
 						that.infoText.title = '鐩樼偣鍐嶅叆搴�'
 					}
-				
+
 					that.infoText.staNo = res.data[0].staNo
 					that.swiperList = res.data[0].matDtos
 					// that.infoText.matnr = res.data[0].matDtos[0].matnr
@@ -1293,25 +1327,48 @@
 	.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; */
-		}
+		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;
+	}
 	
-		.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;
-		}
+	.board2 {
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		/* background-color: #aa00ff; */
+		/* height: 13vh; */
+		width: 100%;
+		/* box-shadow: rgba(0,0,0,.35) 0px 5px 15px; */
+	}
+	
+	.error-board2 {
+		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