From e647640432ff5763e438089c849dd7dcead07b4e Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 15 Jan 2021 15:33:49 +0800 Subject: [PATCH] * Change color. --- module/block/view/waterfallriskblock.html.php | 8 ++++---- module/my/view/risk.html.php | 8 ++++---- module/risk/js/common.js | 8 ++++---- module/risk/view/browse.html.php | 8 ++++---- module/user/view/risk.html.php | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/module/block/view/waterfallriskblock.html.php b/module/block/view/waterfallriskblock.html.php index 9f2c8c2750..9024eeb0fc 100644 --- a/module/block/view/waterfallriskblock.html.php +++ b/module/block/view/waterfallriskblock.html.php @@ -40,11 +40,11 @@ rate?> pri == 'middle') $priColor = 'yellow'; - if($risk->pri == 'high') $priColor = 'red'; + $priColor = '#000000'; + if($risk->pri == 'middle') $priColor = '#FF9900'; + if($risk->pri == 'high') $priColor = '#E53333'; ?> - " . zget($lang->risk->priList, $risk->pri) . "";?> + " . zget($lang->risk->priList, $risk->pri) . "";?> assignedTo, $risk->assignedTo)?> risk->categoryList, $risk->category, $risk->category)?> diff --git a/module/my/view/risk.html.php b/module/my/view/risk.html.php index 8f3bb72d9e..5ff764a004 100644 --- a/module/my/view/risk.html.php +++ b/module/my/view/risk.html.php @@ -58,11 +58,11 @@ identifiedDate == '0000-00-00' ? '' : $risk->identifiedDate;?> rate;?> pri == 'middle') $priColor = 'yellow'; - if($risk->pri == 'high') $priColor = 'red'; + $priColor = '#000000'; + if($risk->pri == 'middle') $priColor = '#FF9900'; + if($risk->pri == 'high') $priColor = '#E53333'; ?> - " . zget($lang->risk->priList, $risk->pri) . "";?> + " . zget($lang->risk->priList, $risk->pri) . "";?> risk->printAssignedHtml($risk, $users);;?> risk->categoryList, $risk->category);?> diff --git a/module/risk/js/common.js b/module/risk/js/common.js index 5b9edbec1e..c98fd1b30e 100644 --- a/module/risk/js/common.js +++ b/module/risk/js/common.js @@ -14,16 +14,16 @@ $(function() if(5 < rate && rate <= 12) pri = 'middle'; if(15 <= rate && rate <= 25) pri = 'high'; - if(pri == 'low') priColor = 'text-black'; - if(pri == 'middle') priColor = 'text-yellow'; - if(pri == 'high') priColor = 'text-red'; + if(pri == 'low') priColor = '#000000'; + if(pri == 'middle') priColor = '#FF9900'; + if(pri == 'high') priColor = '#E53333'; $('#rate').val(rate); $('#pri').val(pri); $('#pri').trigger("chosen:updated") $('#pri').chosen(); $('#pri').attr('disabled', true); - $('#priValue .chosen-container-single .chosen-single>span').attr("class", priColor); + $('#priValue .chosen-container-single .chosen-single>span').attr("style", 'color:' + priColor); $('input[name="pri"]').remove(); $('#pri').after(""); } diff --git a/module/risk/view/browse.html.php b/module/risk/view/browse.html.php index e6fd3c14b4..d284881501 100644 --- a/module/risk/view/browse.html.php +++ b/module/risk/view/browse.html.php @@ -69,11 +69,11 @@ identifiedDate == '0000-00-00' ? '' : $risk->identifiedDate;?> rate;?> pri == 'middle') $priColor = 'yellow'; - if($risk->pri == 'high') $priColor = 'red'; + $priColor = '#000000'; + if($risk->pri == 'middle') $priColor = '#FF9900'; + if($risk->pri == 'high') $priColor = '#E53333'; ?> - " . zget($lang->risk->priList, $risk->pri) . "";?> + " . zget($lang->risk->priList, $risk->pri) . "";?> risk->printAssignedHtml($risk, $users);;?> risk->categoryList, $risk->category);?> diff --git a/module/user/view/risk.html.php b/module/user/view/risk.html.php index 0456286565..5a8efa1518 100644 --- a/module/user/view/risk.html.php +++ b/module/user/view/risk.html.php @@ -58,11 +58,11 @@ identifiedDate == '0000-00-00' ? '' : $risk->identifiedDate;?> rate;?> pri == 'middle') $priColor = 'yellow'; - if($risk->pri == 'high') $priColor = 'red'; + $priColor = '#000000'; + if($risk->pri == 'middle') $priColor = '#FF9900'; + if($risk->pri == 'high') $priColor = '#E53333'; ?> - " . zget($lang->risk->priList, $risk->pri) . "";?> + " . zget($lang->risk->priList, $risk->pri) . "";?> risk->categoryList, $risk->category);?>