Merge branch 'zentaopms_12.0.1' of github.com:easysoft/zentaopms into zentaopms_12.0.1

2020-02-11 18:06:15 +08:00
parent 2b89c9f5f6 60c64816eb
commit fb15a7a9d1
13 changed files with 17 additions and 16 deletions
@@ -2698,7 +2698,7 @@ class projectModel extends model
        foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * $rate, 1) . ',';
        $baselineJSON = rtrim($baselineJSON, ',') . ']';

-        $chartData['labels']   = $this->report->convertFormat($dateList, 'n/j');
+        $chartData['labels']   = $this->report->convertFormat($dateList, DT_DATE5);
        $chartData['burnLine'] = $this->report->createSingleJSON($sets, $dateList);
        $chartData['baseLine'] = $baselineJSON;