From f90ee55e6d63cd02c2b883bd5bd942c487fce56a Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期六, 20 八月 2022 16:51:33 +0800
Subject: [PATCH] 修改bug
---
src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue | 76 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
index 10bf5c8..36292ce 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
@@ -4,7 +4,7 @@
<el-row class="homeCard">
<div class="basic-line">
<span>任务类型：</span>
- <el-select v-model="tableData.params.workType" clearable filterable class="input-box" placeholder="任务类型">
+ <el-select v-model="tableData.params.taskType" clearable filterable class="input-box" placeholder="任务类型">
<el-option v-for="item in workTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</div>
@@ -12,6 +12,12 @@
<span>执行班组：</span>
<el-select v-model="tableData.params.execClassgroupId" clearable filterable class="input-box" placeholder="执行班组">
<el-option v-for="item in classGroupList" :key="item.id" :label="item.groupName" :value="item.id"></el-option>
+ </el-select>
+ </div>
+ <div class="basic-line">
+ <span>任务状态：</span>
+ <el-select v-model="tableData.params.taskStatus" clearable filterable class="input-box" placeholder="执行班组">
+ <el-option v-for="item in taskStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</div>
<div style="padding-bottom: 10px">
@@ -50,29 +56,18 @@
</span>
</template>
</el-table-column>
- <!-- <el-table-column prop="validTime" label="有效时间" show-overflow-tooltip>-->
- <!-- <template #default="scope">-->
- <!-- <span>-->
- <!-- {{ scope.row.validTime }}-->
- <!-- </span>-->
- <!-- <span>-->
- <!-- {{ parseNumber(scope.row.validTimeUnit, '检查频次') }}-->
- <!-- </span>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column prop="validTime" label="提醒时间" show-overflow-tooltip>-->
- <!-- <template #default="scope">-->
- <!-- <span>-->
- <!-- {{ scope.row.noticeTime }}-->
- <!-- </span>-->
- <!-- <span>-->
- <!-- {{ parseNumber(scope.row.noticeTimeUnit, '检查频次') }}-->
- <!-- </span>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
<el-table-column property="startTime" label="任务开始时间" />
<el-table-column prop="execUserName" label="执行人" show-overflow-tooltip></el-table-column>
- <el-table-column property="resultStatus" label="状态">
+ <el-table-column property="taskStatus" label="任务状态">
+ <template #default="scope">
+ <el-tag :type="scope.row.taskStatus === 1 ? 'info' : scope.row.taskStatus === 2 ? 'primary' : scope.row.taskStatus === 3 ? 'success' : 'danger'">
+ <span>
+ {{ parseNumber(scope.row.taskStatus, '任务状态') }}
+ </span>
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column property="resultStatus" label="巡检结果">
<template #default="scope">
<span>
{{ parseNumber(scope.row.resultStatus, '巡检状态') }}
@@ -133,6 +128,7 @@
};
};
workTypeList: Array<type>;
+ taskStatusList: Array<type>;
quotaList: [];
departmentList: [];
classGroupList: Array<classGroup>;
@@ -163,7 +159,7 @@
pageSize: 10,
taskName: null,
taskType: null,
- taskStatus: null,
+ taskStatus: 2,
execUserId: null,
execClassgroupId: null,
execDepId: null,
@@ -180,6 +176,12 @@
resultStatusList: [
{ id: 0, name: '正常' },
{ id: 1, name: '异常' }
+ ],
+ taskStatusList: [
+ { id: 1, name: '待巡检' },
+ { id: 2, name: '巡检中' },
+ { id: 3, name: '已巡检' },
+ { id: 4, name: '超时未巡检' }
],
quotaList: [],
departmentList: [],
@@ -271,6 +273,8 @@
return state.timeType.find((item) => item.id == value)?.name;
} else if (type === '巡检状态') {
return state.resultStatusList.find((item) => item.id == value)?.name;
+ } else if (type === '任务状态') {
+ return state.taskStatusList.find((item) => item.id == value)?.name;
} else {
return state.classGroupList.find((item) => item.id == value)?.groupName;
}
@@ -291,12 +295,16 @@
state.tableData.params = {
pageIndex: 1,
pageSize: 10,
- unitName: null,
- workType: null,
- createUserId: null,
+ taskName: null,
+ taskType: null,
+ taskStatus: null,
+ execUserId: null,
execClassgroupId: null,
- checkCycle: null,
- checkCycleUnit: null
+ execDepId: null,
+ startTime: null,
+ validTime: null,
+ createUserId: null,
+ reportTime: null
};
};
@@ -331,7 +339,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
@@ -463,4 +471,14 @@
.el-select {
width: 100%;
}
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
</style>
--
Gitblit v1.9.2