diff --git a/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordInspectionCabinetController.java b/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordInspectionCabinetController.java index e70c59a..16d505e 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordInspectionCabinetController.java +++ b/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordInspectionCabinetController.java @@ -119,6 +119,8 @@ public class RecordInspectionCabinetController extends BaseController return toAjax(recordInspectionCabinetService.deleteRecordInspectionCabinetByObjIds(objIds)); } + + /** * 处理热成像视频文件的HTTP GET请求。 * @param filePath 热成像视频文件的路径 diff --git a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java index 4bb4b1f..a311bae 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java +++ b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java @@ -77,8 +77,8 @@ public class RecordBusbarTemp extends BaseEntity private Date updatedTime; /** 记录时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date recordTime; public void setObjId(Long objId) diff --git a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordInspectionCabinet.java b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordInspectionCabinet.java index 145b8ee..e0f0efc 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordInspectionCabinet.java +++ b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordInspectionCabinet.java @@ -26,13 +26,13 @@ public class RecordInspectionCabinet extends BaseEntity private String taskCode; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date beginTime; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** 文件路径 */ diff --git a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue index eaa1b93..85c625b 100644 --- a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue +++ b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue @@ -135,7 +135,7 @@ --> @@ -335,8 +335,8 @@ @@ -350,7 +350,20 @@ - + + +
+
+ 显示图片 +
+
+ 显示图片 +
+
+
+ + + @@ -501,6 +513,7 @@ export default { this.photoOpen = false; this.visiblePhoto = null; this.thermalPhoto = null; + this.photoOpen = null; }, /** 搜索按钮操作 */ handleQuery() { @@ -559,7 +572,7 @@ export default { this.visiblePhoto = visibleResponse;*/ this.photoOpen = true; - this.photoTitle = "图片显示"; + this.photoTitle = row.filePath + "图片显示"; }else { this.$modal.msgError("暂无图像名称"); } @@ -606,9 +619,8 @@ export default { }; ---> + + + + + diff --git a/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue b/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue index bf49b7d..b8d8994 100644 --- a/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue +++ b/ruoyi-ui/src/views/record/recordInspectionCabinet/index.vue @@ -20,8 +20,8 @@ @@ -156,12 +156,12 @@ @@ -224,15 +224,15 @@ @@ -280,6 +280,7 @@ 取 消
+