From 245bf725a653aaabaad844f44dfa1bfd385a97e3 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 01 四月 2025 11:37:08 +0800
Subject: [PATCH] 1

---
 Monitor-APP/pages/home/home.vue |   91 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 754645f..bb29374 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -253,7 +253,7 @@
 								<view>鍟嗗搧缂栫爜锛歿{item.matnr}}</view>
 								<view>鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
 								<view>瑙勬牸锛歿{item.specs}}</view>
-								<view>鍥惧彿锛歿{item.model}}</view>
+								<view>鍥惧彿锛歿{item.model ? item.model :''}}</view>
 								<view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view>
 
 
@@ -358,6 +358,14 @@
 				</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>
@@ -374,7 +382,9 @@
 				homeViewShow: true,
 				infoViewShow: false,
 				errorInfoViewShow: false,
+				errorBoardShow: false,
 				homeMode: [],
+				carInfo: [],
 				infoMode: [],
 				errorInfoMode: [],
 				baseInfo: {
@@ -486,10 +496,10 @@
 			setInterval(() => {
 				this.getDate2()
 				this.getUrl()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
 				this.controller()
 			}, 1000)
 
@@ -501,6 +511,41 @@
 			}, 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 = []
+			
+							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);
 			},
@@ -600,10 +645,23 @@
 					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.swiperList = res.data[0].matDtos
 					// that.infoText.matnr = res.data[0].matDtos[0].matnr
@@ -1235,4 +1293,25 @@
 	.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