diff --git a/module/metric/control.php b/module/metric/control.php index d5112be85a..578a7b0219 100755 --- a/module/metric/control.php +++ b/module/metric/control.php @@ -271,11 +271,16 @@ class metric extends control $resultHeader = $this->metricZen->getViewTableHeader($metric); $resultData = $this->metricZen->getViewTableData($metric, $result); + list($groupHeader, $groupData) = $this->metricZen->getGroupTable($resultHeader, $resultData); + $this->view->groupHeader = $groupHeader; + $this->view->groupData = $groupData; + $this->view->tableWidth = $this->metricZen->getViewTableWidth($groupHeader); + $this->view->headerGroup = $this->metric->isHeaderGroup($groupHeader); + $this->view->metric = $metric; - $this->view->resultHeader = $resultHeader; - $this->view->resultData = $resultData; $this->view->chartTypeList = $this->metric->getChartTypeList($resultHeader); $this->view->echartOptions = $this->metric->getEchartsOptions($resultHeader, $resultData); + $this->view->metricRecordType = $this->metric->getMetricRecordType($resultHeader); $this->display(); } diff --git a/module/metric/ui/ajaxgetmultiplemetricbox.html.php b/module/metric/ui/ajaxgetmultiplemetricbox.html.php index 96d56c3766..a02bec0a38 100644 --- a/module/metric/ui/ajaxgetmultiplemetricbox.html.php +++ b/module/metric/ui/ajaxgetmultiplemetricbox.html.php @@ -12,8 +12,6 @@ namespace zin; $metricID = $metric->id; -$metricRecordType = $this->metric->getMetricRecordType($resultHeader); - $fnGenerateQueryForm = function() use($metricRecordType, $metric, $metricID) { if(!$metricRecordType) return null; @@ -137,15 +135,17 @@ div div ( setClass('table-side'), + setStyle(array('flex-basis' => $tableWidth . 'px')), div ( - $resultData ? dtable + $groupData ? dtable ( set::height(310), set::bordered(true), - set::cols($resultHeader), - set::data(array_values($resultData)), + set::cols($groupHeader), + set::data(array_values($groupData)), ($metricRecordType == 'scope' || $metricRecordType == 'scope-date') ? set::footPager(usePager('dtablePager')) : null, + $headerGroup ? set::plugins(array('header-group')) : null, set::onRenderCell(jsRaw('window.renderDTableCell')) ) : null )