diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index eb4c28d2..148c44e5 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -3780,10 +3780,6 @@ class Admin_DataController extends Zend_Controller_Action //统计 if($ac == 'status') { - $this->_helper->viewRenderer('project-status'); - - $this->view->projects = $heihe->fetch(); - $status = new \Heihe\Status; $fund_id = $this->_getParam('fund_id'); @@ -3795,6 +3791,17 @@ class Admin_DataController extends Zend_Controller_Action $status->fund_id = $fund_id; } + if(view::isXmlHttpRequest()) + { + echo $status->fileCount(); + exit(); + } + + $this->_helper->viewRenderer('project-status'); + + $this->view->projects = $heihe->fetch(); + + $this->view->projectsCount = $status->projectsCount(); $this->view->dataCount = $status->dataCount(); @@ -3807,7 +3814,13 @@ class Admin_DataController extends Zend_Controller_Action $this->view->applyTimesDistanct = $status->applyTimesDistinct(); - $this->view->fileCount = $status->fileCount(); + //$this->view->fileCount = $status->fileCount(); + + $this->view->offlineServiceTimes = $status->serviceTimes('offline'); + $this->view->onlineServiceTimes = $status->serviceTimes('online'); + + $this->view->offlineServiceSize = $status->serviceFilesize('offline'); + $this->view->onlineServiceSize = $status->serviceFilesize('online'); }//status diff --git a/application/admin/views/scripts/data/project-status.phtml b/application/admin/views/scripts/data/project-status.phtml index 15cc1ce0..68053b34 100644 --- a/application/admin/views/scripts/data/project-status.phtml +++ b/application/admin/views/scripts/data/project-status.phtml @@ -21,13 +21,23 @@
项目个数:= $this->projectsCount ?>
数据条数:= $this->dataCount ?>
总数据量:= round($this->dataFileSize / 1024 , 2) . 'GB' ?>
-文件个数:= $this->fileCount ?>
+文件个数:点击查看
服务次数(人/次):= $this->applyTimes ?>
服务次数(人/合并次,单个用户多次申请算作一次服务): = $this->applyTimesDistanct ?>
-服务次数(人/数据):= $this->dataApplyTimes ?>
+服务次数(数据条/次):= $this->dataApplyTimes ?>
+ + +为黑河计划项目服务的次数-离线:= $this->offlineServiceTimes ?>
+为黑河计划项目服务的数据量-离线:= round($this->offlineServiceSize,2) ?>GB
+为黑河计划项目服务的次数-在线:= $this->onlineServiceTimes ?>
+为黑河计划项目服务的数据量-在线:= round($this->onlineServiceSize ,2) ?>GB
+为黑河计划项目服务的次数-总数:= $this->onlineServiceTimes + $this->offlineServiceTimes ?>
+为黑河计划项目服务的数据量-总数:= round($this->onlineServiceSize + $this->offlineServiceSize ,2)?>GB