From a7e6761ba0cfccdf33ed552eb2d3b783c8e4ab4a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 20:49:12 +0800
Subject: [PATCH] feat:事件弹窗显示调整
---
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 175 +++++++++++++---------------------------------------------
1 files changed, 39 insertions(+), 136 deletions(-)
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 5732667..b5e7ed4 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -1,9 +1,9 @@
<!-- 巡检任务情况-详情 -->
<template>
<el-dialog
- class="inspection-rask-details-dialog"
+ class="inspection-rask-details-dialog ztzf-dialog"
v-model="isShowDetailsDialog"
- :width="pxToRem(1000)"
+ :width="pxToRem(1500)"
:close-on-click-modal="false"
:destroy-on-close="true"
>
@@ -17,22 +17,22 @@
<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 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 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 class="ztzf-select" v-model="searchForm.device_sn" placeholder="请选择">
<el-option
v-for="item in deviceList"
:label="item.nickname"
@@ -43,6 +43,7 @@
</el-form-item>
<el-form-item>
<el-date-picker
+ class="ztzf-date-picker"
v-model="dateRange"
type="daterange"
range-separator="至"
@@ -53,8 +54,8 @@
/>
</el-form-item>
<el-form-item>
- <div class="reset" @click="handleReset"></div>
- <div class="searchs" @click="handleSearch"></div>
+ <div class="reset" @click="handleReset">重置</div>
+ <div class="searchs" @click="handleSearch">搜索</div>
</el-form-item>
</div>
</el-form>
@@ -63,7 +64,7 @@
<el-table
:data="taskDetailData"
:row-class-name="tableRowClassName"
- :row-style="{ height: '54px', fontSize: '14px', 'text-align': 'center' }"
+ :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">
@@ -79,27 +80,26 @@
<template #default="scope">
<span
:class="
- scope.row.status == 1
+ scope.row.status === 1
? 'pending '
- : scope.row.status == 2
+ : scope.row.status === 2
? 'distributed'
- : scope.row.status == 3
+ : scope.row.status === 3
? 'finish '
- : scope.row.status == 4
- ? 'cancel '
+
+
: 'fail '
"
>
{{
- scope.row.status == 1
+ scope.row.status === 1
? '待执行'
- : scope.row.status == 2
+ : scope.row.status === 2
? '执行中'
- : scope.row.status == 3
- ? '完成'
- : scope.row.status == 4
- ? '取消'
- : '失败'
+ : scope.row.status === 3
+ ? '已执行'
+
+ : '执行失败'
}}
</span>
</template>
@@ -111,12 +111,13 @@
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
</template>
</el-table-column>
- <el-table-column label="操作" width="80"><div class="ztzf-view ">查看</div></el-table-column>
+ <el-table-column label="操作" width="80"><div class="ztzf-view">查看</div></el-table-column>
</el-table>
</div>
<!-- 分页 -->
- <div class="pagination ztzf-pagination">
+ <div style="display: flex; justify-content: center;margin:15px 0;">
<el-pagination
+ class="ztzf-pagination"
v-model:current-page="pageParams.current"
v-model:page-size="pageParams.size"
:page-sizes="[10, 20, 30, 50]"
@@ -149,8 +150,8 @@
{ label: '待执行', value: 1 },
{ label: '执行中', value: 2 },
{ label: '已完成', value: 3 },
- { label: '已取消', value: 4 },
- { label: '执行失败', value: 5 },
+
+ { label: '执行失败', value: 4 },
]
// 设备页面参数
const devicePageParams = ref({
@@ -185,9 +186,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] = ''
@@ -215,10 +216,12 @@
}
// 获取任务列表
const getJobList = () => {
+// 事件状态: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
+
})
}
// 机巢列表数据
@@ -272,67 +275,16 @@
.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-select__wrapper {
- background: #012a50;
- height: 100%;
- padding-left: 20px;
- border: 1px solid #51a8ff;
- box-shadow: none !important;
- }
-
- .el-select__selected-item {
- font-family: Source Han Sans CN, Source Han Sans CN, serif;
-
- line-height: 18px;
- font-weight: 400;
- font-size: 16px;
- color: #296aca;
- }
- .el-input__wrapper {
- background: #012a50 !important;
- box-shadow: none !important;
- border: 1px solid #178bff;
- }
- .el-input__inner::placeholder {
- color: #296aca;
- }
.el-form-item__label {
font-family: Segoe UI, Segoe UI;
font-weight: 400;
font-size: 16px;
color: #ffffff;
}
- .el-date-editor .el-range-separator {
- color: #ffffff !important;
- }
-}
-:deep(.el-pagination) {
- display: flex;
- justify-content: center;
- margin-top: 10px;
-}
-:deep(.el-pagination button) {
- background: center center no-repeat none !important;
- color: #8eb8ea !important;
}
.el-table__body {
@@ -350,6 +302,10 @@
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;
@@ -358,11 +314,15 @@
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;
+ // height: 640px;
overflow-y: scroll !important;
}
@@ -383,61 +343,4 @@
color: #8cfea7;
}
</style>
-<style lang="scss">
-.inspection-rask-details-dialog {
- width: 1270px;
- height: 856px;
- background: #0f1929;
- box-shadow: inset 0px -50px 50px 0px rgba(27, 148, 255, 0.13);
- border-radius: 20px 0px 0px 0px;
- border: 2px solid;
- padding: 0 !important;
- border-image: linear-gradient(
- 180deg,
- rgba(81, 168, 255, 0),
- rgba(48, 111, 202, 1),
- rgba(255, 255, 255, 1),
- 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 .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-scrollbar__thumb {
- background: #13c6ff !important;
- }
-}
-</style>
\ No newline at end of file
--
Gitblit v1.9.3