Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
bkunyun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bkunyun
Commits
11d05219
Commit
11d05219
authored
Aug 22, 2022
by
wuyongsheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 增加启动状态
parent
1d6dd4f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
18 deletions
+14
-18
index.tsx
src/views/Project/ProjectJobDetail/index.tsx
+7
-17
index.tsx
src/views/Project/ProjectOverview/TaskCard/index.tsx
+2
-0
index.tsx
src/views/Project/ProjectWorkbench/workbenchList/index.tsx
+5
-1
No files found.
src/views/Project/ProjectJobDetail/index.tsx
View file @
11d05219
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-21 20:03:56
* @Date: 2022-06-21 20:03:56
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-
15 17:18:49
* @LastEditTime: 2022-08-
22 15:41:06
* @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
* @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
*/
...
@@ -47,6 +47,7 @@ import { getConnectionArr, getDatasetName, getDatasetPath, getSameBatch } from "
...
@@ -47,6 +47,7 @@ import { getConnectionArr, getDatasetName, getDatasetPath, getSameBatch } from "
import
styles
from
"./index.module.css"
;
import
styles
from
"./index.module.css"
;
const
stateMap
=
{
const
stateMap
=
{
SUBMITTED
:
"正在启动"
,
RUNNING
:
"正在运行"
,
RUNNING
:
"正在运行"
,
ABORTED
:
"运行终止"
,
ABORTED
:
"运行终止"
,
FAILED
:
"运行失败"
,
FAILED
:
"运行失败"
,
...
@@ -348,18 +349,7 @@ const ProjectSubmitWork = observer(() => {
...
@@ -348,18 +349,7 @@ const ProjectSubmitWork = observer(() => {
setOverviewActive
(
false
);
setOverviewActive
(
false
);
setShowOptions
(
!
showOptions
);
setShowOptions
(
!
showOptions
);
};
};
const
handleDownLoad
=
(
path
:
string
)
=>
{
if
(
path
.
indexOf
(
"/ProjectData"
)
!==
-
1
)
{
path
=
path
.
slice
(
12
);
}
CloudEController
.
JobFileDownload
(
path
,
fileToken
as
string
,
projectId
as
string
);
};
/** 终止任务 */
/** 终止任务 */
const
onStopJob
=
useCallback
(()
=>
{
const
onStopJob
=
useCallback
(()
=>
{
cancelWorkJob
({
cancelWorkJob
({
...
@@ -375,7 +365,7 @@ const ProjectSubmitWork = observer(() => {
...
@@ -375,7 +365,7 @@ const ProjectSubmitWork = observer(() => {
},
[
deleteWorkJob
,
workFlowJobInfo
?.
id
]);
},
[
deleteWorkJob
,
workFlowJobInfo
?.
id
]);
const
returnPermission
=
useMemo
(()
=>
{
const
returnPermission
=
useMemo
(()
=>
{
if
(
state
===
"RUNNING"
)
{
if
(
[
'SUBMITTED'
,
'RUNNING'
].
includes
(
state
||
''
)
)
{
return
isPass
(
"PROJECT_WORKBENCH_JOBS_STOP"
,
"USER"
);
return
isPass
(
"PROJECT_WORKBENCH_JOBS_STOP"
,
"USER"
);
}
else
{
}
else
{
return
isPass
(
"PROJECT_WORKBENCH_JOBS_DELETE"
,
"MANAGER"
);
return
isPass
(
"PROJECT_WORKBENCH_JOBS_DELETE"
,
"MANAGER"
);
...
@@ -446,13 +436,13 @@ const ProjectSubmitWork = observer(() => {
...
@@ -446,13 +436,13 @@ const ProjectSubmitWork = observer(() => {
}}
}}
> */
}
> */
}
<
MyButton
<
MyButton
text=
{
state
===
"RUNNING"
?
"终止"
:
"删除"
}
text=
{
[
'SUBMITTED'
,
'RUNNING'
].
includes
(
state
||
''
)
?
"终止"
:
"删除"
}
variant=
"outlined"
variant=
"outlined"
color=
"secondary"
color=
"secondary"
onClick=
{
(
e
:
any
)
=>
onClick=
{
(
e
:
any
)
=>
handleShowPopper
(
handleShowPopper
(
e
,
e
,
state
===
"RUNNING"
[
'SUBMITTED'
,
'RUNNING'
].
includes
(
state
||
''
)
?
"正在运行的任务终止后将无法重新运行,确认继续吗?"
?
"正在运行的任务终止后将无法重新运行,确认继续吗?"
:
"任务被删除后将无法恢复,确认继续吗?"
:
"任务被删除后将无法恢复,确认继续吗?"
)
)
...
@@ -551,7 +541,7 @@ const ProjectSubmitWork = observer(() => {
...
@@ -551,7 +541,7 @@ const ProjectSubmitWork = observer(() => {
alt=
""
alt=
""
/>
/>
)
}
)
}
{
state
===
"RUNNING"
&&
(
{
[
'SUBMITTED'
,
'RUNNING'
].
includes
(
state
||
''
)
&&
(
<
img
<
img
className=
{
styles
.
taskInfoValueIcon
}
className=
{
styles
.
taskInfoValueIcon
}
src=
{
jobRun
}
src=
{
jobRun
}
...
...
src/views/Project/ProjectOverview/TaskCard/index.tsx
View file @
11d05219
...
@@ -87,6 +87,8 @@ const TaskCard = (props: TaskCardProps) => {
...
@@ -87,6 +87,8 @@ const TaskCard = (props: TaskCardProps) => {
// 渲染状态
// 渲染状态
const
renderStatusText
=
(
data
:
string
)
=>
{
const
renderStatusText
=
(
data
:
string
)
=>
{
switch
(
data
)
{
switch
(
data
)
{
case
"SUBMITTED"
:
return
"正在启动"
;
case
"RUNNING"
:
case
"RUNNING"
:
return
'正在运行'
return
'正在运行'
case
"ABORTED"
:
case
"ABORTED"
:
...
...
src/views/Project/ProjectWorkbench/workbenchList/index.tsx
View file @
11d05219
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-0
7-28 19:02:19
* @LastEditTime: 2022-0
8-22 15:33:02
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
*/
...
@@ -48,6 +48,10 @@ const currencies = [
...
@@ -48,6 +48,10 @@ const currencies = [
value
:
"ALL"
,
value
:
"ALL"
,
label
:
"全部"
,
label
:
"全部"
,
},
},
{
value
:
"SUBMITTED"
,
label
:
"正在启动"
,
},
{
{
value
:
"RUNNING"
,
value
:
"RUNNING"
,
label
:
"正在运行"
,
label
:
"正在运行"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment