修改 参数

master
wangh 1 year ago
parent 3ff5a4d6cb
commit 3bd5ff4ac5

@ -68,7 +68,7 @@ public class ApiController {
@ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势、获取数据记录") @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势、获取数据记录")
@GetMapping("/home/queryParamList") @GetMapping("/home/queryParamList")
public AjaxResult queryPramList(Date beginTime, Date endTime) { public AjaxResult queryPramList(Date beginTime, Date endTime) {
System.out.println(beginTime.toString());
return success(iApiService.queryPramList(beginTime, endTime)); return success(iApiService.queryPramList(beginTime, endTime));
} }
@ApiOperation(tags = {"60脱水机"}, value = "导出数据记录") @ApiOperation(tags = {"60脱水机"}, value = "导出数据记录")

@ -7,7 +7,7 @@ ruoyi:
# 版权年份 # 版权年份
copyrightYear: 2023 copyrightYear: 2023
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath # 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath
profile: D:/ruoyi/uploadPath profile: D:/ruoyi/uploadPath
# profile: /Users/sxile/MyWorkSpase/WorkSpase/uploadPath/RuoYi-SqlServer # profile: /Users/sxile/MyWorkSpase/WorkSpase/uploadPath/RuoYi-SqlServer

@ -17,10 +17,10 @@ $(() => {
$.get(ctx + 'broad/home/queryParam', {}, (e) => { $.get(ctx + 'broad/home/queryParam', {}, (e) => {
let enumArr = { let enumArr = {
'转速': 'n/s', '转速': ' rpm',
'电流': 'A', '电流': ' A',
'温度': '℃', '温度': ' ℃',
'压力': 'Kpa', '压力': ' MPa',
} }
let data = e.data let data = e.data
let arrNum = Array.from(new Set([...e.data.map(e => e.order_by)])) let arrNum = Array.from(new Set([...e.data.map(e => e.order_by)]))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 975 KiB

After

Width:  |  Height:  |  Size: 883 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -747,7 +747,8 @@ public class ExcelUtil<T>
*/ */
public String encodingFilename(String filename) public String encodingFilename(String filename)
{ {
filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; // filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
filename= filename +DateUtils.getTime()+ ".xlsx";
return filename; return filename;
} }

Loading…
Cancel
Save