Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
csbr-daop
/
fe-data-trusted-space
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
adaa0abf
authored
2024-12-27 11:03:14 +0800
by
lxs
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
分类分级任务bug修改
1 parent
9aa62fda
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
src/views/data_inventory/taskConfig.vue
src/views/data_inventory/taskDetail.vue
src/views/data_inventory/taskLog.vue
src/views/data_inventory/taskConfig.vue
View file @
adaa0ab
...
...
@@ -50,6 +50,8 @@ const tableInfo = ref({
{
label
:
"执行状态"
,
field
:
"status"
,
width
:
TableColumnWidth
.
STATE
,
align
:
'center'
,
type
:
"tag"
,
getName
:
(
scope
)
=>
{
return
filterVal
(
scope
.
row
.
status
,
'status'
);
},
tagType
:
(
scope
)
=>
{
return
scope
.
row
.
status
==
'Y'
?
'success'
:
scope
.
row
.
status
==
'E'
?
'danger'
:
'info'
;
}
},
{
label
:
"任务修改人"
,
field
:
"updateUserName"
,
width
:
120
},
...
...
@@ -61,8 +63,8 @@ const tableInfo = ref({
label
:
"结果状态"
,
field
:
"confirmStatus"
,
width
:
TableColumnWidth
.
STATE
,
align
:
'center'
,
type
:
"tag"
,
getName
:
(
scope
)
=>
{
return
filterVal
(
scope
.
row
.
confirmStatus
,
'confirmStatus'
);
},
tagType
:
(
scope
)
=>
{
return
scope
.
row
.
confirmStatus
==
'Y'
?
'success'
:
'warning'
;
}
,
return
scope
.
row
.
confirmStatus
==
'Y'
?
'success'
:
'warning'
;
}
},
],
data
:
[],
...
...
@@ -73,10 +75,10 @@ const tableInfo = ref({
width
:
280
,
btns
:
(
scope
)
=>
{
let
row
=
scope
.
row
,
btnArr
:
any
=
[
{
label
:
"手动执行"
,
value
:
"run"
},
{
label
:
"编辑"
,
value
:
"edit"
},
{
label
:
"手动执行"
,
value
:
"run"
,
disabled
:
row
.
status
!=
'Y'
&&
row
.
status
!=
'E'
},
{
label
:
"编辑"
,
value
:
"edit"
,
disabled
:
row
.
status
!=
'Y'
&&
row
.
status
!=
'E'
},
{
label
:
"日志"
,
value
:
"log"
},
{
label
:
"删除"
,
value
:
"delete"
}
{
label
:
"删除"
,
value
:
"delete"
,
disabled
:
row
.
status
!=
'Y'
&&
row
.
status
!=
'E'
}
];
if
(
row
.
confirmStatus
==
'Y'
)
{
btnArr
.
splice
(
0
,
0
,
{
label
:
"结果修改"
,
value
:
"modify"
});
...
...
@@ -111,7 +113,7 @@ const tableBtnClick = (scope, btn) => {
if
(
type
==
'confirm'
||
type
==
'modify'
||
type
==
'edit'
||
type
==
"log"
)
{
toPath
(
type
);
}
else
if
(
type
==
'run'
)
{
const
params
=
{
guid
:
currTableData
.
value
.
guid
};
const
params
=
{
guid
:
currTableData
.
value
.
guid
};
runExecTask
(
params
).
then
((
res
:
any
)
=>
{
if
(
res
.
code
==
proxy
.
$passCode
)
{
getTableData
();
...
...
src/views/data_inventory/taskDetail.vue
View file @
adaa0ab
...
...
@@ -32,6 +32,7 @@ const fullPath = route.fullPath;
const
assetStore
=
useDataAssetStore
();
const
loading
=
ref
(
false
);
const
showBtns
=
ref
(
true
);
const
gradeList
=
ref
([]);
const
treeData
=
ref
([
{
...
...
@@ -376,6 +377,7 @@ const getTaskDetail = (param) => {
loading
.
value
=
false
;
if
(
res
.
code
==
proxy
.
$passCode
)
{
taskDetail
.
value
=
res
.
data
||
{};
taskDetail
.
value
.
confirmStatus
!=
'Y'
&&
(
showBtns
.
value
=
true
);
getFieldCount
()
getSheetFieldList
({
type
:
1
});
getFieldTree
()
...
...
@@ -795,6 +797,7 @@ onActivated(() => {
onBeforeMount
(()
=>
{
if
(
route
.
query
.
type
==
'log'
)
{
showBtns
.
value
=
false
;
getTaskDetail
({
guid
:
route
.
query
.
guid
,
execGuid
:
route
.
query
.
execGuid
});
}
else
{
getTaskDetail
({
guid
:
route
.
query
.
guid
});
...
...
@@ -813,7 +816,7 @@ onMounted(() => {
<
template
>
<div
class=
"container_wrap full flex"
v-loading=
"loading"
>
<div
class=
"main_wrap full"
>
<div
class=
"content_main panel"
>
<div
class=
"content_main panel"
:class=
"
{ full: !showBtns }"
>
<div
class=
"template_panel"
:class=
"
{ active: !titleClose }">
<div
class=
"panel_title"
>
<div
class=
"title_wrap"
>
...
...
@@ -958,7 +961,7 @@ onMounted(() => {
</div>
</div>
</div>
<div
class=
"tool_btns"
>
<div
class=
"tool_btns"
v-if=
"showBtns"
>
<div
class=
"btns"
>
<el-button
@
click=
"btnClick({ value: 'cancel' })"
>
暂存
</el-button>
<el-button
type=
"primary"
@
click=
"btnClick({ value: 'confirm' })"
>
确认变更
</el-button>
...
...
@@ -1034,6 +1037,10 @@ onMounted(() => {
padding
:
0
16px
;
}
&
.full
{
height
:
100%
;
}
.template_panel
{
padding
:
0
16px
;
height
:
40px
;
...
...
src/views/data_inventory/taskLog.vue
View file @
adaa0ab
...
...
@@ -52,6 +52,8 @@ const tableInfo = ref({
{
label
:
"结果状态"
,
field
:
"status"
,
width
:
TableColumnWidth
.
STATE
,
align
:
'center'
,
type
:
"tag"
,
getName
:
(
scope
)
=>
{
return
filterVal
(
scope
.
row
.
status
,
'confirmStatus'
);
},
tagType
:
(
scope
)
=>
{
return
scope
.
row
.
confirmStatus
==
'Y'
?
'success'
:
'warning'
;
}
},
],
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment