Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/bug-69066 of zentao/zentaopms (#13413)

Browse Source
This commit is contained in:
刘刚
2026-01-21 16:51:12 +08:00
committed by Gitfox
parent 36129cd055 11f99c1955
commit f6d9ae4896
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/control.php
+3 -2
View File
@@ -354,13 +354,14 @@ class metric extends control
$this->display();
}
public function ajaxGetTableAndCharts($metricID, $scope = '', $dateLabel = '', $dateBegin = '', $dateEnd = '', $viewType = 'single', $recTotal = 0, $recPerPage = 100, $pageID = 1)
public function ajaxGetTableAndCharts($metricID, $scope = '', $calcDate = '', $dateBegin = '', $dateEnd = '', $viewType = 'single', $recTotal = 0, $recPerPage = 100, $pageID = 1)
{
$usePager = empty($scope);
$dateBegin = str_replace('_', '-', $dateBegin);
$dateEnd = str_replace('_', '-', $dateEnd);
$options = array_filter(array('scope' => $scope, 'calcDate' => $dateLabel, 'dateBegin' => $dateBegin, 'dateEnd' => $dateEnd));
$dateLabel = isset($_POST['dateLabel']) ? $_POST['dateLabel'] : '';
$options = array_filter(array('scope' => $scope, 'calcDate' => $calcDate, 'dateLabel' => $dateLabel, 'dateBegin' => $dateBegin, 'dateEnd' => $dateEnd));
$this->app->loadClass('pager', true);
$pager = new pager($recTotal, $recPerPage, $pageID);