diff --git a/module/block/control.php b/module/block/control.php
index 9279a46d36..74648f574d 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1311,8 +1311,8 @@ class block extends control
                 ->beginIF($projects && $products)->where('project')->in(array_keys($projects))->orWhere('product')->in(array_keys($products))->fi()
                 ->beginIF($projects && empty($products))->where('project')->in(array_keys($projects))->fi()
                 ->beginIF(empty($projects) && $products)->where('product')->in(array_keys($products))->fi()
-                ->orderBy('id_desc')
-                ->limit(30)
+                ->orderBy('date_desc')
+                ->limit(10)
                 ->fetchAll();
         }
 
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index e7f2d0ca9a..c5db4d2fab 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -341,6 +341,7 @@ $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks->scrumoverall  = '项目整体情况';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumlist     = $lang->projectCommon . '列表';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap  = $lang->productCommon . '路线图';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumproject  = $lang->projectCommon . '总览';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumproduct  = $lang->productCommon . '总览';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest     = '待测版本';
diff --git a/module/block/view/scrumoverallblock.html.php b/module/block/view/scrumoverallblock.html.php
index ec5fd51d18..b5ea3130ec 100644
--- a/module/block/view/scrumoverallblock.html.php
+++ b/module/block/view/scrumoverallblock.html.php
@@ -52,7 +52,7 @@
         </div>
       </div>
     </div>
-    <div class="col-3 total-block">
+    <div class="col-3 total-block hide-in-sm">
       <div><strong><?php echo $lang->block->totalStory;?></strong></div>
       <div class="tile-amount">
       <?php echo $totalData[$programID]->allStories ? html::a($this->createLink('project', 'story', 'projectID=' . $programID), $totalData[$programID]->allStories) : 0;?>
@@ -69,7 +69,7 @@
         <span><?php echo $totalData[$programID]->leftStories;?></span>
       </div>
     </div>
-    <div class="col-3 total-block">
+    <div class="col-3 total-block hide-in-sm">
       <div><strong><?php echo $lang->block->totalBug;?></strong></div>
       <div class="tile-amount">
       <?php echo $totalData[$programID]->allBugs ? html::a($this->createLink('qa', 'index'), $totalData[$programID]->allBugs) : 0;?>
diff --git a/module/program/model.php b/module/program/model.php
index 839aaa911b..0968794311 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -91,7 +91,7 @@ class programModel extends model
         if(empty($programs)) return array();
         $programIdList = array_keys($programs);
 
-        $hours = $this->dao->select('program, sum(consumed) as consumed, sum(estimate) as estimate')->from(TABLE_TASK)
+        $hours = $this->dao->select('program, cast(sum(consumed) as decimal(10,2)) as consumed, cast(sum(estimate) as decimal(10,2)) as estimate')->from(TABLE_TASK)
             ->where('program')->in($programIdList)
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
diff --git a/module/programplan/config.php b/module/programplan/config.php
index 6886393a37..084c2dcf86 100644
--- a/module/programplan/config.php
+++ b/module/programplan/config.php
@@ -5,7 +5,7 @@ $config->programplan->create->requiredFields = 'name,begin,end';
 $config->programplan->edit->requiredFields   = 'name,begin,end';
 
 $config->programplan->datatable = new stdclass();
-$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'milestone', 'begin', 'end', 'realStarted', 'realFinished', 'output', 'openedBy', 'openedDate', 'actions');
+$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'milestone', 'begin', 'end', 'realStarted', 'realFinished', 'openedBy', 'openedDate', 'actions');
 
 $config->programplan->datatable->fieldList['id']['title']    = 'idAB';
 $config->programplan->datatable->fieldList['id']['fixed']    = 'left';
@@ -32,16 +32,6 @@ $config->programplan->datatable->fieldList['milestone']['fixed']    = 'no';
 $config->programplan->datatable->fieldList['milestone']['width']    = '100';
 $config->programplan->datatable->fieldList['milestone']['required'] = 'no';
 
-$config->programplan->datatable->fieldList['output']['title']    = 'output';
-$config->programplan->datatable->fieldList['output']['fixed']    = 'no';
-$config->programplan->datatable->fieldList['output']['width']    = '200';
-$config->programplan->datatable->fieldList['output']['required'] = 'no';
-
-//$config->programplan->datatable->fieldList['version']['title']    = 'version';
-//$config->programplan->datatable->fieldList['version']['fixed']    = 'no';
-//$config->programplan->datatable->fieldList['version']['width']    = '70';
-//$config->programplan->datatable->fieldList['version']['required'] = 'no';
-
 $config->programplan->datatable->fieldList['openedBy']['title']    = 'openedBy';
 $config->programplan->datatable->fieldList['openedBy']['fixed']    = 'no';
 $config->programplan->datatable->fieldList['openedBy']['width']    = '90';