Merge branch 'sprint/213_mayue_bug#24811' into 'master'

* Fix bug #24811.

See merge request easycorp/zentaopms!4402

module/execution/css/cfd.css

@@ -1,30 +1,26 @@
 .main-content > h2 {font-size: 16px;}
+.container {max-width: 1700px !important}
 
 .pull-left .input-control {margin-right: 10px;}
 
 #cfdWrapper {max-width: 1450px; padding: 25px 0px 10px; position: relative}
-#cfdYUnit {position: absolute; color: #CBD0DB; top: 40px; left: 30px}
-#cfdXUnit {position: absolute; color: #CBD0DB; bottom: 20px; left: 1200px}
 @media screen and (max-width: 1920px)
 {
 #cfdChart {width:1400px !important; height:600px !important}
 #mainContent {min-width: 1550px !important;}
 #burnStatistics {left: 1400px !important;}
-#cfdXUnit {left: 1400px;}
 }
 @media screen and (max-width: 1680px)
 {
 #cfdChart {width:1150px !important; height:500px !important}
 #mainContent {min-width: 1350px !important;}
 #burnStatistics {left: 1150px !important;}
-#cfdXUnit {left: 1150px;}
 }
 @media screen and (max-width: 1366px)
 {
 #cfdChart {width:1000px !important; height:400px !important}
 #mainContent {min-width: 1200px !important;}
 #burnStatistics {left: 1000px !important;}
-#cfdXUnit {left: 1000px;}
 }
 
 #mainContent {min-width: 1400px;}

module/execution/js/cfd.js

@@ -2,7 +2,7 @@ $(function()
 {
     $('[data-toggle=tooltip]').tooltip();
 
-    if(chartData)
+    if(Object.keys(chartData).length || 1)
     {
         var i = 0;
         var series     = [];
@@ -56,6 +56,7 @@ $(function()
               type: 'category',
               boundaryGap: false,
               data: chartData['labels'],
+              name: XUnit,
               axisLine:
               {
                   show: true,
@@ -70,6 +71,19 @@ $(function()
           {
               type: 'value',
               minInterval: 1,
+              name: YUnit,
+              nameTextStyle:
+              {
+                  fontWeight: 'normal'
+              },
+              axisPointer:
+              {
+                  label:
+                  {
+                      show: true,
+                      precision: 0
+                  },
+              },
               axisLine:
               {
                   show: true,

module/execution/view/cfd.html.php

@@ -15,6 +15,8 @@
 <?php js::import($jsRoot . 'html2canvas/min.js'); ?>
 <?php js::set('executionID', $executionID); ?>
 <?php js::set('chartData', $chartData); ?>
+<?php js::set('YUnit', $lang->execution->count); ?>
+<?php js::set('XUnit', $lang->execution->burnXUnit); ?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php
@@ -33,8 +35,6 @@
   <h2 class='text-center'><?php echo $executionName . ' - ' . zget($lang->execution->cfdTypeList, $type) . $lang->execution->CFD;?></h2>
   <div id="cfdWrapper">
     <div id="cfdChart" style="width: 1200px; height: 600px"></div>
-    <div id="cfdYUnit"><?php echo $lang->execution->count;?></div>
-    <div id="cfdXUnit"><?php echo $lang->execution->burnXUnit;?></div>
     <div id="burnStatistics">
       <div class="stat-title"><span class="bg-primary">&nbsp;</span> <?php echo $lang->execution->charts->cfd->cycleTime;?> <i class="icon icon-help" data-toggle="tooltip" data-tip-class="tooltip-help" data-placement="bottom" title="<?php echo $lang->execution->charts->cfd->cycleTimeTip;?>"></i></div>
       <h3><?php echo $cycleTimeAvg ? ($cycleTimeAvg . $lang->day) : $lang->noData;?></h3>