From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index da720d5..7442245 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>
@@ -35,7 +35,7 @@
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
</template>
</el-table-column>
- <el-table-column prop="begin_time" label="任务时间" />
+ <el-table-column prop="create_time" label="任务时间" />
<el-table-column prop="creator_name" label="创建人" />
<el-table-column label="操作" >
<template #default="scope">
@@ -59,15 +59,24 @@
<!-- 添加任务 -->
<AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
<!-- 当前任务详情 -->
- <CurrentTaskDetails v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
+ <CurrentTaskDetails
+ v-if="isShowCurrentTaskDetails"
+ v-model:show="isShowCurrentTaskDetails"
+ :id="rowData.id"/>
+ <!-- 历史任务详情 -->
+ <DeviceJobDetails
+ v-if="isShowDeviceJobDetails"
+ v-model:show="isShowDeviceJobDetails"
+ :wayLineJodInfoId="rowData.id"/>
</template>
<script setup>
import SearchBox from '../SearchBox.vue';
import AddTask from './AddTask.vue';
-import CurrentTaskDetails from './CurrentTaskDetails/CurrentTaskDetails.vue';
+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,8 @@
});
const jobListData = ref([]);
const total = ref(0);
+let isShowDeviceJobDetails = ref(false);
+let isShowCurrentTaskDetails = ref(false);
// 获取任务列表
const getJobList = () => {
@@ -90,7 +101,7 @@
const statusMap = {
1: '待执行',
2: '执行中',
- 3: '已完成',
+ 3: '已执行',
4: '已取消',
5: '执行失败'
};
@@ -98,14 +109,15 @@
};
// 查看当前任务详情 如果是一台机则显示详情 如果是多台机则进入集群调度(暂未开发)
-let isShowCurrentTaskDetails = ref(false);
let rowData = ref({});
const handleDetail = (row) => {
- if (row.device_sns.length === 1){
+ if (!row.device_sns.length) return ElMessage.warning('没有device_sns');
+ if (row.device_sns.length !== 1) return ElMessage.success('即将跳转到集群调度');
+ rowData.value = row? row : {};
+ if (row.status === 2 || row.status === 1){
isShowCurrentTaskDetails.value = true;
- rowData.value = row? row : {};
- }else{
- ElMessage.warning('即将跳转到集群调度');
+ } else{
+ isShowDeviceJobDetails.value = true
}
};
--
Gitblit v1.9.3