From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 02 七月 2025 13:55:55 +0800 Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法,支持根据托盘号和下一地址查询任务,同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法,允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法,简化了任务查询逻辑并删除了多余的注释代码。同时,增加了对 `taskNext` 的处理逻辑,确保在任务未找到时的相应处理,并更新在途数据的逻辑,提升数据一致性和准确性。 --- Code Management/WCS/WIDESEAWCS_Client/src/views/Home.vue | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Home.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Home.vue index 820437a..134ace2 100644 --- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Home.vue +++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Home.vue @@ -1,14 +1,37 @@ <template> <div class="title"></div> + <el-container> + <el-header>鏃ュ織</el-header> + <el-main> + <el-card v-for="(log, index) in logs" :key="index" class="log-card" :style="{ color: log.color }"> + <div :style="{ color: log.color }">{{ log.logEntry }}</div> + <div :style="{ color: log.color }">{{ log.time }}</div> + </el-card> + </el-main> + </el-container> </template> <script> -import { ref, reactive } from 'vue' +import { ref, onMounted } from 'vue' +import eventBus from "@/uitils/eventBus"; export default { setup() { + const logs = ref([]); + onMounted(() => { + eventBus.on('Logs', eventData => { + if (logs.value.length > 500) { + logs.value = []; + } + const logEntry = "鏃ュ織淇℃伅锛�" + eventData.log + const time = "鏃堕棿锛�" + eventData.time + logs.value.unshift({ logEntry: logEntry, time: time, color: eventData.color }); + + // logs.value.unshift(logEntry); + }); + }); return { - + logs } } } @@ -21,4 +44,8 @@ font-size: 28px; color: orange; } + +.log-card { + margin-bottom: 10px; +} </style> \ No newline at end of file -- Gitblit v1.9.3