From dfac8531d4ed65183ebffcbc7f88aea16f6ac64b Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 18 Apr 2025 19:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index a4aa8c4..8ed3524 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -20,10 +20,10 @@
<el-table-column label="任务状态" >
<template #default="scope">
<span :style="{
- color: scope.row.status === 1 ? '#e36913' :
- scope.row.status === 2 ? '#ffc398' :
- scope.row.status === 3 ? '#afd9fb' :
- scope.row.status === 4 ? '#11c4ff' : '8cfea7'
+ color: scope.row.status === 1 ? '#ffe17e' :
+ scope.row.status === 2 ? '#ffa768' :
+ scope.row.status === 3 ? '#8effac' :
+ scope.row.status === 5 ? '#ff8e8e':''
}">
{{ scope.row.status ? getStatusText(scope.row.status) : '' }}
</span>
@@ -59,7 +59,15 @@
<!-- 添加任务 -->
<AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
<!-- 当前任务详情 -->
- <CurrentTaskDetails v-if="isShowCurrentTaskDetails" v-model:show="isShowCurrentTaskDetails" :id="rowData.id"/>
+ <CurrentTaskDetails
+ v-if="isShowCurrentTaskDetails"
+ v-model:show="isShowCurrentTaskDetails"
+ :id="rowData.id"/>
+ <!-- 历史人物详情 -->
+ <DeviceJobDetails
+ v-if="isShowDeviceJobDetails"
+ v-model:show="isShowDeviceJobDetails"
+ :wayLineJodInfoId="wayLineJodInfoId"/>
</template>
<script setup>
@@ -68,6 +76,7 @@
import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue';
import { jobList } from '@/api/home/task';
import { ElMessage } from 'element-plus'
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
const jobListParams = reactive({
current: 1,
@@ -76,6 +85,9 @@
});
const jobListData = ref([]);
const total = ref(0);
+let wayLineJodInfoId = ref('')
+let isShowDeviceJobDetails = ref(false);
+let isShowCurrentTaskDetails = ref(false);
// 获取任务列表
const getJobList = () => {
@@ -90,7 +102,7 @@
const statusMap = {
1: '待执行',
2: '执行中',
- 3: '已完成',
+ 3: '已执行',
4: '已取消',
5: '执行失败'
};
@@ -98,15 +110,16 @@
};
// 查看当前任务详情 如果是一台机则显示详情 如果是多台机则进入集群调度(暂未开发)
-let isShowCurrentTaskDetails = ref(true);
let rowData = ref({});
const handleDetail = (row) => {
if (row.device_sns.length === 1){
+ console.log(row)
if (row.status === 2 || row.status === 1){
rowData.value = row? row : {};
isShowCurrentTaskDetails.value = true;
} else{
- ElMessage.warning('todo 跳历史任务详情')
+ wayLineJodInfoId.value = row.id
+ isShowDeviceJobDetails.value = true
}
}else{
ElMessage.warning('即将跳转到集群调度');
--
Gitblit v1.9.3