fix(app): hide account progress when idle; screenshot uses selected browse_type
This commit is contained in:
@@ -119,6 +119,22 @@ function statusTagType(status = '') {
|
||||
return 'info'
|
||||
}
|
||||
|
||||
function showRuntimeProgress(acc) {
|
||||
if (!acc?.is_running) return false
|
||||
const statusText = String(acc.status || '')
|
||||
const detailText = String(acc.detail_status || '')
|
||||
|
||||
if (!statusText || statusText === '未开始') return false
|
||||
|
||||
// 浏览完成后(包含等待截图/截图中等阶段)不再展示进度条与内容/附件
|
||||
if (statusText.includes('截图') || statusText.includes('等待截图')) return false
|
||||
if (detailText.includes('截图') || detailText.includes('等待截图')) return false
|
||||
if (detailText.includes('浏览完成') || detailText.includes('任务完成')) return false
|
||||
if (statusText.includes('已完成')) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
async function refreshStats() {
|
||||
statsLoading.value = true
|
||||
try {
|
||||
@@ -557,19 +573,19 @@ onBeforeUnmount(() => {
|
||||
</el-checkbox-group>
|
||||
|
||||
<div class="card-main">
|
||||
<div class="card-title">
|
||||
<span class="card-name">{{ acc.username }}</span>
|
||||
<el-tag size="small" :type="statusTagType(acc.status)" effect="light">{{ acc.status }}</el-tag>
|
||||
</div>
|
||||
<div class="card-sub app-muted">
|
||||
{{ acc.remark || '—' }}
|
||||
<span v-if="acc.detail_status"> · {{ acc.detail_status }}</span>
|
||||
<span v-if="acc.elapsed_display"> · {{ acc.elapsed_display }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-title">
|
||||
<span class="card-name">{{ acc.username }}</span>
|
||||
<el-tag size="small" :type="statusTagType(acc.status)" effect="light">{{ acc.status }}</el-tag>
|
||||
</div>
|
||||
<div class="card-sub app-muted">
|
||||
{{ acc.remark || '—' }}
|
||||
<span v-if="showRuntimeProgress(acc) && acc.detail_status"> · {{ acc.detail_status }}</span>
|
||||
<span v-if="showRuntimeProgress(acc) && acc.elapsed_display"> · {{ acc.elapsed_display }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="progress">
|
||||
<div v-if="showRuntimeProgress(acc)" class="progress">
|
||||
<el-progress :percentage="toPercent(acc)" :stroke-width="10" :show-text="false" />
|
||||
<div class="progress-meta app-muted">
|
||||
<span>内容 {{ acc.progress_items || 0 }}/{{ acc.total_items || 0 }}</span>
|
||||
|
||||
Reference in New Issue
Block a user