diff --git a/God-Vue-master/god-system/src/main/java/com/god/machineVision/domain/MachineVisionDefectDetection.java b/God-Vue-master/god-system/src/main/java/com/god/machineVision/domain/MachineVisionDefectDetection.java index 682df61b..88d23f0f 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/machineVision/domain/MachineVisionDefectDetection.java +++ b/God-Vue-master/god-system/src/main/java/com/god/machineVision/domain/MachineVisionDefectDetection.java @@ -66,7 +66,79 @@ public class MachineVisionDefectDetection extends BaseEntity @Excel(name = "接口") private String interfaceType; - public void setId(String id) + /** 字段 */ + @Excel(name = "字段") + private String colSeven; + + /** 字段 */ + @Excel(name = "字段") + private String colEight; + + /** 字段 */ + @Excel(name = "字段") + private String colNine; + + /** 字段 */ + @Excel(name = "字段") + private String colTen; + + /** 字段 */ + @Excel(name = "字段") + private String colEleven; + + /** 字段 */ + @Excel(name = "字段") + private String colTwelve; + + public String getColSeven() { + return colSeven; + } + + public void setColSeven(String colSeven) { + this.colSeven = colSeven; + } + + public String getColEight() { + return colEight; + } + + public void setColEight(String colEight) { + this.colEight = colEight; + } + + public String getColNine() { + return colNine; + } + + public void setColNine(String colNine) { + this.colNine = colNine; + } + + public String getColTen() { + return colTen; + } + + public void setColTen(String colTen) { + this.colTen = colTen; + } + + public String getColEleven() { + return colEleven; + } + + public void setColEleven(String colEleven) { + this.colEleven = colEleven; + } + + public String getColTwelve() { + return colTwelve; + } + + public void setColTwelve(String colTwelve) { + this.colTwelve = colTwelve; + } + + public void setId(String id) { this.id = id; } 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 4974265b..8ddc9d48 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 @@ -5,46 +5,56 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - select id, image_id, position, gray_scale, zoom, roi, col_one, col_two, col_three, col_four, col_five, col_six, interface_type from machine_vision_defect_detection + select id, image_id, position, gray_scale, zoom, roi, col_one, col_two, col_three, col_four, col_five, col_six, interface_type, col_seven, col_eight, col_nine, col_ten, col_eleven, col_twelve from machine_vision_defect_detection - - 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_five = #{colFive} - and col_six = #{colSix} - and interface_type = #{interfaceType} + 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_five = #{colFive} + 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} - where id = #{id} @@ -65,6 +75,12 @@ col_five, col_six, interface_type, + col_seven, + col_eight, + col_nine, + col_ten, + col_eleven, + col_twelve, #{id}, @@ -80,6 +96,12 @@ #{colFive}, #{colSix}, #{interfaceType}, + #{colSeven}, + #{colEight}, + #{colNine}, + #{colTen}, + #{colEleven}, + #{colTwelve}, @@ -98,6 +120,12 @@ col_five = #{colFive}, col_six = #{colSix}, interface_type = #{interfaceType}, + col_seven = #{colSeven}, + col_eight = #{colEight}, + col_nine = #{colNine}, + col_ten = #{colTen}, + col_eleven = #{colEleven}, + col_twelve = #{colTwelve}, where id = #{id} diff --git a/god-ui/src/views/machineVision/blobAnalysis/index.vue b/god-ui/src/views/machineVision/blobAnalysis/index.vue new file mode 100644 index 00000000..770d78d7 --- /dev/null +++ b/god-ui/src/views/machineVision/blobAnalysis/index.vue @@ -0,0 +1,360 @@ + + +