diff --git a/module/screen/control.php b/module/screen/control.php index 28915086fb..815c7fd16c 100644 --- a/module/screen/control.php +++ b/module/screen/control.php @@ -84,7 +84,7 @@ class screen extends control return; } - $screen = $this->screen->getByID($screenID, $year, $month, $dept, $account, false); + $screen = $this->screen->getByID($screenID, $year, $month, $dept, $account); $this->view->title = $screen->name; $this->view->screen = $screen; @@ -106,12 +106,6 @@ class screen extends control } } - public function ajaxGetScreenScheme($screenID, $year = 0, $month = 0, $dept = 0, $account = '') - { - $screen = $this->screen->getByID($screenID, $year, $month, $dept, $account); - echo(json_encode($screen)); - } - /** * Ajax get chart. * diff --git a/module/screen/js/view.js b/module/screen/js/view.js index 37d87cf6da..b7403a1726 100644 --- a/module/screen/js/view.js +++ b/module/screen/js/view.js @@ -26,7 +26,7 @@ self["MonacoEnvironment"] = (function(paths) { }); location.hash = '#/chart/preview/' + screen.id; +window.chartData = screen.chartData; window.location.replace(window.location.href.toString().replace(window.location.hash, '')+'#/chart/preview/' + screen.id) window.fetchChartApi = createLink('screen', 'ajaxGetChart'); window.fetchMetricDataApi = createLink('screen', 'ajaxGetMetricData'); -window.fetchScreenSchemeApi = createLink('screen', 'ajaxGetScreenScheme', 'screenID=' + screen.id + '&year=' + year + '&month=' + month + '&dept=' + dept + '&account=' + account); diff --git a/module/screen/model.php b/module/screen/model.php index f8e67137a2..387524a20d 100644 --- a/module/screen/model.php +++ b/module/screen/model.php @@ -68,11 +68,11 @@ class screenModel extends model * @access public * @return object */ - public function getByID($screenID, $year = '', $month = '', $dept = '', $account = '', $withChartData = true) + public function getByID($screenID, $year = '', $month = '', $dept = '', $account = '') { $screen = $this->dao->select('*')->from(TABLE_SCREEN)->where('id')->eq($screenID)->fetch(); if(!isset($screen->scheme) or empty($screen->scheme)) $screen->scheme = file_get_contents(__DIR__ . '/json/screen.json'); - if($withChartData) $screen->chartData = $this->genChartData($screen, $year, $month, $dept, $account); + $screen->chartData = $this->genChartData($screen, $year, $month, $dept, $account); return $screen; } diff --git a/module/screen/view/view.html.php b/module/screen/view/view.html.php index 63aa4d8a2f..4271dc9e8c 100644 --- a/module/screen/view/view.html.php +++ b/module/screen/view/view.html.php @@ -2,7 +2,6 @@ -