diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/exportSelected.html b/ruoyi-admin/src/main/resources/templates/demo/table/exportSelected.html index 53e89ec..7497d3e 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/exportSelected.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/exportSelected.html @@ -22,7 +22,7 @@
- 勾选数据导出指定列，否则为全部 + 导出 diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java index 56af839..c196bab 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java @@ -40,9 +40,10 @@ public class RecordInspectionImgController extends BaseController { return prefix + "/record_inspection_location"; } - @GetMapping("/img") - public String record_inspection_img() + @GetMapping("/img/{location}") + public String record_inspection_img(@PathVariable("location") String location,ModelMap modelMap) { + modelMap.put("location",location); return prefix + "/record_inspection_img"; } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java index c592683..7d4fb03 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java @@ -1,10 +1,13 @@ package com.ruoyi.manage.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 轮挡入库记录对象 record_in * @@ -17,7 +20,9 @@ public class RecordInSort extends BaseEntity /** 主键 */ private Long objid; - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "入库时间" , width = 30, dateFormat = "yyyy-MM-dd") + private Date createTime; /** 批次码 */ @Excel(name = "批次码") private String batchCode; @@ -25,6 +30,16 @@ public class RecordInSort extends BaseEntity @Excel(name = "数量") public int recordCount; + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public void setObjid(Long objid) { this.objid = objid; diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html b/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html index 630707b..bb536d0 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html @@ -52,7 +52,7 @@
- 勾选数据导出指定列，否则为全部 + 导出 @@ -238,7 +238,7 @@ function exportSelected() { var $table =$('#bootstrap-table'); - var selections = $table.bootstrapTable('getSelections'); + /* var selections = $table.bootstrapTable('getSelections'); var objIds = $.map(selections, function (row) { return row.batchCode; // 假设objid是父表每行的唯一标识 }); @@ -251,8 +251,8 @@ var dataParam = { objIds: objIds.join(',') }; - - $.modal.confirm("确定导出勾选的" + objIds.length + "条数据吗？", function() { +*/ + $.modal.confirm("确定导出数据吗？", function() { $.ajax({ url: prefix + "/export_sort", // 修改为您的导出接口URL method: 'POST', diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html index a7a6a81..6b7708e 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html @@ -10,14 +10,14 @@
    -
  • - - -
    • -
  • - - -
    • + + + + + + + +
  • @@ -77,17 +77,18 @@ columns: [{ checkbox: true }, - { - field: 'inspectionId', - title: '巡检id' - }, - { - field: 'taskId', - title: '任务表id' - }, + // { + // field: 'inspectionId', + // title: '巡检id' + // }, + // { + // field: 'taskId', + // title: '任务表id' + // }, { field: 'locationCode', - title: '机位码' + title: '机位码', + visible:false }, { field: 'imgPath', diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html index c9a9618..1f1d1a6 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html @@ -50,7 +50,7 @@