From e5278b8b1a5ce56803f2ffcab711c9c5f5339489 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 17 Apr 2025 18:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index b5e7ed4..c74eacf 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -86,11 +86,9 @@
? 'distributed'
: scope.row.status === 3
? 'finish '
-
-
- : 'fail '
- "
- >
+ : scope.row.status === 5
+ ? 'fail '
+ : ' '">
{{
scope.row.status === 1
? '待执行'
@@ -98,8 +96,9 @@
? '执行中'
: scope.row.status === 3
? '已执行'
-
- : '执行失败'
+ : scope.row.status === 5
+ ? '执行失败'
+ : ''
}}
</span>
</template>
@@ -115,7 +114,7 @@
</el-table>
</div>
<!-- 分页 -->
- <div style="display: flex; justify-content: center;margin:15px 0;">
+ <div style="display: flex; justify-content: center; margin: 15px 0">
<el-pagination
class="ztzf-pagination"
v-model:current-page="pageParams.current"
@@ -150,8 +149,8 @@
{ label: '待执行', value: 1 },
{ label: '执行中', value: 2 },
{ label: '已完成', value: 3 },
-
- { label: '执行失败', value: 4 },
+
+ { label: '执行失败', value: 5 },
]
// 设备页面参数
const devicePageParams = ref({
@@ -216,12 +215,11 @@
}
// 获取任务列表
const getJobList = () => {
-// 事件状态:0 =待处理，1=待分拨，2=待处理，3=处理中，4=已完成 5=已完结
+ // 事件状态:0 =待处理，1=待分拨，2=待处理，3=处理中，4=已完成 5=已完结
jobList(taskDetailParams).then(res => {
if (res.data.code !== 0) return
taskDetailData.value = res.data.data.records
total.value = res.data.data.total
-
})
}
// 机巢列表数据
@@ -327,20 +325,22 @@
}
// 任务状态颜色
+// 待执行
.pending {
- color: #e36913;
+ color: #ffe17e;
}
+// 执行中
.distributed {
- color: #ffc398;
+ color: #FFA768;
}
+// 已执行
.finish {
- color: #afd9fb;
+ color: #8effac;
}
-.cancel {
- color: #11c4ff;
-}
+
+// 执行失败
.fail {
- color: #8cfea7;
+ color: #ff8e8e;
}
</style>
--
Gitblit v1.9.3