diff --git a/module/screen/model.php b/module/screen/model.php index 82f02a2501..8b4bdcfc7e 100644 --- a/module/screen/model.php +++ b/module/screen/model.php @@ -841,8 +841,8 @@ class screenModel extends model $deadline = $execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate; $deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : $deadline; - $endDate = strpos($type, 'withdelay') !== false ? $deadline : $execution->end; - list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d', $execution->end); + $endDate = (strpos($type, 'withdelay') !== false and $deadline > $execution->end) ? $deadline : $execution->end; + list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d', $deadline); $executionEnd = strpos($type, 'withdelay') !== false ? $execution->end : ''; $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, 'left', $executionEnd); diff --git a/module/screen/view/burn.html.php b/module/screen/view/burn.html.php index db4bd13419..b47c019e2f 100644 --- a/module/screen/view/burn.html.php +++ b/module/screen/view/burn.html.php @@ -49,13 +49,14 @@ function initBurnChar() color: '#dee0e4', fontSize: 14 }, + top: 10, right: 0 }, color: ['#42526a', '#2567cf', 'red'], grid: { left: '3%', right: '4%', - top: 40, + top: 65, bottom: '3%', containLabel: true },