Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
electron-printer
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhuzhequan
electron-printer
Commits
ce7a2bfb
Commit
ce7a2bfb
authored
Jul 31, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 问题修改
parent
be92fa13
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
17 deletions
+18
-17
src/views/dtf-batch-detail/detail.vue
+1
-1
src/views/dtf-list/index.vue
+17
-16
No files found.
src/views/dtf-batch-detail/detail.vue
View file @
ce7a2bfb
...
@@ -45,7 +45,7 @@ export default {
...
@@ -45,7 +45,7 @@ export default {
craftType
:
{
label
:
"工艺类型"
,
value
:
""
},
craftType
:
{
label
:
"工艺类型"
,
value
:
""
},
standardDesignImage
:
{
label
:
"规范素材"
,
value
:
""
},
standardDesignImage
:
{
label
:
"规范素材"
,
value
:
""
},
createTime
:
{
label
:
"创建时间"
,
value
:
""
},
createTime
:
{
label
:
"创建时间"
,
value
:
""
},
l
ayoutStatus
:
{
label
:
"排版状态"
,
value
:
""
},
batchL
ayoutStatus
:
{
label
:
"排版状态"
,
value
:
""
},
status
:
{
label
:
"操作单状态"
,
value
:
""
}
status
:
{
label
:
"操作单状态"
,
value
:
""
}
},
},
platformJson
:
platformJson
,
platformJson
:
platformJson
,
...
...
src/views/dtf-list/index.vue
View file @
ce7a2bfb
...
@@ -97,10 +97,9 @@ export default {
...
@@ -97,10 +97,9 @@ export default {
slotName
:
"batchLayoutStatus"
slotName
:
"batchLayoutStatus"
},
},
{
{
prop
:
"
failReas
on"
,
prop
:
"
spDescripti
on"
,
label
:
"处理详情"
,
label
:
"处理详情"
,
width
:
300
,
width
:
300
slotName
:
"failReason"
},
},
{
{
label
:
"排版参数"
,
label
:
"排版参数"
,
...
@@ -180,7 +179,10 @@ export default {
...
@@ -180,7 +179,10 @@ export default {
});
});
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
this
.
tableList
=
res
.
data
.
records
||
[];
this
.
tableList
=
(
res
.
data
.
records
||
[]).
map
(
row
=>
({
...
row
,
batchLayoutStatus
:
row
.
batchLayoutStatus
||
""
}));
this
.
pageInfo
.
total
=
res
.
data
.
total
;
this
.
pageInfo
.
total
=
res
.
data
.
total
;
}
}
...
@@ -312,20 +314,22 @@ export default {
...
@@ -312,20 +314,22 @@ export default {
{
skipLoading
:
true
}
{
skipLoading
:
true
}
);
);
const
list
=
res
.
code
===
200
?
res
.
data
.
records
||
[]
:
[];
const
list
=
res
.
code
===
200
?
res
.
data
.
records
||
[]
:
[];
return
list
[
0
]
||
null
;
const
row
=
list
[
0
];
if
(
!
row
)
return
null
;
return
{
...
row
,
batchLayoutStatus
:
row
.
batchLayoutStatus
||
""
};
}
catch
{
}
catch
{
return
null
;
return
null
;
}
}
},
},
checkTaskStatus
(
task
,
batch
)
{
checkTaskStatus
(
task
,
batch
)
{
if
(
batch
&&
[
3
,
5
].
includes
(
batch
.
batchLayoutStatus
))
{
if
(
batch
&&
[
3
,
4
,
5
].
includes
(
batch
.
batchLayoutStatus
))
{
task
.
step
=
"downloading"
;
task
.
step
=
"downloading"
;
task
.
progress
=
"排版完成,正在下载素材..."
;
task
.
progress
=
"排版完成,正在下载素材..."
;
this
.
doComposingDownload
(
task
.
id
);
this
.
doComposingDownload
(
task
.
id
);
}
else
if
(
batch
&&
batch
.
batchLayoutStatus
===
4
)
{
task
.
step
=
"error"
;
task
.
progress
=
"排版失败:"
+
(
batch
?.
failReason
||
"未知原因"
);
}
else
{
}
else
{
task
.
progress
=
"排版处理中,等待完成后自动下载..."
;
task
.
progress
=
"排版处理中,等待完成后自动下载..."
;
this
.
ensureComposingPoll
();
this
.
ensureComposingPoll
();
...
@@ -620,16 +624,13 @@ export default {
...
@@ -620,16 +624,13 @@ export default {
</
template
>
</
template
>
<
template
#
batchLayoutStatus=
"scope"
>
<
template
#
batchLayoutStatus=
"scope"
>
<el-tag
<el-tag
:type=
"batchLayoutStatusList[scope.row?.batchLayoutStatus].type"
v-if=
"batchLayoutStatusList[scope.row?.batchLayoutStatus]"
:type=
"batchLayoutStatusList[scope.row.batchLayoutStatus].type"
>
{{
>
{{
batchLayoutStatusList
[
scope
.
row
?
.
batchLayoutStatus
].
label
batchLayoutStatusList
[
scope
.
row
.
batchLayoutStatus
].
label
}}
</el-tag
}}
</el-tag
>
>
</
template
>
<span
v-else
>
-
</span>
<
template
#
failReason=
"scope"
>
<div
style=
"white-space: pre-line"
>
<span
v-html=
"scope.row?.failReason"
></span>
</div>
</
template
>
</
template
>
<
template
#
operation=
"scope"
>
<
template
#
operation=
"scope"
>
...
...
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