diff --git a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue index d9e1d3d..95b2422 100644 --- a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue +++ b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue @@ -351,13 +351,14 @@ +
-
- 显示图片 +
+ 显示可见光图片
-
- 显示图片 +
+ 显示热成像图片
@@ -455,6 +456,8 @@ export default { }, visiblePhoto: '', thermalPhoto: '', + thermalPhotoKey: 0,//在图片对话框中使用,更新图片时增加key值,防止缓存 + visiblePhotoKey: 0,//在图片对话框中使用,更新图片时增加key值,防止缓存 }; }, created() { @@ -563,20 +566,27 @@ export default { if(row.filePath){ const filePath = row.filePath ; - //TODO:修改为实际接口地址 - const thermalResponse = `/dev-api/record/recordBusbarTemp/getVisiblePhoto/${filePath}`; + // 清除缓存 + this.thermalPhoto = null; + this.visiblePhoto = null; + + //TODO:修改为实际接口地 +/* const thermalResponse = `/dev-api/record/recordBusbarTemp/getVisiblePhoto/${filePath}`; this.thermalPhoto = thermalResponse; const visibleResponse = `/dev-api/record/recordBusbarTemp/getThermalPhoto/${filePath}`; - this.visiblePhoto = visibleResponse; -/* const thermalResponse = `/prod-api/record/recordBusbarTemp/getVisiblePhoto/${filePath}` + this.visiblePhoto = visibleResponse;*/ + const thermalResponse = `/prod-api/record/recordBusbarTemp/getVisiblePhoto/${filePath}` this.thermalPhoto = thermalResponse; const visibleResponse = `/prod-api/record/recordBusbarTemp/getThermalPhoto/${filePath}` - this.visiblePhoto = visibleResponse;*/ + this.visiblePhoto = visibleResponse; /* const thermalResponse = getVisiblePhoto(filePath); this.thermalPhoto = thermalResponse; const visibleResponse = getThermalPhoto(filePath); this.visiblePhoto = visibleResponse;*/ + this.thermalPhotoKey++; // 更新 key 以重新渲染图片 + this.visiblePhotoKey++; // 更新 key 以重新渲染图片 + this.photoOpen = true; this.photoTitle = row.filePath + "图片显示"; }else { diff --git a/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue b/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue index 930f2ba..ceba975 100644 --- a/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue +++ b/ruoyi-ui/src/views/record/recordInspectionCabinet/VideoPlayer.vue @@ -27,15 +27,15 @@ export default { const filePath = this.$route.query.filePath; try { - //TODO:修改为实际接口地址 +/* TODO:修改为实际接口地址 const thermalResponse = `/dev-api/record/recordInspectionCabinet/getThermalVideo/${filePath}`; this.thermalVideoUrl = thermalResponse; const visibleResponse = `/dev-api/record/recordInspectionCabinet/getVisibleVideo/${filePath}`; - this.visibleVideoUrl = visibleResponse; - /* const thermalResponse = `/prod-api/record/recordInspectionCabinet/getThermalVideo/${filePath}`; + this.visibleVideoUrl = visibleResponse;*/ + const thermalResponse = `/prod-api/record/recordInspectionCabinet/getThermalVideo/${filePath}`; this.thermalVideoUrl = thermalResponse; const visibleResponse = `/prod-api/record/recordInspectionCabinet/getVisibleVideo/${filePath}`; - this.visibleVideoUrl = visibleResponse;*/ + this.visibleVideoUrl = visibleResponse; /* const thermalResponse = getThermalVideo(filePath); this.thermalVideoUrl = thermalResponse; const visibleResponse= getVisibleVideo(filePath);