Revert "* Refactor method of gen waterpolo."

This reverts commit 7166651759.
This commit is contained in:
zhouxin
2023-12-22 10:45:12 +08:00
parent a8df595b47
commit f277e8463b
2 changed files with 2 additions and 12 deletions
+1 -11
View File
@@ -592,16 +592,7 @@ class chartModel extends model
return array($group, $metrics, $aggs, $xLabels, $yStats);
}
/**
* Generate waterpolo for screen designer.
*
* @param string $settings
* @param string $defaultSql
* @param array $filters
* @access public
* @return array
*/
public function genWaterpolo($settings, $sql, $filters)
public function genWaterpolo($fields, $settings, $sql, $filters)
{
$operate = "{$settings['calc']}({$settings['goal']})";
$sql = "select $operate count from ($sql) tt ";
@@ -638,7 +629,6 @@ class chartModel extends model
$series = array(array('type' => 'liquidFill', 'data' => array($percent), 'color' => array('#2e7fff'), 'outline' => array('show' => false), 'label' => array('fontSize' => 26)));
$tooltip = array('show' => true);
$options = array('series' => $series, 'tooltip' => $tooltip);
return $options;