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/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 260 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 201 insertions(+), 59 deletions(-)
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 0a9c5a6..591a78a 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -1,32 +1,38 @@
<!-- 巡检任务情况-详情 -->
<template>
<el-dialog
+ class="inspection-rask-details-dialog ztzf-dialog"
v-model="isShowDetailsDialog"
- title="巡检任务详情"
- :width="pxToRem(1000)"
+ :width="pxToRem(1500)"
:close-on-click-modal="false"
:destroy-on-close="true"
>
+ <template #header="{ titleId, titleClass }">
+ <div class="my-header">
+ <img src="/src/assets/images/home/homeLeft/inspection-union.png" alt="" />
+ <span :id="titleId" :class="titleClass">巡检任务详情</span>
+ </div>
+ </template>
<!-- 搜索 -->
<el-form :model="searchForm" inline>
<div class="search-row">
<el-form-item>
- <el-input v-model="searchForm.key_word" placeholder="请输入任务/机巢名称" clearable />
+ <el-input class="ztzf-input" v-model="searchForm.key_word" placeholder="请输入任务/机巢名称" clearable />
</el-form-item>
<el-form-item label="关联算法">
- <el-select v-model="searchForm.ai_types" placeholder="请选择">
+ <el-select :teleported="false" class="ztzf-select" v-model="searchForm.ai_types" placeholder="请选择">
<el-option v-for="item in taskAlgorithm" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="任务状态">
- <el-select v-model="searchForm.status" placeholder="请选择" clearable>
+ <el-select :teleported="false" class="ztzf-select" v-model="searchForm.status" placeholder="请选择" clearable>
<el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="search-row">
<el-form-item label="选择机巢">
- <el-select v-model="searchForm.device_sn" placeholder="请选择">
+ <el-select :teleported="false" class="ztzf-select" v-model="searchForm.device_sn" placeholder="请选择">
<el-option
v-for="item in deviceList"
:label="item.nickname"
@@ -37,6 +43,8 @@
</el-form-item>
<el-form-item>
<el-date-picker
+ popper-class="custom-date-picker"
+ class="ztzf-date-picker"
v-model="dateRange"
type="daterange"
range-separator="至"
@@ -47,43 +55,98 @@
/>
</el-form-item>
<el-form-item>
- <el-button @click="handleReset">重置</el-button>
- <el-button type="primary" @click="handleSearch">查询</el-button>
+ <div class="reset" @click="handleReset">重置</div>
+ <div class="searchs" @click="handleSearch">搜索</div>
</el-form-item>
</div>
</el-form>
<!-- 表格 -->
- <el-table :data="taskDetailData" style="width: 100%">
- <el-table-column label="序号" width="60">
- <template #default="scope">
- {{ (taskDetailParams.page - 1) * taskDetailParams.limit + scope.$index + 1 }}
- </template>
- </el-table-column>
- <el-table-column prop="job_info_num" label="任务编号" />
- <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="industry_type_str" label="任务类型" />
- <el-table-column prop="begin_time" label="任务时间" />
- <el-table-column prop="name" label="关联事件" />
- <el-table-column label="操作"> <el-button link type="primary" size="small">查看</el-button></el-table-column>
- </el-table>
+ <div class="tabledata ztzf-table">
+ <el-table
+ :data="taskDetailData"
+ :row-class-name="tableRowClassName"
+ :row-style="{ height: '45px', fontSize: '14px', 'text-align': 'center' }"
+ :header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
+ >
+ <el-table-column label="序号" type="index" width="60">
+ <template #default="{ $index }">
+ {{ ($index + 1).toString().padStart(2, '0') }}
+ </template>
+ </el-table-column>
+ <el-table-column show-overflow-tooltip prop="job_info_num" label="任务编号" />
+ <el-table-column prop="name" show-overflow-tooltip label="任务名称" />
+ <el-table-column prop="device_names" show-overflow-tooltip label="所属机巢" />
+ <el-table-column show-overflow-tooltip prop="ai_type_str" 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 === 5
+ ? 'fail '
+ : ' '
+ "
+ >
+ {{
+ scope.row.status === 1
+ ? '待执行'
+ : scope.row.status === 2
+ ? '执行中'
+ : scope.row.status === 3
+ ? '已执行'
+ : scope.row.status === 5
+ ? '执行失败'
+ : ''
+ }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column show-overflow-tooltip prop="industry_type_str" label="任务类型" />
+ <el-table-column prop="cycle_time_value" label="任务时间" width="150" />
+ <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">
+ <template #default="scope">
+ <div class="ztzf-view" @click="viewDetail(scope.row)">查看</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
<!-- 分页 -->
- <div class="pagination">
+ <div style="display: flex; justify-content: center; margin: 15px 0">
<el-pagination
- v-model:current-page="pageParams.page"
- v-model:page-size="pageParams.limit"
+ class="ztzf-pagination"
+ v-model:current-page="pageParams.current"
+ v-model:page-size="pageParams.size"
:page-sizes="[10, 20, 30, 50]"
background
- :disabled="disabled"
- layout="total, sizes, prev, pager, next, jumper"
+ layout=" prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</el-dialog>
+ <!-- 当前任务详情 -->
+ <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 { pxToRem } from '@/utils/rem'
@@ -91,6 +154,9 @@
import { getDictionary } from '@/api/system/dict'
import { selectDevicePage } from '@/api/home/machineNest'
import { getMultipleDictionary } from '@/api/system/dictbiz'
+import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue'
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
+import { ElMessage } from 'element-plus'
const isShowDetailsDialog = defineModel('show')
const dateRange = ref('')
const searchForm = reactive({
@@ -104,8 +170,8 @@
const statusOptions = [
{ label: '待执行', value: 1 },
{ label: '执行中', value: 2 },
- { label: '已完成', value: 3 },
- { label: '已取消', value: 4 },
+ { label: '已执行', value: 3 },
+
{ label: '执行失败', value: 5 },
]
// 设备页面参数
@@ -120,16 +186,16 @@
const taskDetailData = ref([])
// 表格参数
const taskDetailParams = reactive({
- page: 1,
- limit: 10,
+ current: 1,
+ size: 10,
searchParams: {},
})
// 分页
const total = ref(0)
// 分页参数
let pageParams = reactive({
- page: 1,
- limit: 10,
+ current: 1,
+ size: 10,
})
// 日期选择
const changeselect = () => {
@@ -141,9 +207,9 @@
const handleReset = () => {
dateRange.value = null
Object.keys(searchForm).forEach(key => {
- if (key == 'start_date' || key == 'end_date') {
+ if (key === 'start_date' || key === 'end_date') {
searchForm[key] = null
- } else if (key == 'ai_types') {
+ } else if (key === 'ai_types') {
searchForm[key] = []
} else {
searchForm[key] = ''
@@ -154,20 +220,19 @@
}
// 查询
const handleSearch = () => {
- taskDetailParams.page = 1
- taskDetailParams.limit = 10
+ taskDetailParams.current = 1
+ taskDetailParams.size = 10
taskDetailParams.searchParams = searchForm
- console.log('taskDetailParams.value', taskDetailParams)
getJobList()
}
// 分页大小改变
const handleSizeChange = val => {
- pageParams.limit = val
+ taskDetailParams.size = val
getJobList()
}
// 页码改变
const handleCurrentChange = val => {
- pageParams.page = val
+ taskDetailParams.current = val
getJobList()
}
// 获取任务列表
@@ -176,6 +241,7 @@
if (res.data.code !== 0) return
taskDetailData.value = res.data.data.records
total.value = res.data.data.total
+
})
}
// 机巢列表数据
@@ -200,17 +266,47 @@
const algorithmChange = val => {
searchForm.ai_types = val
}
+const tableRowClassName = ({ row, rowIndex }) => {
+ if (rowIndex % 2 === 1) {
+ return 'warning-row'
+ } else {
+ return 'success-row'
+ }
+}
+// 查看
+const isShowCurrentTaskDetails = ref(false)
+const isShowDeviceJobDetails = ref(false)
+let rowData = ref({});
+const viewDetail = row => {
+ 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;
+ } else{
+ isShowDeviceJobDetails.value = true
+ }
+}
onMounted(() => {
requestDictionary()
getJobList()
getDeviceList()
})
</script>
+<style lang="scss">
+/* 修改日期单元格背景色 */
+.custom-date-picker .el-picker-panel__body {
+ background: #012350 !important;
+ color: #fff !important;
+}
+
+</style>
<style scoped lang="scss">
.search-row {
display: flex;
justify-content: space-between;
align-items: center;
+ margin: 0 37px;
.el-form-item {
flex: 1;
}
@@ -218,31 +314,77 @@
:deep(.el-form) {
.el-form-item {
margin-bottom: 0;
- margin-right: 20px;
.el-form-item__label {
color: #fff;
- }
-
- .el-input,
- .el-select,
- .el-date-editor {
- width: 200px;
- --el-input-bg-color: transparent;
- --el-input-border-color: rgba(255, 255, 255, 0.3);
- --el-input-text-color: #fff;
- --el-input-placeholder-color: rgba(255, 255, 255, 0.5);
}
}
}
:deep() {
- .el-date-editor.el-input,
- .el-date-editor.el-input__wrapper {
- height: var(--el-input-height, var(--el-component-size));
- width: 0 !important;
+ .el-form-item__label {
+ font-family: Segoe UI, Segoe UI;
+ font-weight: 400;
+ font-size: 16px;
+ color: #ffffff;
}
}
-.pagination {
- margin-top: 20px;
+
+.el-table__body {
+ border-collapse: collapse;
+}
+
+.my-header {
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: 12px;
+}
+.reset {
+ width: 137px;
+ height: 32px;
+ cursor: pointer;
+ background: url('/src/assets/images/home/homeLeft/inspection-reset.png') no-repeat center;
+ background-size: 100% 100%;
+ color: #fff;
+ font-weight: bold;
+ font-size: 14px;
+ text-align: center;
+}
+.searchs {
+ margin-left: 23px;
+ cursor: pointer;
+ width: 137px;
+ height: 32px;
+ background: url('/src/assets/images/home/homeLeft/inspection-select.png') no-repeat center;
+ background-size: 100% 100%;
+ color: #fff;
+ font-weight: bold;
+ font-size: 14px;
+ text-align: center;
+}
+.tabledata {
+ padding: 0 16px;
+ overflow: hidden;
+ // height: 640px;
+ overflow-y: scroll !important;
+}
+
+// 任务状态颜色
+// 待执行
+.pending {
+ color: #ffe17e;
+}
+// 执行中
+.distributed {
+ color: #ffa768;
+}
+// 已执行
+.finish {
+ color: #8effac;
+}
+
+// 执行失败
+.fail {
+ color: #ff8e8e;
}
</style>
+
--
Gitblit v1.9.3