Commit 13b41e9f759a930a683c9bf6871f1dc5b4a776cc
Merge branch 'fix/DEFECT-1510' into 'main_dev'
fix: 修复历史趋势时间段查询问题 See merge request yunteng/thingskit-front!824
Showing
1 changed file
with
2 additions
and
2 deletions
... | ... | @@ -54,7 +54,7 @@ |
54 | 54 | }, |
55 | 55 | labelWidth: 120, |
56 | 56 | fieldMapToTime: [ |
57 | - [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:ss'], | |
57 | + [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:mm:ss'], | |
58 | 58 | ], |
59 | 59 | submitButtonOptions: { |
60 | 60 | loading: loading as unknown as boolean, |
... | ... | @@ -260,7 +260,7 @@ |
260 | 260 | :show-ok-btn="false" |
261 | 261 | cancel-text="关闭" |
262 | 262 | width="70%" |
263 | - title="历史趋势" | |
263 | + title="选择时间" | |
264 | 264 | > |
265 | 265 | <section |
266 | 266 | class="flex flex-col p-4 h-full w-full min-w-7/10" | ... | ... |