diff --git a/module/testtask/control.php b/module/testtask/control.php index 2116cfaa9c..012ea6d2bd 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -407,8 +407,12 @@ class testtask extends control { $chartFunc = 'getDataOf' . $chart; $chartData = $this->testtask->$chartFunc($taskID); - $chartOption = $this->testtask->mergeChartOption($chart); - if(!empty($chartType)) $chartOption->type = $chartType; + $chartOption = $this->lang->testtask->report->options; + if(!empty($chartType)) + { + $chartOption->type = $chartType; + $chartOption->graph->caption = $this->lang->testtask->report->charts[$chartType]; + } $this->view->charts[$chart] = $chartOption; $this->view->datas[$chart] = $this->report->computePercent($chartData); diff --git a/module/testtask/model.php b/module/testtask/model.php index f5a3708aef..c923b10f2a 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -634,34 +634,6 @@ class testtaskModel extends model return $datas; } - /** - * Merge the default chart settings and the settings of current chart. - * - * @param string $chartType - * @access public - * @return object - */ - public function mergeChartOption($chartType) - { - $chartOption = isset($this->lang->testtask->report->$chartType) ? $this->lang->testtask->report->$chartType : new stdclass(); - $commonOption = $this->lang->testtask->report->options; - - if(!isset($chartOption->graph)) $chartOption->graph = new stdclass(); - if(!isset($chartOption->type)) $chartOption->type = $commonOption->type; - if(!isset($chartOption->width)) $chartOption->width = $commonOption->width; - if(!isset($chartOption->height)) $chartOption->height = $commonOption->height; - - $chartOption->graph->caption = $this->lang->testtask->report->charts[$chartType]; - - /* 合并配置。*/ - foreach($commonOption->graph as $key => $value) - { - if(!isset($chartOption->graph->$key)) $chartOption->graph->$key = $value; - } - - return $chartOption; - } - /** * 更新测试单。 * Update a test task. diff --git a/module/testtask/test/model/mergechartoption.php b/module/testtask/test/model/mergechartoption.php deleted file mode 100755 index 9b7ea76cf8..0000000000 --- a/module/testtask/test/model/mergechartoption.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -mergeChartOption(); -cid=1 -pid=1 - - - -*/ - -$testtask = new testtaskTest(); - -r($testtask->mergeChartOptionTest()) && p() && e(); \ No newline at end of file