Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复工单选择【全部】显示NaN问题 #2543

Merged
merged 1 commit into from
Mar 19, 2024
Merged

修复工单选择【全部】显示NaN问题 #2543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sql/templates/sqlworkflow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
let end = moment();

function cb(start, end) {
if (start.isValid() && end.isValid()) {
if (start.isValid() && end.isValid() && start.dayOfYear()!=1) {
$('#reservation span').html(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
} else {
$('#reservation span').html('全部数据');
Expand All @@ -110,7 +110,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
firstDay: 1
},
ranges: {
"全部": [null, null],
"全部": [moment({ year: 1970 }),moment()],
"今日": [moment().startOf('day'), moment()],
"昨日": [moment().subtract('days', 1).startOf('day'), moment().subtract('days', 1).endOf('day')],
"最近7日": [moment().subtract('days', 6), moment()],
Expand Down
Loading