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/inspectionTask/index.vue | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index 943ddb6..c72d513 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -12,11 +12,11 @@
<div class="basic_search">
<span>巡检任务类型：</span>
<el-select v-model="listQuery.type">
- <el-option
- v-for="item in departmentList"
+ <el-option
+ v-for="item in typeList"
:key="item.id"
- :value="item.department"
- :label="item.department"
+ :value="item.id"
+ :label="item.name"
></el-option>
</el-select>
</div>
@@ -24,43 +24,43 @@
<span>巡检任务状态：</span>
<el-select v-model="listQuery.status">
<el-option
- v-for="item in departmentList"
+ v-for="item in statusList"
:key="item.id"
- :value="item.department"
- :label="item.department"
+ :value="item.id"
+ :label="item.name"
></el-option>
</el-select>
</div>
<div class="basic_search">
<span>巡检任务创建人员：</span>
- <el-select v-model="listQuery.createUid">
+ <el-select v-model="listQuery.createUid" filterable clearable>
<el-option
- v-for="item in departmentList"
+ v-for="item in userList"
:key="item.id"
- :value="item.department"
- :label="item.department"
+ :value="item.id"
+ :label="item.realname"
></el-option>
</el-select>
</div>
<div class="basic_search">
<span>异常通知人员：</span>
- <el-select v-model="listQuery.noticeUid">
- <el-option
- v-for="item in departmentList"
+ <el-select v-model="listQuery.noticeUid" filterable clearable>
+ <el-option
+ v-for="item in userList"
:key="item.id"
- :value="item.department"
- :label="item.department"
+ :value="item.id"
+ :label="item.realname"
></el-option>
</el-select>
</div>
<div class="basic_search">
<span>执行巡检人员：</span>
- <el-select v-model="listQuery.execUid">
+ <el-select v-model="listQuery.execUid" filterable clearable>
<el-option
- v-for="item in departmentList"
+ v-for="item in userList"
:key="item.id"
- :value="item.department"
- :label="item.department"
+ :value="item.id"
+ :label="item.realname"
></el-option>
</el-select>
</div>
@@ -114,16 +114,16 @@
<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
style="float:right;"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- />
+ />
<br>
</div>
@@ -262,7 +262,7 @@
<div class="inspectionTask_point">
<el-tabs class="active" v-model="activeName">
- <el-tab-pane label="巡检点信息" name="inspectionPoint">
+ <el-tab-pane label="检查项信息" name="inspectionPoint">
<inspection-point @giveToForm="receiveToForm" ref="inspectionPoint" :title="title" :inspectionTaskForm="inspectionTaskForm"></inspection-point>
</el-tab-pane>
</el-tabs>
@@ -326,6 +326,7 @@
userList:[],
noticeUidList:[],
execUidList:[],
+ statusList:[{name:'任务开启',id:1},{id:2,name:'任务关闭'}],
intervalSecondsList:[{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'},{id:17280,name:'2天'}],
noticeSecondsList:[{id:600,name:'10分'},{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'}],
effectSecondsList:[{id:1800,name:'30分'},{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'}],
@@ -368,8 +369,8 @@
startTime: "",
status:"",
type: "",
- page: 10,
- pageSize: 1,
+ page: 1,
+ pageSize: 10,
},
}
@@ -384,10 +385,7 @@
this.listLoading = true
let res = await getInspectionTask(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.recordTotal = JSON.parse(res.data.message).total
this.inspectionTaskData = res.data.result
}else if(res.data.code === '300'){
this.inspectionTaskData = []
@@ -461,6 +459,7 @@
}
setTimeout(() => {
this.$refs.inspectionPoint.inspectionPointData = []
+ this.$refs.inspectionPoint.ifEdit = false
});
}else{
this.ifShow = true
@@ -474,6 +473,7 @@
// this.inspectionTaskForm.noticeUid = value.noticeUname
setTimeout(() => {
this.$refs.inspectionPoint.inspectionPointData = this.inspectionTaskForm.checkContents
+ this.$refs.inspectionPoint.ifEdit = true
});
}
},
@@ -589,7 +589,7 @@
this.getInspectionTaskData()
},
handleCurrentChange(val){
- this.listQuery.pageIndex = val
+ this.listQuery.page = val
this.getInspectionTaskData()
},
}
--
Gitblit v1.9.2