This commit is contained in:
mayue
2022-07-11 09:54:58 +08:00
parent 43c9570c98
commit 5bedd02491
3 changed files with 17 additions and 4 deletions
+12 -2
View File
@@ -48,6 +48,16 @@ $(function()
backgroundColor: '#6a7985'
}
},
formatter: function (params) {
var newParams = [];
var tooltipString = [];
newParams = params.reverse();
newParams.forEach((p) => {
const cont = p.marker + ' ' + p.seriesName + ': ' + p.value + '<br/>';
tooltipString.push(cont);
});
return tooltipString.join('');
},
textStyle: {
fontWeight: 100
}
@@ -57,7 +67,7 @@ $(function()
},
grid: {
left: '3%',
right: '4%',
right: '5%',
bottom: '3%',
containLabel: true
},
@@ -99,7 +109,7 @@ $(function()
show: true,
lineStyle:
{
color: ['#999'],
color: '#999',
width: 1
}
}
+4
View File
@@ -1516,6 +1516,10 @@ class executionModel extends model
{
$link = helper::createLink($module, 'task', "executionID=%s");
}
elseif($module == 'execution' and $method == 'cfd')
{
$link = helper::createLink('execution', 'kanban', "executionID=%s");
}
elseif($module == 'bug' and $method == 'create' and $this->app->tab == 'execution')
{
$link = helper::createLink($module, $method, "productID=0&branch=0&extra=executionID=%s");
@@ -76,9 +76,8 @@ foreach($executions as $projectID => $projectExecutions)
foreach($projectExecutions as $index => $execution)
{
$kanbanLink = $this->createLink('execution', 'kanban', "executionID=%s");
$cfdLink = $this->createLink('execution', 'cfd', "executionID=%s");
$taskLink = $this->createLink('execution', 'task', "executionID=%s");
if($execution->type != 'kanban' and ($link == $kanbanLink or $link == $cfdLink)) $link = $taskLink;
if($execution->type != 'kanban' and $link == $kanbanLink) $link = $taskLink;
if($execution->type == 'kanban' and $link != $kanbanLink) $link = $kanbanLink;
$selected = $execution->id == $executionID ? 'selected' : '';