github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

update

pull/330/head
vapao 2021-03-22 23:35:49 +08:00
parent 54cb817fc4
commit 014dd163b5
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spug_api/apps/deploy/views.py
View File

@ -124,10 +124,10 @@ class RequestDetailView(View):
if not req:
return json_response(error='未找到指定发布申请')
hosts = Host.objects.filter(id__in=json.loads(req.host_ids))
outputs = {x.id: {'id': x.id, 'title': x.name, 'data': []} for x in hosts}
outputs = {x.id: {'id': x.id, 'title': x.name, 'data': [f'{human_time()} 读取数据... ']} for x in hosts}
response = {'outputs': outputs, 'status': req.status}
if req.deploy.extend == '2':
outputs['local'] = {'id': 'local', 'data': []}
outputs['local'] = {'id': 'local', 'data': [f'{human_time()} 读取数据... ']}
response['s_actions'] = json.loads(req.deploy.extend_obj.server_actions)
response['h_actions'] = json.loads(req.deploy.extend_obj.host_actions)
rds, key, counter = get_redis_connection(), f'{settings.REQUEST_KEY}:{r_id}', 0

19
spug_web/src/pages/deploy/request/Ext2Console.js
View File

@ -90,7 +90,7 @@ function Ext2Console(props) {
<CloseOutlined onClick={() => store.showConsole(props.request, true)}/>
</div>
<Progress percent={(outputs.local.step + 1) * (90 / (1 + sActions.length)).toFixed(0)}
status={outputs.local.step === 100 ? 'success' : outputs.local.status === 'error' ? 'exception' : 'active'}/>
status={outputs.local.step === 100 ? 'success' : outputs.local.status === 'error' ? 'exception' : 'active'}/>
{Object.values(outputs).filter(x => x.id !== 'local').map(item => (
<Progress
key={item.id}
@ -114,12 +114,15 @@ function Ext2Console(props) {
]}>
<Collapse defaultActiveKey="0" className={styles.collapse}>
<Collapse.Panel header={(
<Steps size="small" className={styles.step} current={outputs.local.step} status={outputs.local.status}>
<StepItem style={{width: 200}} title="建立连接" item={outputs.local} step={0}/>
{sActions.map((item, index) => (
<StepItem style={{width: 200}} key={index} title={item.title} item={outputs.local} step={index + 1}/>
))}
</Steps>
<div className={styles.header}>
<b className={styles.title}/>
<Steps size="small" className={styles.step} current={outputs.local.step} status={outputs.local.status}>
<StepItem title="建立连接" item={outputs.local} step={0}/>
{sActions.map((item, index) => (
<StepItem key={index} title={item.title} item={outputs.local} step={index + 1}/>
))}
</Steps>
</div>
)}>
<OutView records={outputs.local.data}/>
</Collapse.Panel>
@ -134,7 +137,7 @@ function Ext2Console(props) {
key={index}
header={
<div className={styles.header}>
<b className={styles.title}>{item.title}{item.step}</b>
<b className={styles.title}>{item.title}</b>
<Steps size="small" className={styles.step} current={item.step} status={item.status}>
<StepItem title="等待调度" item={item} step={0}/>
{hActions.map((action, index) => (