From 80790ccc8b8ee6ac8db201f0f6c2d136fefd5a69 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 12 Apr 2025 08:52:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 201 ++++++++++++++++++++++++++++++++------------------
1 files changed, 128 insertions(+), 73 deletions(-)
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 2dd8118..bd4d5ea 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -1,7 +1,7 @@
<!-- 巡检任务情况-详情 -->
<template>
<el-dialog
- class="data-dialog"
+ class="inspection-rask-details-dialog"
v-model="isShowDetailsDialog"
:width="pxToRem(1000)"
:close-on-click-modal="false"
@@ -76,10 +76,41 @@
<el-table-column prop="name" label="任务名称" />
<el-table-column prop="device_names" label="所属机巢" />
<el-table-column prop="ai_type_str" label="关联算法" />
- <el-table-column prop="status" label="任务状态" />
+ <el-table-column prop="status" label="任务状态">
+ <template #default="scope">
+ <span
+ :class="
+ scope.row.status == 1
+ ? 'pending '
+ : scope.row.status == 2
+ ? 'distributed'
+ : scope.row.status == 3
+ ? 'finish '
+ : scope.row.status == 4
+ ? 'cancel '
+ : 'fail '
+ "
+ >{{
+ scope.row.status == 1
+ ? '待执行'
+ : scope.row.status == 2
+ ? '执行中'
+ : scope.row.status == 3
+ ? '完成'
+ : scope.row.status == 4
+ ? '取消'
+ : '失败'
+ }}</span
+ >
+ </template>
+ </el-table-column>
<el-table-column prop="industry_type_str" label="任务类型" />
<el-table-column prop="begin_time" label="任务时间" />
- <el-table-column prop="name" label="关联事件" />
+ <el-table-column prop="event_number" label="关联事件">
+ <template #default="scope">
+ <span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="操作" width="80"> <div class="view">查看</div></el-table-column>
</el-table>
</div>
@@ -90,7 +121,6 @@
v-model:page-size="pageParams.limit"
:page-sizes="[10, 20, 30, 50]"
background
- :disabled="disabled"
layout=" prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@@ -134,8 +164,8 @@
const taskDetailData = ref([])
// 表格参数
const taskDetailParams = reactive({
- page: 1,
- limit: 10,
+ current: 1,
+ size: 10,
searchParams: {},
})
// 分页
@@ -171,7 +201,6 @@
taskDetailParams.page = 1
taskDetailParams.limit = 10
taskDetailParams.searchParams = searchForm
- console.log('taskDetailParams.value', taskDetailParams)
getJobList()
}
// 分页大小改变
@@ -190,7 +219,6 @@
if (res.data.code !== 0) return
taskDetailData.value = res.data.data.records
total.value = res.data.data.total
- console.log('任务列表', taskDetailData.value)
})
}
// 机巢列表数据
@@ -312,6 +340,7 @@
left: 50%;
transform: translateX(-50%);
border-radius: 4px;
+ bottom: 5px;
}
:deep(.el-pagination button) {
background: center center no-repeat none !important;
@@ -403,9 +432,25 @@
line-height: 27px;
cursor: pointer;
}
+// 任务状态颜色
+.pending {
+ color: #e36913;
+}
+.distributed {
+ color: #ffc398;
+}
+.finish {
+ color: #afd9fb;
+}
+.cancel {
+ color: #11c4ff;
+}
+.fail {
+ color: #8cfea7;
+}
</style>
-<style>
-.data-dialog {
+<style lang="scss">
+.inspection-rask-details-dialog {
width: 1270px;
height: 856px;
background: #0f1929;
@@ -422,71 +467,81 @@
rgba(27, 148, 255, 1)
)
2 2;
-}
-/* 头部 */
-.el-dialog__header {
- width: 1270px;
- height: 47px;
- margin-bottom: 14px;
- background: url('/src/assets/images/home/homeLeft/inspection-vector.png') no-repeat center;
- background-size: 100% 100%;
- font-weight: bold;
- font-size: 16px;
- line-height: 47px;
-}
+ /* 头部 */
+ .el-dialog__header {
+ width: 1270px;
+ height: 47px;
+ margin-bottom: 14px;
+ background: url('/src/assets/images/home/homeLeft/inspection-vector.png') no-repeat center;
+ background-size: 100% 100%;
+ font-weight: bold;
+ font-size: 16px;
+ line-height: 47px;
+ }
-.el-dialog .el-dialog__header {
- /* margin: 0px !important; */
- padding: 0px !important;
- padding-left: 0px !important;
-}
-/* 头部 */
-.el-dialog__title {
- width: 112px;
- height: 19px;
- font-family: Segoe UI, Segoe UI;
- font-weight: bold;
- font-size: 16px;
- line-height: 16px;
- text-shadow: 0px 0px 5px rgba(154, 218, 255, 0.6);
- text-align: left;
- font-style: normal;
- text-transform: none;
- background: linear-gradient(90deg, #fbfdff 0%, #86d4ff 100%);
- margin-left: 16px;
- -webkit-background-clip: text; /* 背景被裁剪成文字的前景色 */
- -webkit-text-fill-color: transparent; /* 文字填充颜色变透明 */
-}
-.el-table__inner-wrapper:before {
- height: 0 !important;
-}
-.el-table .warning-row {
- --el-table-tr-bg-color: rgba(22, 43, 74, 0.79);
-}
-.el-table .warning-row::after {
- position: absolute;
- content: '';
- left: 0;
- width: 100%;
- border-bottom: 1px solid;
+ .el-dialog .el-dialog__header {
+ /* margin: 0px !important; */
+ padding: 0px !important;
+ padding-left: 0px !important;
+ }
+ /* 头部 */
+ .el-dialog__title {
+ width: 112px;
+ height: 19px;
+ font-family: Segoe UI, Segoe UI;
+ font-weight: bold;
+ font-size: 16px;
+ line-height: 16px;
+ text-shadow: 0px 0px 5px rgba(154, 218, 255, 0.6);
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+ background: linear-gradient(90deg, #fbfdff 0%, #86d4ff 100%);
+ margin-left: 16px;
+ -webkit-background-clip: text; /* 背景被裁剪成文字的前景色 */
+ -webkit-text-fill-color: transparent; /* 文字填充颜色变透明 */
+ }
+ .el-table__inner-wrapper:before {
+ height: 0 !important;
+ }
+ .el-table .warning-row {
+ --el-table-tr-bg-color: rgba(22, 43, 74, 0.79);
+ }
+ .el-table .warning-row::after {
+ position: absolute;
+ content: '';
+ left: 0;
+ width: 100%;
+ border-bottom: 1px solid;
- border-image: linear-gradient(90deg, rgba(25, 162, 255, 0) 10%, rgba(20, 125, 202, 1) 50%, rgba(25, 162, 255, 0) 90%)
- 2 2 2 2;
-}
-.el-table .success-row {
- --el-table-tr-bg-color: #0b1d38;
-}
-.el-table .success-row::after {
- position: absolute;
- content: '';
- left: 0;
- width: 100%;
- border-bottom: 1px solid;
+ border-image: linear-gradient(
+ 90deg,
+ rgba(25, 162, 255, 0) 10%,
+ rgba(20, 125, 202, 1) 50%,
+ rgba(25, 162, 255, 0) 90%
+ )
+ 2 2 2 2;
+ }
+ .el-table .success-row {
+ --el-table-tr-bg-color: #0b1d38;
+ }
+ .el-table .success-row::after {
+ position: absolute;
+ content: '';
+ left: 0;
+ width: 100%;
+ border-bottom: 1px solid;
- border-image: linear-gradient(90deg, rgba(25, 162, 255, 0) 10%, rgba(20, 125, 202, 1) 50%, rgba(25, 162, 255, 0) 90%)
- 2 2 2 2;
-}
-.el-scrollbar__thumb {
- background: #13c6ff !important;
+ border-image: linear-gradient(
+ 90deg,
+ rgba(25, 162, 255, 0) 10%,
+ rgba(20, 125, 202, 1) 79%,
+ rgba(25, 162, 255, 0) 90%
+ )
+ 2 2 2 2;
+ }
+ .el-scrollbar__thumb {
+ background: #13c6ff !important;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3