diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java index 10977ae..88f2564 100644 --- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java +++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java @@ -68,7 +68,7 @@ public class ApiController { @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势、获取数据记录") @GetMapping("/home/queryParamList") public AjaxResult queryPramList(Date beginTime, Date endTime) { - System.out.println(beginTime.toString()); + return success(iApiService.queryPramList(beginTime, endTime)); } @ApiOperation(tags = {"60脱水机"}, value = "导出数据记录") diff --git a/haiwei-admin/src/main/resources/application.yml b/haiwei-admin/src/main/resources/application.yml index 8619f25..f12980a 100644 --- a/haiwei-admin/src/main/resources/application.yml +++ b/haiwei-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2023 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) profile: D:/ruoyi/uploadPath # profile: /Users/sxile/MyWorkSpase/WorkSpase/uploadPath/RuoYi-SqlServer diff --git a/haiwei-admin/src/main/resources/static/board/board.js b/haiwei-admin/src/main/resources/static/board/board.js index c7bf90f..26e2b6d 100644 --- a/haiwei-admin/src/main/resources/static/board/board.js +++ b/haiwei-admin/src/main/resources/static/board/board.js @@ -17,10 +17,10 @@ $(() => { $.get(ctx + 'broad/home/queryParam', {}, (e) => { let enumArr = { - '转速': 'n/s', - '电流': 'A', - '温度': '℃', - '压力': 'Kpa', + '转速': ' rpm', + '电流': ' A', + '温度': ' ℃', + '压力': ' MPa', } let data = e.data let arrNum = Array.from(new Set([...e.data.map(e => e.order_by)])) diff --git a/haiwei-admin/src/main/resources/static/board/img/equipment.png b/haiwei-admin/src/main/resources/static/board/img/equipment.png index 3c2387b..64ac776 100644 Binary files a/haiwei-admin/src/main/resources/static/board/img/equipment.png and b/haiwei-admin/src/main/resources/static/board/img/equipment.png differ diff --git a/haiwei-admin/src/main/resources/static/board/img/yellow.png b/haiwei-admin/src/main/resources/static/board/img/yellow.png new file mode 100644 index 0000000..c176331 Binary files /dev/null and b/haiwei-admin/src/main/resources/static/board/img/yellow.png differ diff --git a/haiwei-common/src/main/java/com/haiwei/common/utils/poi/ExcelUtil.java b/haiwei-common/src/main/java/com/haiwei/common/utils/poi/ExcelUtil.java index 399d7b6..a024547 100644 --- a/haiwei-common/src/main/java/com/haiwei/common/utils/poi/ExcelUtil.java +++ b/haiwei-common/src/main/java/com/haiwei/common/utils/poi/ExcelUtil.java @@ -747,7 +747,8 @@ public class ExcelUtil */ public String encodingFilename(String filename) { - filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; +// filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; + filename= filename +DateUtils.getTime()+ ".xlsx"; return filename; }