From 93134f806255451acba8668529b4e41860ec9a90 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 11 五月 2024 09:24:22 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |  540 +++++++++++++++++++----------------------------------
 Monitor-APP/manifest.json         |    4 
 Monitor-APP/pages/home/home.css   |    2 
 Monitor-APP/pages/home/home.vue   |   30 +++
 4 files changed, 225 insertions(+), 351 deletions(-)

diff --git a/Monitor-APP/manifest.json b/Monitor-APP/manifest.json
index 1101148..fc9a569 100644
--- a/Monitor-APP/manifest.json
+++ b/Monitor-APP/manifest.json
@@ -2,8 +2,8 @@
     "name" : "Monitor-APP",
     "appid" : "__UNI__CA903B7",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : "100",
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 48b4fd0..90a2664 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,7 +1,7 @@
 .text-content {
 	width: 100%;
 	height: 100%;
-	font-size: 16px;
+	font-size: 14px;
 	/* background-color: aliceblue;	 */
 }
 .swiper-head {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index ad44654..f7d0f2f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -463,12 +463,42 @@
 				// 娴嬭瘯鐢�
 				
 				this.getVisualized()
+				// this.getVisualizedTest()
 			},1000)
 		},
 		methods: {
 			getUrl() {
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
 			},
+			getVisualizedTest() {
+				let that = this
+				var result = ycqdata.dataInfo3
+				console.log(result);
+				let res = result.data
+				if (res.code === 200) {
+					console.log(res.data.agvWaitPakins);
+					if (res.data.agvWrkDetls != null) {
+						that.locs = res.data.agvWrkDetls
+						if (res.data.agvWrkMast) {
+							if (res.data.agvWrkMast.ioType == 107) {
+								that.infoText.title = '鐩樼偣鍑哄簱'
+							} else if (res.data.agvWrkMast.ioType == 103) {
+								that.infoText.title = '鎷f枡鍑哄簱'
+							} else {
+								that.infoText.title = '鍏ㄦ澘鍑哄簱'
+							} 
+						} else{
+							that.infoText.title = '鍏ュ簱浣滀笟'
+						}
+					} else if (res.data.agvWaitPakins != null) {
+						that.locs = res.data.agvWaitPakins
+						that.infoText.title = '鍏ュ簱浣滀笟'
+					}
+					
+					
+					
+				}
+			},
 			getVisualized() {
 				let that = this
 				let param = {devNo: `${that.devNo}`}
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6cb808b..e2f4485 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -20,354 +20,6 @@
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matnr":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
 																		}
 																		
 																	],
@@ -375,6 +27,198 @@
 																"ioType":101
 												}]
 		}},
+	"dataInfo3":{"data":{
+    "msg": "鎿嶄綔鎴愬姛",
+    "code": 200,
+    "data": {
+        "devNo": null,
+        "stationCode": null,
+        "decDesc": null,
+        "devMk": null,
+        "inEnable": null,
+        "outEnable": null,
+        "autoing": null,
+        "loading": null,
+        "canining": null,
+        "canouting": null,
+        "fronting": null,
+        "rearing": null,
+        "uping": null,
+        "downing": null,
+        "locSts": null,
+        "cacheShelves": null,
+        "wrkNo": null,
+        "floor": null,
+        "ctnType": null,
+        "barcode": null,
+        "inQty": null,
+        "row1": null,
+        "ioTime": null,
+        "area": null,
+        "inOk": null,
+        "outOk": null,
+        "locType1": null,
+        "locType2": null,
+        "locType3": null,
+        "modiUser": null,
+        "modiTime": null,
+        "appeUser": null,
+        "appeTime": null,
+        "stdQty": null,
+        "minWt": null,
+        "maxWt": null,
+        "grossWt": null,
+        "cartPos": null,
+        "agvWrkMast": {
+            "wrkNo": 253062,
+            "invWh": null,
+            "ymd": null,
+            "mk": "N",
+            "whsType": null,
+            "wrkSts": 205,
+            "ioType": 101,
+            "crnNo": null,
+            "steNo": null,
+            "outMost": null,
+            "sheetNo": null,
+            "ioPri": 300.0,
+            "wrkDate": "2024-05-11T00:28:31.850+0000",
+            "locNo": "CS-311",
+            "staNo": 0,
+            "sourceStaNo": 0,
+            "sourceLocNo": "SK-018-059-01@3",
+            "locSts": null,
+            "picking": "N",
+            "linkMis": "N",
+            "onlineYn": null,
+            "updMk": "N",
+            "exitMk": null,
+            "pltType": 0,
+            "emptyMk": null,
+            "ioTime": "2024-05-11T00:28:31.660+0000",
+            "ctnType": 0,
+            "packed": null,
+            "oveMk": "N",
+            "mtnType": 0.0,
+            "userNo": null,
+            "crnStrTime": null,
+            "crnEndTime": null,
+            "plcStrTime": null,
+            "crnPosTime": null,
+            "loadTime": 0.0,
+            "expTime": 0.0,
+            "refWrkno": 0.0,
+            "refIotime": null,
+            "modiUser": 44,
+            "modiTime": "2024-05-11T00:28:31.660+0000",
+            "appeUser": 44,
+            "appeTime": "2024-05-11T00:28:31.660+0000",
+            "pauseMk": null,
+            "errorTime": null,
+            "errorMemo": null,
+            "ctnKind": null,
+            "manuType": null,
+            "memo": null,
+            "scWeight": 0.0,
+            "logMk": "N",
+            "logErrTime": null,
+            "logErrMemo": null,
+            "barcode": "0000027336",
+            "ctnNo": null,
+            "fullPlt": "N",
+            "preHave": "N",
+            "takeNone": "N",
+            "locNo$": null,
+            "modiUser$": "wms4",
+            "modiTime$": "2024-05-11 08:28:31",
+            "appeTime$": "2024-05-11 08:28:31",
+            "appeUser$": "wms4",
+            "ioTime$": "2024-05-11 08:28:31",
+            "pdcType": null,
+            "errorTime$": "",
+            "ioType$": "101.鍑哄簱",
+            "wrkSts$": "205.宸ヤ綔瀹屾垚",
+            "sourceStaNo$": null,
+            "crnEndTime$": "",
+            "staNo$": null,
+            "sourceLocNo$": null,
+            "crnStrTime$": "",
+            "logErrTime$": "",
+            "wrkDate$": "2024-05-11 08:28:31",
+            "refIotime$": "",
+            "ymd$": "",
+            "plcStrTime$": "",
+            "crnPosTime$": "",
+            "crnNo$": null
+        },
+        "agvWaitPakin": null,
+        "agvWaitPakins": null,
+        "agvWrkDetl": null,
+        "agvWrkDetls": [
+            {
+                "wrkNo": 253062,
+                "ioTime": "2024-05-11T00:28:31.660+0000",
+                "anfme": 27.0,
+                "zpallet": null,
+                "matnr": "230606002104001",
+                "maktx": "涓�绾у唴榻垮湀澹充綋",
+                "batch": "",
+                "orderNo": "24059502543",
+                "specs": "FAD064D-Z108-榛�",
+                "model": "鍠峰",
+                "color": "涓�绾у唴榻垮湀澹充綋FAD064D",
+                "brand": "230606002104",
+                "unit": "鍙�",
+                "price": 13.0,
+                "sku": null,
+                "units": 13.0,
+                "barcode": null,
+                "origin": null,
+                "manu": null,
+                "manuDate": null,
+                "itemNum": null,
+                "safeQty": 1444.0,
+                "weight": null,
+                "length": null,
+                "volume": 27.0,
+                "threeCode": null,
+                "supp": "",
+                "suppCode": "0000027336",
+                "beBatch": null,
+                "deadTime": null,
+                "deadWarn": null,
+                "source": null,
+                "inspect": null,
+                "danger": null,
+                "modiUser": 44,
+                "modiTime": "2024-05-11T00:28:31.660+0000",
+                "appeUser": 44,
+                "appeTime": "2024-05-11T00:28:31.660+0000",
+                "memo": null,
+                "modiUser$": "wms4",
+                "modiTime$": "2024-05-11 08:28:31",
+                "appeTime$": "2024-05-11 08:28:31",
+                "beBatch$": null,
+                "appeUser$": "wms4",
+                "source$": null,
+                "inspect$": null,
+                "danger$": null,
+                "ioTime$": "2024-05-11 08:28:31"
+            }
+        ],
+        "containerMoveOutFlag": false,
+        "pickInFlag": false,
+        "locSts$": null,
+        "modiUser$": null,
+        "modiTime$": "",
+        "appeTime$": "",
+        "appeUser$": null,
+        "locType2$": null,
+        "ioTime$": "",
+        "locType1$": null,
+        "locType3$": null
+    }
+}},
 	"dataError2":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}},
 	"lineData":{
 		"msg": "鎿嶄綔鎴愬姛",

--
Gitblit v1.9.1