From 3ad8a0417cf6e905dd1edd05e6b85e7cde3360c2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 21 十月 2023 10:52:07 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index b428b98..3ffcfcd 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -15,8 +15,9 @@
 						<view class="y-it"><view class="y-it-desc">宸ヤ綔绔欑紪鍙�:</view><view class="margin">{{item.devNo}}</view></view>
 						<view class="y-it"><view class="y-it-desc">宸ヤ綔绔欑紪鍙�:</view><view class="margin">{{item.locSts$}}</view></view>
 						
+						<view class="y-it" v-if="item.agvWaitPakin"><view class="y-it-desc">璁㈠崟鍙�:</view><view class="margin">{{item.agvWaitPakin.orderNo}}</view></view>
 						<view class="y-it" v-if="item.agvWaitPakin"><view class="y-it-desc">鐗╂枡鍙�:</view><view class="margin">{{item.agvWaitPakin.matnr}}</view></view>
-						<view class="y-it" v-if="item.agvWaitPakin"><view class="y-it-desc">搴忓垪鐮�:</view><view class="margin">{{item.agvWaitPakin.batch}}</view></view>
+						<view class="y-it" v-if="item.agvWaitPakin"><view class="y-it-desc">鎵瑰彿:</view><view class="margin">{{item.agvWaitPakin.batch}}</view></view>
 						<view class="y-it" v-if="item.agvWaitPakin"><view class="y-it-desc">鏂欑鐮�:</view><view class="margin">{{item.agvWaitPakin.suppCode}}</view></view>
 						<view class="y-it" v-if="item.agvWaitPakin"><view class="y-it-desc">鏁伴噺:</view><view class="margin">{{item.agvWaitPakin.anfme}}</view></view>
 						
@@ -24,8 +25,9 @@
 						<view class="y-it" v-if="item.agvWrkMast"><view class="y-it-desc">宸ヤ綔鐘舵��:</view><view class="margin">{{item.agvWrkMast.wrkSts$}}</view></view>
 						<view class="y-it" v-if="item.agvWrkMast"><view class="y-it-desc">宸ヤ綔绫诲瀷:</view><view class="margin">{{item.agvWrkMast.ioType$}}</view></view>
 						
+						<view class="y-it" v-if="item.agvWrkDetl"><view class="y-it-desc">璁㈠崟鍙�:</view><view class="margin">{{item.agvWrkDetl.orderNo}}</view></view>
 						<view class="y-it" v-if="item.agvWrkDetl"><view class="y-it-desc">鐗╂枡鍙�:</view><view class="margin">{{item.agvWrkDetl.matnr}}</view></view>
-						<view class="y-it" v-if="item.agvWrkDetl"><view class="y-it-desc">搴忓垪鐮�:</view><view class="margin">{{item.agvWrkDetl.batch}}</view></view>
+						<view class="y-it" v-if="item.agvWrkDetl"><view class="y-it-desc">鎵瑰彿:</view><view class="margin">{{item.agvWrkDetl.batch}}</view></view>
 						<view class="y-it" v-if="item.agvWrkDetl"><view class="y-it-desc">鏂欑鐮�:</view><view class="margin">{{item.agvWrkDetl.suppCode}}</view></view>
 						<view class="y-it" v-if="item.agvWrkDetl"><view class="y-it-desc">鏁伴噺:</view><view class="margin">{{item.agvWrkDetl.anfme}}</view></view>
 						
@@ -198,11 +200,13 @@
 			const BasePort = uni.getStorageSync('BasePort');
 			const BaseCrnId = uni.getStorageSync('BaseCrnId');
 			const PROJ = uni.getStorageSync('UPROJ');
+			const CURRENT = uni.getStorageSync('current');
 			that.baseUrl = PROJ
 			that.baseIP = BaseIP
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
+			that.current = CURRENT
 			this.getUrl()
 			this.getVisualized()
 		},
@@ -214,7 +218,7 @@
 				// this.getInfo2()
 				// this.getError2()
 				// this.getUrl()
-				this.controller()
+				// this.controller()
 				this.getVisualized()
 			},1000)
 			
@@ -248,6 +252,7 @@
 					data: JSON.stringify(param),
 					success(res) {
 						res = res.data
+						console.log(res);
 						if (res.code === 200 && res.data.body.length>0) {
 							that.locs = [];
 							for (let k of res.data.body) {
@@ -512,6 +517,7 @@
 				uni.setStorageSync('BasePort',this.basePort);
 				uni.setStorageSync('BaseCrnId',this.baseCrnId);
 				uni.setStorageSync('UPROJ',this.baseUrl);
+				uni.setStorageSync('current',this.current);
 				this.getUrl()
 				this.ejectShow = false
 			},

--
Gitblit v1.9.1