diff --git a/src/forge/Component/OpsStatus.jsx b/src/forge/Component/OpsStatus.jsx index 60284fa4..38dac049 100644 --- a/src/forge/Component/OpsStatus.jsx +++ b/src/forge/Component/OpsStatus.jsx @@ -48,5 +48,9 @@ export const TagsLine = (status)=>{ return ( 已撤销 ); + case 'skipped': + return ( + 已跳过 + ); } -} \ No newline at end of file +} diff --git a/src/forge/DevOps/OpsDetailLeftpanel.jsx b/src/forge/DevOps/OpsDetailLeftpanel.jsx index 05ff2809..9d9fefd9 100644 --- a/src/forge/DevOps/OpsDetailLeftpanel.jsx +++ b/src/forge/DevOps/OpsDetailLeftpanel.jsx @@ -71,7 +71,7 @@ export default ({ data, repeatSet , chooseSteps }) => { - {data && data.started && + {data && data.started && 开始时间: {data.started} diff --git a/src/forge/DevOps/Structure.jsx b/src/forge/DevOps/Structure.jsx index 355a68c3..c782cc55 100644 --- a/src/forge/DevOps/Structure.jsx +++ b/src/forge/DevOps/Structure.jsx @@ -8,9 +8,9 @@ import axios from "axios"; const STATUS = [ { name: "所有"}, - { name: "准备中", value: "pending" }, - { name: "构建失败", value: "failure" }, { name: "运行中", value: "running" }, + { name: "已撤销", value: "killed" }, + { name: "构建失败", value: "failure" }, { name: "已完成", value: "success" }, ]; const LIMIT = 15; @@ -21,8 +21,8 @@ export default (props) => { const [data, setData] = useState(undefined); const [tableLoading, setTableLoading] = useState(true); - let projectsId = props.match.params.projectsId; - let owner = props.match.params.owner; + let projectsId = props.match.params.projectsId; + let owner = props.match.params.owner; useEffect(() => { if (projectsId) { @@ -86,9 +86,9 @@ export default (props) => { ); } function renderStatusBtn(status, number) { - if (status === "failure" || status === "error" || status === "success") { + if (status === "error" || status === "success") { return ""; - }else if(status === "killed"){ + }else if(status === "killed" || status === "failure"){ return( { console.log(''); - }); + }); // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting)); // localStorage.setItem('chromesettingresponse', JSON.stringify(response)); try {