From 1b9fea7d4af68d8f933b2dc42bf6084b9646f64c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 04 三月 2025 08:39:55 +0800
Subject: [PATCH] 修改作业等级名称

---
 src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
index 939361f..0134bf9 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="home-container">
-        <div style="height: 100%">
+        <div style="height: 100%;display: flex;flex-direction: column;align-items: stretch;">
             <el-row class="homeCard">
                 <div class="basic-line">
                     <span>任务类型:</span>
@@ -23,7 +23,7 @@
                 </div>
                 <div class="basic-line">
                     <span>任务状态:</span>
-                    <el-select v-model="tableData.params.taskStatus" clearable filterable class="input-box" placeholder="执行班组">
+                    <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>
@@ -52,13 +52,7 @@
                                 </span>
                             </template>
                         </el-table-column>
-                        <el-table-column property="execClassgroupId" label="巡检班组">
-                            <template #default="scope">
-                                <span>
-                                    {{ parseNumber(scope.row.execClassgroupId, '巡检班组') }}
-                                </span>
-                            </template>
-                        </el-table-column>
+                        <el-table-column property="execClassgroupName" label="巡检班组"/>
                         <el-table-column property="frequency" label="检查频次">
                             <template #default="scope">
                                 <span>
@@ -80,6 +74,21 @@
                                 </el-tag>
                             </template>
                         </el-table-column>
+                      <el-table-column property="taskClaimTime" label="认领时间">
+                        <template #default="scope">
+                          {{scope.row.taskClaimTime?scope.row.taskClaimTime:'--'}}
+                        </template>
+                      </el-table-column>
+                      <el-table-column property="reportTime" label="填报时间">
+                        <template #default="scope">
+                          {{scope.row.reportTime?scope.row.reportTime:'--'}}
+                        </template>
+                      </el-table-column>
+                      <el-table-column property="taskTimeConsuming" label="巡检耗时">
+                        <template #default="scope">
+                          {{scope.row.taskTimeConsuming?scope.row.taskTimeConsuming:'--'}}
+                        </template>
+                      </el-table-column>
                         <el-table-column property="resultStatus" label="巡检结果">
                             <template #default="scope">
                                 <span>
@@ -180,7 +189,7 @@
                     pageSize: 10,
                     taskName: null,
                     taskType: null,
-                    taskStatus: 2,
+                    taskStatus: null,
                     execUserId: null,
                     execClassgroupId: null,
                     execDepId: null,
@@ -408,12 +417,14 @@
     height: calc(100vh - 144px);
     box-sizing: border-box;
     overflow: hidden;
+    position: relative;
     .homeCard {
         width: 100%;
         padding: 20px;
         box-sizing: border-box;
         background: #fff;
         border-radius: 4px;
+        flex: 0 auto;
 
         .main-card {
             width: 100%;
@@ -428,7 +439,15 @@
                 }
             }
             .pageBtn {
+                position: absolute;
+                width: 100%;
+                z-index: 99;
+                bottom: 0;
+                right: 0;
                 height: 60px;
+                border-radius: 0 0 4px 4px;
+                padding-right: 20px;
+                background: #fff;
                 display: flex;
                 align-items: center;
                 justify-content: right;
@@ -441,8 +460,8 @@
                 }
             }
         }
-        &:last-of-type {
-            height: calc(100% - 100px);
+        &:last-of-type{
+          flex: 1;
         }
     }
     .el-row {

--
Gitblit v1.9.2