diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 846cd97484..884c4a0ea3 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -717,6 +717,7 @@ $lang->block->moduleList['html'] = $lang->block->html; $lang->block->tooltips = array(); $lang->block->tooltips['deliveryRate'] = "{$lang->SRCommon} delivery rate = Number of {$lang->SRCommon} delivered by {$lang->productCommon} / (Total number of {$lang->SRCommon} by {$lang->productCommon} - Number of {$lang->SRCommon} delivered by {$lang->productCommon}) * 100%"; +$lang->block->tooltips['resolvedRate'] = "Bug repair rate by {$lang->productCommon} = number of fixed bugs by {$lang->productCommon} / number of valid bugs by {$lang->productCommon}"; $lang->block->tooltips['effectiveStory'] = "Total number of {$lang->SRCommon} by {$lang->productCommon}: Sum the number of {$lang->SRCommon} in a {$lang->productCommon}, filter deleted {$lang->SRCommon} and filter deleted {$lang->productCommon}."; $lang->block->tooltips['deliveredStory'] = "Number of {$lang->SRCommon} delivered by {$lang->productCommon}: Sum the number of {$lang->SRCommon} in the {$lang->productCommon}, the stage is released or the reason for closure is done, filter the deleted {$lang->SRCommon} and filter the deleted {$lang->productCommon}."; $lang->block->tooltips['costs'] = "Have invested = Hours consumed / Available hours per day"; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index bb34ce8d3f..812346fa8f 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -717,6 +717,7 @@ $lang->block->moduleList['html'] = $lang->block->html; $lang->block->tooltips = array(); $lang->block->tooltips['deliveryRate'] = "{$lang->SRCommon} delivery rate = Number of {$lang->SRCommon} delivered by {$lang->productCommon} / (Total number of {$lang->SRCommon} by {$lang->productCommon} - Number of {$lang->SRCommon} delivered by {$lang->productCommon}) * 100%"; +$lang->block->tooltips['resolvedRate'] = "Bug repair rate by {$lang->productCommon} = number of fixed bugs by {$lang->productCommon} / number of valid bugs by {$lang->productCommon}"; $lang->block->tooltips['effectiveStory'] = "Total number of {$lang->SRCommon} by {$lang->productCommon}: Sum the number of {$lang->SRCommon} in a {$lang->productCommon}, filter deleted {$lang->SRCommon} and filter {$lang->SRCommon} in deleted {$lang->productCommon}."; $lang->block->tooltips['deliveredStory'] = "Number of {$lang->SRCommon} delivered by {$lang->productCommon}: Sum the number of {$lang->SRCommon} in the {$lang->productCommon}, the stage is released or the reason for closure is done, filter the deleted {$lang->SRCommon} and filter the {$lang->SRCommon} in deleteddeleted {$lang->productCommon}."; $lang->block->tooltips['costs'] = "Have invested = Hours consumed / Available hours per day"; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 9f60e8fdb7..3b6c1f0b41 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -710,6 +710,7 @@ $lang->block->moduleList['html'] = $lang->block->html; $lang->block->tooltips = array(); $lang->block->tooltips['deliveryRate'] = "{$lang->SRCommon} delivery rate = Number of {$lang->SRCommon} delivered by {$lang->productCommon} / (Total number of {$lang->SRCommon} by {$lang->productCommon} - Number of {$lang->SRCommon} delivered by {$lang->productCommon}) * 100%"; +$lang->block->tooltips['resolvedRate'] = "Bug repair rate by {$lang->productCommon} = number of fixed bugs by {$lang->productCommon} / number of valid bugs by {$lang->productCommon}"; $lang->block->tooltips['effectiveStory'] = "Total number of {$lang->SRCommon} by {$lang->productCommon}: Sum the number of {$lang->SRCommon} in a {$lang->productCommon}, filter deleted {$lang->SRCommon} and filter deleted {$lang->productCommon}."; $lang->block->tooltips['deliveredStory'] = "Number of {$lang->SRCommon} delivered by {$lang->productCommon}: Sum the number of {$lang->SRCommon} in the {$lang->productCommon}, the stage is released or the reason for closure is done, filter the deleted {$lang->SRCommon} and filter the deleted {$lang->productCommon}."; $lang->block->tooltips['costs'] = "Have invested = Hours consumed / Available hours per day"; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 4b5ee77928..fdfd2a4909 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -708,6 +708,7 @@ $lang->block->moduleList['html'] = $lang->block->html; $lang->block->tooltips = array(); $lang->block->tooltips['deliveryRate'] = "{$lang->SRCommon}交付率=按{$lang->productCommon}统计的已交付{$lang->SRCommon}数 /(按{$lang->productCommon}统计的{$lang->SRCommon}总数 - 按{$lang->productCommon}统计的无效{$lang->SRCommon}数) * 100%"; +$lang->block->tooltips['resolvedRate'] = "按{$lang->productCommon}统计的Bug修复率 = 按{$lang->productCommon}统计的修复Bug数 / 按{$lang->productCommon}统计的有效Bug数"; $lang->block->tooltips['effectiveStory'] = "按{$lang->productCommon}统计的{$lang->SRCommon}总数:{$lang->productCommon}中{$lang->SRCommon}的个数求和,过滤已删除的{$lang->SRCommon},过滤已删除的{$lang->productCommon}。"; $lang->block->tooltips['deliveredStory'] = "按{$lang->productCommon}统计的已交付{$lang->SRCommon}数:{$lang->productCommon}中{$lang->SRCommon}个数求和,所处阶段为已发布或关闭原因为已完成,过滤已删除的{$lang->SRCommon},过滤已删除的{$lang->productCommon}。"; $lang->block->tooltips['costs'] = "已投入 = 已消耗工时 / 每日可用工时"; diff --git a/module/block/ui/bugstatisticblock.html.php b/module/block/ui/bugstatisticblock.html.php index ca4fd879cf..662ac47c83 100644 --- a/module/block/ui/bugstatisticblock.html.php +++ b/module/block/ui/bugstatisticblock.html.php @@ -44,28 +44,32 @@ statisticBlock div ( setClass('flex justify-center w-full'), - zui::progressCircle + progressCircle ( - set('percent', $resolvedRate), - set('size', 112), - set('circleWidth', 6), - set('text', $resolvedRate . '%'), - set('textY', 50), - set('textStyle', 'font-size: 30px;') - ) - ), - div - ( - setClass('flex justify-center w-full h-0'), - span - ( - setClass('text-gray text-sm progress-text'), - $lang->block->qastatistic->fixBugRate, - icon + set::percent($resolvedRate), + set::size(112), + set::text(false), + set::circleWidth('0.06'), + div(span(setClass('text-2xl font-bold'), $resolvedRate), '%'), + div ( - setClass('pl-0.5'), - toggle::tooltip(array('title' => '提示文本')), - 'help' + setClass('row text-sm text-gray items-center gap-1'), + $lang->block->qastatistic->fixBugRate, + icon + ( + setClass('text-light text-sm'), + toggle::tooltip + ( + array + ( + 'title' => $lang->block->tooltips['resolvedRate'], + 'placement' => 'bottom', + 'type' => 'white', + 'className' => 'text-dark border border-light leading-5' + ) + ), + 'help' + ) ) ) ), @@ -124,7 +128,7 @@ statisticBlock set::tooltip(array('trigger' => 'axis')), set::grid(array('left' => '10px', 'top' => '50px', 'right' => '0', 'bottom' => '0', 'containLabel' => true)), set::legend(array('show' => true, 'right' => '0', 'top' => '25px', 'textStyle' => array('fontSize' => '11'))), - set::xAxis(array('type' => 'category', 'data' => $months, 'splitLine' => array('show' => false), 'axisTick' => array('alignWithLabel' => true, 'interval' => 0), 'axisLabel' => array('fontSize' => $longBlock ? '8' : '10'))), + set::xAxis(array('type' => 'category', 'data' => array_keys($activateBugs), 'splitLine' => array('show' => false), 'axisTick' => array('alignWithLabel' => true, 'interval' => 0), 'axisLabel' => array('fontSize' => $longBlock ? '8' : '10'))), set::yAxis(array('type' => 'value', 'splitLine' => array('show' => false), 'axisLine' => array('show' => true, 'color' => '#DDD'), 'axisLabel' => array('showMaxLabel' => true, 'interval' => 'auto'))), set::tooptop(array('show' => true, 'formatter' => '{b}: {c}')), set::series