From 3ceabb21c1fd2b7fbdbc5c77c23f26152ec7f9aa Mon Sep 17 00:00:00 2001 From: 1 <1@123> Date: 星期五, 09 五月 2025 18:57:25 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/RgvController.java | 24 ++++++++++++ src/main/webapp/views/deviceOperate/rgvOperate.html | 55 ++++++++++++++++----------- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java index 9ea4f5c..e85e4de 100644 --- a/src/main/java/com/zy/asrs/controller/RgvController.java +++ b/src/main/java/com/zy/asrs/controller/RgvController.java @@ -51,6 +51,30 @@ return R.ok().add(res); } + @PostMapping("/task/cache/all") + @ManagerAuth(memo = "鍏ㄩ儴淇℃伅") + public R allTaskCache(@RequestParam(defaultValue = "0") Integer rgvNo){ + List<Map<String, Object>> res = new ArrayList<>(); + try{ + RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo); + TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache(); + ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol(); + for (TaskProtocol taskProtocol : allTaskProtocol.values()){ + Map<String, Object> map2 = new HashMap<>(); + map2.put("rgvNo", rgvNo); + map2.put("taskNo", taskProtocol.getTaskNo()); + map2.put("targetPosition", taskProtocol.getTargetPosition()); + map2.put("isRunning", taskProtocol.getIsRunning()); + map2.put("taskStatus", taskProtocol.getTaskStatus()); + map2.put("direction", taskProtocol.isDirection()); + res.add(map2); + } + } catch (Exception e){ +// return R.error("寮傚父"+e.getMessage()); + } + return R.ok().add(res); + } + @PostMapping("/run/walk")//Take Put Walk @ManagerAuth(memo = "灏忚溅琛岃蛋") public R rgvRunWalk(@RequestParam(defaultValue = "0") Integer rgvNo, diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html index d7146bd..6eeaa92 100644 --- a/src/main/webapp/views/deviceOperate/rgvOperate.html +++ b/src/main/webapp/views/deviceOperate/rgvOperate.html @@ -69,29 +69,21 @@ <el-empty description="璇烽�夋嫨璁惧"></el-empty> </div> <div v-else> - <el-descriptions :title="currentTitle" direction="vertical" :column="4" border> - <el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }} - </el-descriptions-item> - <el-descriptions-item label="宸ヤ綔鍙�"> - {{ tableData[currentIndex].workNo }} - </el-descriptions-item> - <el-descriptions-item label="鑷姩">{{ tableData[currentIndex].autoing }} - </el-descriptions-item> - <el-descriptions-item label="鏈夌墿">{{ tableData[currentIndex].loading }} - </el-descriptions-item> - <el-descriptions-item label="鍙叆">{{ tableData[currentIndex].inEnable }} - </el-descriptions-item> - <el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }} - </el-descriptions-item> - <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }} - </el-descriptions-item> - <el-descriptions-item label="绌烘澘淇″彿">{{ tableData[currentIndex].emptyMk }} - </el-descriptions-item> - <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }} - </el-descriptions-item> - <el-descriptions-item label="楂樹綆搴撲綅">{{ tableData[currentIndex].locType1 }} - </el-descriptions-item> - </el-descriptions> + <el-table ref="singleTable" :data="taskAllData" highlight-current-row @row-click="handleRowClick" + max-height="450" style="width: 100%"> + <el-table-column property="rgvNo" label="灏忚溅鍙�"> + </el-table-column> + <el-table-column property="taskNo" label="宸ヤ綔鍙�"> + </el-table-column> + <el-table-column property="taskStatus" label="浣滀笟妯″紡"> + </el-table-column> + <el-table-column property="isRunning" label="鐘舵��"> + </el-table-column> + <el-table-column property="targetPosition" label="鐩爣瀹氫綅缃�"> + </el-table-column> + <el-table-column property="direction" label="鏀惧悜"> + </el-table-column> + </el-table> </div> </div> </el-card> @@ -103,6 +95,7 @@ el: '#app', data: { tableData: [], + taskAllData: [], currentRow: null, currentTitle: "鏈�夋嫨璁惧", currentIndex: null, @@ -137,6 +130,22 @@ this.formParam.taskNo = row.taskNo this.formParam.rgvStaNo = row.rgvStaNo this.formParam.rgvPosDestination = row.rgvPosDestination + + this.getTaskAllData(index+1) + }, + getTaskAllData(index) { + let that = this; + $.ajax({ + url: baseUrl + "/rgv/task/cache/all", + headers: { + 'token': localStorage.getItem('token') + }, + data: {rgvNo: index}, + method: 'POST', + success: function (res) { + that.taskAllData = res.data + } + }); }, getTableData() { let that = this; -- Gitblit v1.9.1