From dfc35ece9ae09ad910538f0b181275e0e6c8a00c Mon Sep 17 00:00:00 2001
From: lct123456 <lucht>
Date: Thu, 21 Apr 2022 21:59:41 +0800
Subject: [PATCH] 巡检记录和巡检数据
---
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue | 159 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 130 insertions(+), 29 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
index 6b5d2b6..4c61f8c 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
@@ -1,6 +1,69 @@
<template>
<div class="app-container">
<div class="filter-container">
+ <div class="basic_search">
+ <span>开始时间：</span>
+ <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检开始时间"></el-date-picker>
+ </div>
+ <div class="basic_search">
+ <span>结束时间：</span>
+ <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检结束时间"></el-date-picker>
+ </div>
+ <div class="basic_search">
+ <span>任务类型：</span>
+ <el-select v-model="listQuery.type">
+ <el-option
+ v-for="item in typeList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>任务单元状态列表：</span>
+ <el-select v-model="listQuery.statusList">
+ <el-option
+ v-for="item in statusListList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>巡检任务创建人员：</span>
+ <el-select v-model="listQuery.createUid" filterable clearable>
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.realname"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>异常通知人员：</span>
+ <el-select v-model="listQuery.noticeUid" filterable clearable>
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.realname"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>执行巡检人员：</span>
+ <el-select v-model="listQuery.execUid" filterable clearable>
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.realname"
+ ></el-option>
+ </el-select>
+ </div>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
</div>
<div class="table_content">
@@ -13,21 +76,50 @@
highlight-current-row
style="width: 100%;"
>
+ <el-table-column type="expand">
+ <template slot-scope="scope">
+ <el-table
+ v-loading="listLoading"
+ :key="tableKey"
+ :data="scope.row.unitList"
+ border
+ fit
+ highlight-current-row
+ style="width: 100%;"
+ >
+ <el-table-column label="序号" type="index" width="150" align="center">
+ </el-table-column>
+ <el-table-column label="隐患排查内容" prop="content" align="center">
+ </el-table-column>
+ <el-table-column label="巡检内容" prop="info" align="center">
+ </el-table-column>
+ <el-table-column label="巡检照片" prop="img" align="center">
+ </el-table-column>
+ <el-table-column label="状态" prop="status" align="center">
+ </el-table-column>
+ <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button type="text" @click="showMeasureDetail(scope.row)">详情</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-table-column>
<el-table-column label="任务名称" prop="title" align="center">
</el-table-column>
<el-table-column label="检查类型" prop="type" align="center">
- </el-table-column>
- <el-table-column label="检查频次" prop="intervalSeconds" align="center">
- </el-table-column>
- <el-table-column label="任务开始时间" prop="startTime" align="center">
- </el-table-column>
- <el-table-column label="任务结束时间" prop="endTime" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.type | parseType}}
+ </template>
</el-table-column>
<el-table-column label="异常通知人" prop="noticeUname" align="center">
</el-table-column>
<el-table-column label="巡检人" prop="execUname" align="center">
</el-table-column>
- <el-table-column label="检查日期时间" prop="updateTime" align="center">
+ <el-table-column label="任务状态" prop="status" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.status | parseStatus}}
+ </template>
</el-table-column>
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -38,9 +130,9 @@
<br>
<el-pagination
v-show="recordTotal>0"
- :current-page="currentPage"
+ :current-page="listQuery.page"
:page-sizes="[10, 20, 30, 50]"
- :page-size="pageSize"
+ :page-size="listQuery.pageSize"
:total="recordTotal"
layout="total, sizes, prev, pager, next, jumper"
background
@@ -87,11 +179,18 @@
export default {
name: 'index',
filters: {
- parseMain(type){
+ parseType(type){
if(type === 1){
- return "是"
- }else if(type === 0){
- return "否"
+ return "日常检查"
+ }else{
+ return "周期检查"
+ }
+ },
+ parseStatus(status){
+ if(status === 1){
+ return "任务开启"
+ }else{
+ return "任务关闭"
}
},
},
@@ -105,6 +204,9 @@
tableKey: 0,
inspectionRecordData: [],
departmentList:[],
+ userList:[],
+ typeList:[{id:1,name:'日常检查'},{id:2,name:'周期检查'}],
+ statusListList:[{id:1,name:'待巡检'},{id:2,name:'巡检中'},{id:3,name:'已完成'},{id:4,name:'超时未巡检'},{id:5,name:'已取消'}],
listLoading: false,
pageSize: 10,
recordTotal: 0,
@@ -118,16 +220,17 @@
},
listQuery:{
- createUid: null,
- endTime: null,
- execUid: null,
- noticeUid: null,
- page: 1,
- pageSize:10,
- startTime: null,
- result:null,
- statusList: null,
- type: null
+ createUid: null,
+ endTime: null,
+ execUid: null,
+ execUname: null,
+ noticeUid: null,
+ page: 1,
+ pageSize: 10,
+ result: null,
+ startTime: null,
+ statusList: null,
+ type: null
},
}
},
@@ -140,11 +243,8 @@
this.listLoading = true
let res = await getInspectionRecord(this.listQuery)
if(res.data.code === '200'){
- this.recordTotal = res.data.result.total
- this.pageSize = res.data.result.size
- this.pageTotal = computePageCount(res.data.result.total, res.data.result.size)
- this.currentPage = res.data.result.current
- this.analyseUnitData = res.data.result.records
+ this.recordTotal = JSON.parse(res.data.message).total
+ this.inspectionRecordData = res.data.result
}else{
this.$message({
message:res.data.message,
@@ -197,8 +297,9 @@
.basic_search{
display:inline-block;
padding-bottom: 10px;
+ padding-left: 10px;
}
.analyseUnit_input{
- width:320px;
+ width:200px;
}
</style>
--
Gitblit v1.9.2