From f259d31086e502f0943802f4917824d180dfd51c Mon Sep 17 00:00:00 2001 From: zhoumingxiu Date: Mon, 25 Mar 2024 17:03:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=BC=E5=90=88=E6=8C=87=E6=8C=A5?= =?UTF-8?q?=E6=94=AF=E6=92=91=E5=AD=90=E7=B3=BB=E7=BB=9F=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...achineVisionDefectDetectionController.java | 8 + .../MachineVisionDefectDetectionMapper.java | 1 + .../IMachineVisionDefectDetectionService.java | 1 + ...chineVisionDefectDetectionServiceImpl.java | 5 + .../MachineVisionDefectDetectionMapper.xml | 28 +- god-ui/src/api/machineVision/detection.js | 8 + .../emergencyRescue/index.vue | 433 ++++++++++++++++++ .../commandSubsystem/emergencyTask/index.vue | 392 ++++++++++++++++ .../commandSubsystem/summarize/index.vue | 392 ++++++++++++++++ .../commandSubsystem/synthesisView/index.vue | 392 ++++++++++++++++ 10 files changed, 1659 insertions(+), 1 deletion(-) create mode 100644 god-ui/src/views/commandSubsystem/emergencyRescue/index.vue create mode 100644 god-ui/src/views/commandSubsystem/emergencyTask/index.vue create mode 100644 god-ui/src/views/commandSubsystem/summarize/index.vue create mode 100644 god-ui/src/views/commandSubsystem/synthesisView/index.vue diff --git a/God-Vue-master/god-admin/src/main/java/com/god/web/controller/machineVision/MachineVisionDefectDetectionController.java b/God-Vue-master/god-admin/src/main/java/com/god/web/controller/machineVision/MachineVisionDefectDetectionController.java index 08197fed..f75487d8 100644 --- a/God-Vue-master/god-admin/src/main/java/com/god/web/controller/machineVision/MachineVisionDefectDetectionController.java +++ b/God-Vue-master/god-admin/src/main/java/com/god/web/controller/machineVision/MachineVisionDefectDetectionController.java @@ -95,4 +95,12 @@ public class MachineVisionDefectDetectionController extends BaseController { return toAjax(machineVisionDefectDetectionService.deleteMachineVisionDefectDetectionByIds(ids)); } + + @GetMapping("/listTask") + public TableDataInfo listTask(MachineVisionDefectDetection machineVisionDefectDetection) + { + startPage(); + List list = machineVisionDefectDetectionService.selectMachineVisionDefectDetectionListTask(machineVisionDefectDetection); + return getDataTable(list); + } } diff --git a/God-Vue-master/god-system/src/main/java/com/god/machineVision/mapper/MachineVisionDefectDetectionMapper.java b/God-Vue-master/god-system/src/main/java/com/god/machineVision/mapper/MachineVisionDefectDetectionMapper.java index 061bd2b5..6ef011c3 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/machineVision/mapper/MachineVisionDefectDetectionMapper.java +++ b/God-Vue-master/god-system/src/main/java/com/god/machineVision/mapper/MachineVisionDefectDetectionMapper.java @@ -26,6 +26,7 @@ public interface MachineVisionDefectDetectionMapper * @return 机器视觉缺陷检测集合 */ public List selectMachineVisionDefectDetectionList(MachineVisionDefectDetection machineVisionDefectDetection); + public List selectMachineVisionDefectDetectionListTask(MachineVisionDefectDetection machineVisionDefectDetection); /** * 新增机器视觉缺陷检测 diff --git a/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/IMachineVisionDefectDetectionService.java b/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/IMachineVisionDefectDetectionService.java index 857f0228..4f382f70 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/IMachineVisionDefectDetectionService.java +++ b/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/IMachineVisionDefectDetectionService.java @@ -26,6 +26,7 @@ public interface IMachineVisionDefectDetectionService * @return 机器视觉缺陷检测集合 */ public List selectMachineVisionDefectDetectionList(MachineVisionDefectDetection machineVisionDefectDetection); + public List selectMachineVisionDefectDetectionListTask(MachineVisionDefectDetection machineVisionDefectDetection); /** * 新增机器视觉缺陷检测 diff --git a/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/impl/MachineVisionDefectDetectionServiceImpl.java b/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/impl/MachineVisionDefectDetectionServiceImpl.java index 0c80138a..d8521dad 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/impl/MachineVisionDefectDetectionServiceImpl.java +++ b/God-Vue-master/god-system/src/main/java/com/god/machineVision/service/impl/MachineVisionDefectDetectionServiceImpl.java @@ -45,6 +45,11 @@ public class MachineVisionDefectDetectionServiceImpl implements IMachineVisionDe return machineVisionDefectDetectionMapper.selectMachineVisionDefectDetectionList(machineVisionDefectDetection); } + @Override + public List selectMachineVisionDefectDetectionListTask(MachineVisionDefectDetection machineVisionDefectDetection) { + return machineVisionDefectDetectionMapper.selectMachineVisionDefectDetectionListTask(machineVisionDefectDetection); + } + /** * 新增机器视觉缺陷检测 * diff --git a/God-Vue-master/god-system/src/main/resources/mapper/machineVision/MachineVisionDefectDetectionMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/machineVision/MachineVisionDefectDetectionMapper.xml index 8ddc9d48..5c5dfaf2 100644 --- a/God-Vue-master/god-system/src/main/resources/mapper/machineVision/MachineVisionDefectDetectionMapper.xml +++ b/God-Vue-master/god-system/src/main/resources/mapper/machineVision/MachineVisionDefectDetectionMapper.xml @@ -34,7 +34,7 @@ and image_id = #{imageId} - and position = #{position} + and position like concat('%', #{position}, '%') and gray_scale = #{grayScale} and zoom = #{zoom} and roi = #{roi} @@ -52,6 +52,7 @@ and col_eleven = #{colEleven} and col_twelve = #{colTwelve} + order by col_six desc + + + col_five != '2' + and image_id = #{imageId} + and position = #{position} + and gray_scale = #{grayScale} + and zoom = #{zoom} + and roi = #{roi} + and col_one = #{colOne} + and col_two = #{colTwo} + and col_three = #{colThree} + and col_four = #{colFour} + and col_six = #{colSix} + and interface_type = #{interfaceType} + and col_seven = #{colSeven} + and col_eight = #{colEight} + and col_nine = #{colNine} + and col_ten = #{colTen} + and col_eleven = #{colEleven} + and col_twelve = #{colTwelve} + + order by col_six desc + \ No newline at end of file diff --git a/god-ui/src/api/machineVision/detection.js b/god-ui/src/api/machineVision/detection.js index 1e75afa8..a7b0da3b 100644 --- a/god-ui/src/api/machineVision/detection.js +++ b/god-ui/src/api/machineVision/detection.js @@ -42,3 +42,11 @@ export function delDetection(id) { method: 'delete' }) } + +export function listDetectionTask(query) { + return request({ + url: '/machineVision/detection/listTask', + method: 'get', + params: query + }) +} diff --git a/god-ui/src/views/commandSubsystem/emergencyRescue/index.vue b/god-ui/src/views/commandSubsystem/emergencyRescue/index.vue new file mode 100644 index 00000000..4ae63d38 --- /dev/null +++ b/god-ui/src/views/commandSubsystem/emergencyRescue/index.vue @@ -0,0 +1,433 @@ + + + diff --git a/god-ui/src/views/commandSubsystem/emergencyTask/index.vue b/god-ui/src/views/commandSubsystem/emergencyTask/index.vue new file mode 100644 index 00000000..1089028c --- /dev/null +++ b/god-ui/src/views/commandSubsystem/emergencyTask/index.vue @@ -0,0 +1,392 @@ + + + diff --git a/god-ui/src/views/commandSubsystem/summarize/index.vue b/god-ui/src/views/commandSubsystem/summarize/index.vue new file mode 100644 index 00000000..28f22ea8 --- /dev/null +++ b/god-ui/src/views/commandSubsystem/summarize/index.vue @@ -0,0 +1,392 @@ + + + diff --git a/god-ui/src/views/commandSubsystem/synthesisView/index.vue b/god-ui/src/views/commandSubsystem/synthesisView/index.vue new file mode 100644 index 00000000..330c0f51 --- /dev/null +++ b/god-ui/src/views/commandSubsystem/synthesisView/index.vue @@ -0,0 +1,392 @@ + + + -- 2.45.2