diff --git a/spug_web/src/pages/deploy/do/index.js b/spug_web/src/pages/deploy/do/index.js index 7eab23c..dbd413b 100644 --- a/spug_web/src/pages/deploy/do/index.js +++ b/spug_web/src/pages/deploy/do/index.js @@ -36,7 +36,7 @@ class Index extends React.Component { this.setState({loading: true}); http.post(`/api/deploy/request/${this.id}/`) .then(({token, outputs, targets}) => { - store.request.status = '3'; + store.request.status = '2'; store.outputs = outputs; store.targets = targets; this.socket = new WebSocket(`ws://localhost:8000/ws/exec/${token}/`); @@ -74,7 +74,7 @@ class Index extends React.Component { if (store.targets.length !== 0) { for (let item of [{id: 'local'}, ...store.targets]) { if (lds.get(store.outputs, `${item.id}.status`) === 'error') { - return 发布异常 + return 发布异常 } else if (lds.get(store.outputs, `${item.id}.step`, -1) < 5) { return 发布中 } @@ -94,7 +94,7 @@ class Index extends React.Component { subTitle={`${app_name} - ${env_name}`} style={{padding: 0}} tags={this.getStatusAlias()} - extra={} onBack={() => history.goBack()}/> diff --git a/spug_web/src/pages/deploy/request/Table.js b/spug_web/src/pages/deploy/request/Table.js index 6ad63bf..99caa96 100644 --- a/spug_web/src/pages/deploy/request/Table.js +++ b/spug_web/src/pages/deploy/request/Table.js @@ -1,7 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import { observer } from 'mobx-react'; -import { Table, Divider, Modal, Icon, Popover, message } from 'antd'; +import { Table, Divider, Modal, Icon, Popover, Tag, message } from 'antd'; import http from 'libs/http'; import store from './store'; import { LinkButton } from "components"; @@ -48,10 +48,16 @@ class ComTable extends React.Component { return {info['status_alias']} - } else if (info.status === '2' && info.reason) { + } else if (info.status === '1' && info.reason) { return {info['status_alias']} + } else if (info.status === '2') { + return {info['status_alias']} + } else if (info.status === '3') { + return {info['status_alias']} + } else if (info.status === '-3') { + return {info['status_alias']} } else { return info['status_alias'] } @@ -67,6 +73,11 @@ class ComTable extends React.Component { render: info => { switch (info.status) { case '-3': + return + 发布 + + store.showForm(info)}>回滚 + ; case '3': return store.showForm(info)}>回滚; case '-1': @@ -75,7 +86,7 @@ class ComTable extends React.Component { this.handleDelete(info)}>删除 ; - case '1': + case '0': return store.showApprove(info)}>审核 @@ -83,7 +94,7 @@ class ComTable extends React.Component { this.handleDelete(info)}>删除 - case '2': + case '1': return 发布