Merge pull request '修改代码溯源下载条件' (#426) from tongChong/forgeplus-react:gitlink_server into gitlink_server

This commit is contained in:
tongChong 2022-07-29 18:57:03 +08:00
commit d456054521
1 changed files with 4 additions and 4 deletions

View File

@ -44,7 +44,7 @@ function Data(props) {
setLookResultUrl(result.data.view_base);
setViewBase(result.data.view_base);
for (const item of result.data.data) {
if (item.detect_status === "detecting" || item.detect_status === "waiting") {
if (item.detect_status === "detecting" || item.detect_status === "waiting" || (item.detect_status=="detected"&& item.is_reported=="0")) {
setTimeout(Init, 2000);
break;
}
@ -202,19 +202,19 @@ function Data(props) {
<span>
<div className="operationBtns">
{
e.detect_status === "detecting" || e.detect_status === "waiting" ?
e.detect_status === "detecting" || e.detect_status === "waiting"?
<span>重新扫描</span>
:
<a onClick={() => repeatCheck(e.project_id, e.branch_tag)}>重新扫描</a>
}
{
(e.detect_status === "fail" || e.detect_status === "detecting" || e.detect_status === "waiting") ?
(e.detect_status === "fail" || e.detect_status === "detecting" || e.detect_status === "waiting" || (e.detect_status=="detected"&& e.is_reported=="0")) ?
<span>查看<i className="iconfont icon-sanjiaoxing-down"></i></span>
:
<a onClick={() => { lookResult(e.task_id) }}>查看<i className={`iconfont ${openResultTaskId === e.task_id ? 'icon-sanjiaoxing-up' : 'icon-sanjiaoxing-down'}`}></i></a>
}
{
(e.detect_status === "fail" || e.detect_status === "detecting" || e.detect_status === "waiting") ?
(e.detect_status === "fail" || e.detect_status === "detecting" || e.detect_status === "waiting" || (e.detect_status=="detected"&& e.is_reported=="0")) ?
<span>下载报告</span>
:
<a onClick={() => handleDownExcel(e.task_id)}>下载报告</a>