Merge remote-tracking branch 'origin/sanji' into sanji

This commit is contained in:
liheng 2018-05-15 15:42:56 +08:00
commit 649ffb97a8
2 changed files with 12 additions and 22 deletions

View File

@ -42,12 +42,6 @@ class Admin_StatController extends Zend_Controller_Action
$onlinesize = $res->fetch(); $onlinesize = $res->fetch();
$this->view->onlinesize = $onlinesize; $this->view->onlinesize = $onlinesize;
$sql="select sum(configvalue::real)/1024/1024/1024 as num from g6ftpusersettings where userid in (select id from g6ftpusers where name like 'westdc%' or name='newwestdc') and configname='StatsDownloaded'";
$res = $this->db->query($sql);
$onlinesize = $res->fetch();
$this->view->onlineg6size = $onlinesize;
}//indexAction 首页 }//indexAction 首页
function unitAction() function unitAction()

View File

@ -10,17 +10,17 @@
$this->headScript()->appendFile('/js/jquery.masonry.min.js'); $this->headScript()->appendFile('/js/jquery.masonry.min.js');
?> ?>
<div class="hidden-sm hidden-xs col-md-2"> <div class="hidden-sm hidden-xs col-md-2">
<?= $this->partial('stat/left.phtml'); ?> <?= $this->partial('stat/left.phtml'); ?>
<ul> <ul>
<li class="title">概况</li> <li class="title">概况</li>
<li>用户总数:<?php echo $this->stat['alluser']; ?></li> <li>用户总数:<?php echo $this->stat['alluser']; ?></li>
<li>元数据条数:<?php echo $this->stat['alldata']; ?></li> <li>元数据条数:<?php echo $this->stat['alldata']; ?></li>
<li>在线数据下载数:<?php echo $this->stat['onlinedown']; ?></li> <li>在线数据下载数:<?php echo $this->stat['onlinedown']; ?></li>
<li>离线数据下载数:<?php echo $this->stat['offlinedown']; ?></li> <li>离线数据下载数:<?php echo $this->stat['offlinedown']; ?></li>
<li>已通过的离线申请:<?php echo $this->stat['offlinepass']; ?></li> <li>已通过的离线申请:<?php echo $this->stat['offlinepass']; ?></li>
<li>未完成的离线申请:<?php echo $this->stat['offlineunfinished']; ?></li> <li>未完成的离线申请:<?php echo $this->stat['offlineunfinished']; ?></li>
<li>被拒绝的离线数据:<?php echo $this->stat['offlinedenied']; ?></li> <li>被拒绝的离线数据:<?php echo $this->stat['offlinedenied']; ?></li>
<li>有记录的在线下载数:<?php echo $this->stat['onlineapp']; ?></li> <li>有记录的在线下载数:<?php echo $this->stat['onlineapp']; ?></li>
</ul> </ul>
</div> </div>
<div class="col-md-10 col-sm-12"> <div class="col-md-10 col-sm-12">
@ -42,11 +42,7 @@
<td>在线下载数据量(估计量,偏大)</td> <td>在线下载数据量(估计量,偏大)</td>
<td><?php echo round($this->onlinesize['num'],2);?></td> <td><?php echo round($this->onlinesize['num'],2);?></td>
</tr> </tr>
<tr>
<td>G6在线下载数据量精确量</td>
<td><?php echo round($this->onlineg6size['num'],2);?></td>
</tr>
</table> </table>
</div> </div>