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
79afc09b
authored
2025-01-02 14:35:21 +0800
by
lxs
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
结果确认界面调整
1 parent
56798cde
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
17 deletions
src/assets/icons/icon-tip.svg
src/router/modules/dataInventory.ts
src/views/data_inventory/taskConfig.vue
src/views/data_inventory/taskDetail.vue
src/views/data_inventory/taskLog.vue
src/assets/icons/icon-tip.svg
0 → 100644
View file @
79afc09
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg
class=
"icon"
width=
"32px"
height=
"32.00px"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M512 40.533333C251.613867 40.533333 40.533333 251.613867 40.533333 512S251.613867 983.466667 512 983.466667 983.466667 772.386133 983.466667 512 772.386133 40.533333 512 40.533333z m26.581333 724.2496c-8.7296 8.004267-18.926933 12.381867-31.300266 12.381867-12.381867 0-22.5792-4.386133-31.325867-12.381867-8.772267-8.746667-12.381867-18.935467-12.381867-31.3344 0-12.381867 3.6096-22.5792 12.381867-30.583466 8.738133-8.746667 18.944-12.381867 31.325867-12.381867 12.373333 0 23.287467 3.6352 32.0256 12.381867 8.021333 8.004267 12.373333 18.2016 12.373333 30.583466 0 13.115733-4.343467 23.3216-13.098667 31.3344z m104.891734-291.387733c-7.287467 8.7296-26.9312 27.665067-58.9824 56.072533-16.034133 13.8496-26.965333 26.965333-34.2528 40.081067-9.454933 16.017067-13.841067 33.518933-13.841067 53.162667v16.768H478.122667v-16.768c0-24.029867 4.386133-45.149867 13.124266-63.368534 10.180267-21.853867 34.218667-49.544533 73.565867-84.5056 11.639467-11.648 20.386133-20.4032 24.763733-26.2144 14.574933-18.218667 21.870933-37.154133 21.870934-57.5488 0-29.149867-8.763733-51.720533-24.763734-67.746133-16.776533-17.4848-40.797867-25.4976-71.3984-25.4976-36.420267 0-63.3856 11.665067-80.8704 35.703467-16.0256 20.394667-24.021333 48.085333-24.021333 83.7632h-57.5744c0-50.986667 13.866667-91.784533 42.999467-122.376534 29.149867-32.059733 69.9136-48.0768 122.3936-48.0768 46.609067 0 83.754667 12.381867 112.1792 38.596267 26.9312 24.763733 40.797867 59.008 40.797866 102.715733-0.008533 32.785067-9.480533 61.184-27.716266 85.239467z"
fill=
"#8a8a8a"
/></svg>
\ No newline at end of file
src/router/modules/dataInventory.ts
View file @
79afc09
...
...
@@ -58,10 +58,13 @@ const routes: RouteRecordRaw[] = [
activeMenu
:
'/data-inventory/classify-grade-manage/task-config'
},
beforeEnter
:
(
to
,
from
)
=>
{
if
(
to
.
query
.
type
==
'confirm'
)
{
to
.
meta
.
title
=
`
${
to
.
query
.
name
}
-结果确认`
;
const
taksExecGuid
=
sessionStorage
.
getItem
(
'taksExecGuid'
)
||
''
;
if
(
taksExecGuid
){
to
.
meta
.
title
=
`
${
to
.
query
.
name
}
-
${
to
.
query
.
status
==
'Y'
?
'查看结果'
:
'结果确认'
}
`
;
to
.
meta
.
editPage
=
to
.
query
.
status
==
'Y'
?
false
:
true
;
}
else
{
to
.
meta
.
title
=
`
${
to
.
query
.
name
}
-结果修改`
;
to
.
meta
.
title
=
`
${
to
.
query
.
name
}
-
${
to
.
query
.
type
==
'confirm'
?
'结果确认'
:
'结果修改'
}
`
;
to
.
meta
.
editPage
=
true
;
}
}
},
...
...
src/views/data_inventory/taskConfig.vue
View file @
79afc09
...
...
@@ -160,12 +160,13 @@ const toPath = (type) => {
},
});
}
else
if
(
type
==
'confirm'
||
type
==
'modify'
)
{
sessionStorage
.
setItem
(
'taksExecGuid'
,
''
);
router
.
push
({
name
:
"taskDetail"
,
query
:
{
guid
:
currTableData
.
value
.
guid
,
name
:
currTableData
.
value
.
taskName
,
execGuid
:
currTableData
.
value
.
execGuid
,
status
:
currTableData
.
value
.
confirmStatus
,
type
},
});
...
...
@@ -227,7 +228,7 @@ onBeforeMount(() => {
<span>
分类分级任务
</span>
<div
class=
"title_tool"
>
<el-button
@
click=
"getTableData"
v-preReClick
>
刷新结果
</el-button>
<span
class=
"tips_text"
>
请及时刷新查看最终
结果
</span>
<span
class=
"tips_text"
>
刷新查看任务最新执行
结果
</span>
</div>
</div>
</div>
...
...
src/views/data_inventory/taskDetail.vue
View file @
79afc09
...
...
@@ -31,9 +31,10 @@ const route = useRoute();
const
userStore
=
useUserStore
();
const
fullPath
=
route
.
fullPath
;
const
assetStore
=
useDataAssetStore
();
const
showBtns
=
route
.
meta
.
editPage
;
const
execGuid
=
sessionStorage
.
getItem
(
'taksExecGuid'
);
const
loading
=
ref
(
false
);
const
showBtns
=
ref
(
true
);
const
gradeList
=
ref
([]);
const
treeData
=
ref
([
{
...
...
@@ -396,7 +397,7 @@ const getTaskDetail = (param) => {
loading
.
value
=
false
;
if
(
res
.
code
==
proxy
.
$passCode
)
{
taskDetail
.
value
=
res
.
data
||
{};
taskDetail
.
value
.
confirmStatus
!=
'Y'
&&
(
showBtns
.
value
=
true
);
//
taskDetail.value.confirmStatus != 'Y' && (showBtns.value = true);
getFieldCount
()
getSheetFieldList
({
type
:
1
});
getFieldTree
()
...
...
@@ -868,9 +869,8 @@ onActivated(() => {
})
onBeforeMount
(()
=>
{
if
(
route
.
query
.
type
==
'log'
)
{
showBtns
.
value
=
false
;
getTaskDetail
({
guid
:
route
.
query
.
guid
,
execGuid
:
route
.
query
.
execGuid
});
if
(
execGuid
)
{
getTaskDetail
({
guid
:
route
.
query
.
guid
,
execGuid
:
execGuid
});
}
else
{
getTaskDetail
({
guid
:
route
.
query
.
guid
});
}
...
...
@@ -969,12 +969,17 @@ onMounted(() => {
@
selectChange=
"selectChange"
@
cascaderChange=
"cascaderChange"
@
search=
"searchField"
/>
<div
class=
"tools_btns"
>
<div
class=
"btns"
>
<el-button
type=
"primary"
plain
@
click=
"btnClick(
{ value: 'batch' })">批量变更分类分级
</el-button>
<el-button
type=
"primary"
plain
@
click=
"btnClick(
{ value: 'status' })">批量确认
</el-button>
<
el-button
plain
@
click=
"btnClick(
{ value: 'export' })">导出
</el-button
>
<el-button
v-if=
"showBtns"
type=
"primary"
plain
@
click=
"btnClick(
{ value: 'batch' })">批量变更分类分级
</el-button>
<el-button
v-if=
"showBtns"
type=
"primary"
plain
@
click=
"btnClick(
{ value: 'status' })">批量确认
</el-button>
<
!--
<el-button
plain
@
click=
"btnClick(
{ value: 'export' })">导出
</el-button>
--
>
</div>
<div
class=
"checkboxs"
>
<el-checkbox
v-model=
"checked1"
@
change=
"getFieldTableData()"
>
仅看多分类
</el-checkbox>
<el-tooltip
effect=
"light"
placement=
"top"
content=
"一个字段只能有一个分类,多分类的字段需要人工确定分类"
>
<el-icon
style=
"margin-left: 8px;"
>
<svg-icon
name=
"icon-tip"
/>
</el-icon>
</el-tooltip>
</div>
</div>
</div>
...
...
@@ -1020,7 +1025,7 @@ onMounted(() => {
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"操作"
:width=
"fieldTableInfo.actionInfo.width"
fixed=
"right"
>
<el-table-column
label=
"操作"
:width=
"fieldTableInfo.actionInfo.width"
fixed=
"right"
v-if=
"showBtns"
>
<
template
#
default=
"scope"
>
<span
class=
"text_btn"
@
click=
"tableBtnClick(scope,
{ value: scope.row['STATE'] === 'Running' ? 'save' : 'edit' })"
...
...
src/views/data_inventory/taskLog.vue
View file @
79afc09
...
...
@@ -46,7 +46,7 @@ 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
.
confirmS
tatus
==
'Y'
?
'success'
:
'warning'
;
return
scope
.
row
.
s
tatus
==
'Y'
?
'success'
:
'warning'
;
}
},
],
...
...
@@ -100,13 +100,14 @@ const tableBtnClick = (scope, btn) => {
};
const
toPath
=
(
type
)
=>
{
sessionStorage
.
setItem
(
'taksExecGuid'
,
currTableData
.
value
.
guid
);
router
.
push
({
name
:
"taskDetail"
,
query
:
{
guid
:
currTableData
.
value
.
taskGuid
,
name
:
currTableData
.
value
.
taskName
,
execGuid
:
currTableData
.
value
.
guid
,
type
status
:
currTableData
.
value
.
status
,
type
:
currTableData
.
value
.
status
==
'Y'
?
'modify'
:
'confirm'
},
});
}
...
...
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