From 9814794a8fa94bf9033885e83d052ade9e9299ad Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 4 Jul 2023 18:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/getData2.js | 4 ++++ src/pages/modules/homepage/two.vue | 22 +++++++++++++++++++--- src/pages/modules/sortpack/one.vue | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index 68d56ba..4ddf151 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -20,6 +20,10 @@ export const workshopCondition = () => post('api/cockpit/workshopCondition', {}) // 'code': 200, // 'desc': '操作成功', // 'result': { +// 'AGVStatusList': { +// 'agv_1': {'device_code': '1', 'status': '1'}, +// 'agv_2': {'device_code': '2', 'status': '1'} +// }, // 'SemiFinishedProductShelfList': [ // { // 'point_name': '半成品货位12', diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index ea3bad6..44fad00 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -50,10 +50,22 @@
-
+
+ + + + +
+
-
+
+ + + + +
+
@@ -456,7 +468,8 @@ export default { kilneye4InfoList: [], // 窑口4个位置 LQD01: [], // 冷却道数据 HCD01: [], // 回车道数据 - IoKilnTrussTask: [] // 进窑桁架和出窑桁架数据 + IoKilnTrussTask: [], // 进窑桁架和出窑桁架数据 + AGVStatusList: {} // agv状态 } }, computed: { @@ -525,6 +538,9 @@ export default { if (res.result.hasOwnProperty('IoKilnTrussTask')) { this.IoKilnTrussTask = [...res.result.IoKilnTrussTask] } + if (res.result.hasOwnProperty('AGVStatusList')) { + this.AGVStatusList = res.result.AGVStatusList + } } }, async _sortingAndPackagingPopover () { diff --git a/src/pages/modules/sortpack/one.vue b/src/pages/modules/sortpack/one.vue index a4f5e4b..3dd01fb 100644 --- a/src/pages/modules/sortpack/one.vue +++ b/src/pages/modules/sortpack/one.vue @@ -890,6 +890,7 @@ export default { left: -1000%; .cmd_wrap_2 left 30% + opacity 0.2 .liu_wrap _wh(130%, 78%) top 43%