From 236bcb2b593235e2c530f21a1cfadff98c0218a0 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期三, 25 一月 2023 23:57:16 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 93644c2..2277f5f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,7 +217,7 @@
 								<view class="flex-col info-box-text-item">鐩爣绔欙細{{infoText.staNo}}</view>
 								<view class="flex-col info-box-text-item">鍟嗗搧缂栧彿锛歿{infoText.matnr}}</view>
 								<view class="flex-col info-box-text-item">鍟嗗搧鍚嶇О锛歿{infoText.maknx}}</view>
-								<view class="flex-col info-box-text-item">鍟嗗搧瑙勬牸锛歿{infoText.specs}}</view>
+								<view class="flex-col info-box-text-item">瑙勬牸锛歿{infoText.specs}}</view>
 								<view class="flex-col info-box-text-item">鏁伴噺锛歿{infoText.count}}</view>
 							</view>
 						</y-box>
@@ -350,13 +350,13 @@
 				infoType: 0,
 				text: '',
 				infoText: {
-					title: '鍏ㄦ澘鍑哄簱',
-					staNo: "200",
-					matnr: "300",
-					maknx: "400",
-					specs: "500",
-					count: "600",
-					error: "鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涖��"
+					title: '',
+					staNo: "",
+					matnr: "",
+					maknx: "",
+					specs: "",
+					count: "",
+					error: ""
 				},
 				
 				
@@ -477,6 +477,7 @@
 								that.infoText.title = '妫�鏂欏嚭搴�'
 							}
 							that.infoText.staNo = res.data[0].staNo
+							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
 							that.infoText.count = res.data[0].matDtos[0].count
@@ -494,9 +495,11 @@
 				let that = this
 				uni.request({
 					url: that.commonUrl + "/monitor/led/error",
+					data: {ledId:that.baseLedId},
 					method:"GET",
 					success(result) {
 						var	res = result.data
+						console.log(res);
 						if (res.data && res.data !== "") {
 							var errorInfo = res.data
 							if (that.infoType == 1) {

--
Gitblit v1.9.1