From 1258697843989ba05d09a7a838f8efcc6c1a8642 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 六月 2024 16:13:37 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |    3 ---
 Monitor-APP/pages/home/home.vue   |    4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index ca7dd3b..1ab3d1a 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -462,8 +462,8 @@
 			setInterval(()=>{
 				// 娴嬭瘯鐢�
 				
-				// this.getVisualized()
-				this.getVisualizedTest()
+				this.getVisualized()
+				// this.getVisualizedTest()
 			},1000)
 		},
 		methods: {
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 439403e..a2f6ade 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -76,11 +76,8 @@
             "mk": "N",
             "whsType": null,
             "wrkSts": 205,
-<<<<<<< HEAD
             "ioType": 107,
-=======
             "ioType": 53,
->>>>>>> bd18bae05ec337f06ba825d4e4148f7129009c14
             "crnNo": null,
             "steNo": null,
             "outMost": null,

--
Gitblit v1.9.1