From d4c8e63d9f4b111d97879b52f327535ef41c5cae Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 16 九月 2022 16:28:29 +0800
Subject: [PATCH] 修改
---
src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 18 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
index ff334cd..9d6ceea 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
@@ -25,7 +25,8 @@
:default-time="['00:00:00','23:59:59']"
@change="changeTimeInspectionPerson"
end-placeholder="结束日期">
- </el-date-picker></div>
+ </el-date-picker>
+ </div>
<el-divider></el-divider>
<div class="inspectionStatistics_part_body">
<inspection-person ref="inspectionPerson"></inspection-person>
@@ -77,31 +78,55 @@
</div>
<div class="inspectionStatistics_part">
<div class="inspectionStatistics_part_today">
- <div class="inspectionStatistics_part_title">{{"今日异常完成"}}</div>
- <el-divider></el-divider>
- <div class="inspectionStatistics_part_body">
- <today-unusual></today-unusual>
- </div>
- </div>
- </div>
- <div class="inspectionStatistics_part">
- <div class="inspectionStatistics_part_unusual">
- <div class="inspectionStatistics_part_title">{{"巡检异常统计"}}</div>
+ <div class="inspectionStatistics_part_title">{{"巡检任务统计"}}</div>
<div class="inspectionStatistics_part_time">
+ <el-select v-model="taskListQuery.depId" @change="changeInspectionTask">
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.department"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ <div class="inspectionStatistics_part_time">
+
<el-date-picker
- v-model="value3"
- type="daterange"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期">
+ v-model="value3"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ :default-time="['00:00:00','23:59:59']"
+ @change="changeTimeTask"
+ end-placeholder="结束日期">
</el-date-picker>
</div>
<el-divider></el-divider>
<div class="inspectionStatistics_part_body">
- <inspection-unusual></inspection-unusual>
+ <today-unusual ref="todayUnusual"></today-unusual>
</div>
</div>
</div>
+<!-- <div class="inspectionStatistics_part">-->
+<!-- <div class="inspectionStatistics_part_unusual">-->
+<!-- <div class="inspectionStatistics_part_title">{{"巡检异常统计"}}</div>-->
+<!-- <div class="inspectionStatistics_part_time">-->
+<!-- <el-date-picker-->
+<!-- v-model="value3"-->
+<!-- type="daterange"-->
+<!-- range-separator="至"-->
+<!-- start-placeholder="开始日期"-->
+<!-- end-placeholder="结束日期">-->
+<!-- </el-date-picker>-->
+<!-- </div>-->
+<!-- <el-divider></el-divider>-->
+<!-- <div class="inspectionStatistics_part_body">-->
+<!-- <inspection-unusual></inspection-unusual>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</template>
@@ -128,6 +153,11 @@
"startDate": ""
},
personListQuery:{
+ depId:41,
+ startTime:'',
+ endTime:'',
+ },
+ taskListQuery:{
depId:41,
startTime:'',
endTime:'',
@@ -168,7 +198,10 @@
this.completeListQuery.startTime = this.value1[0]
this.completeListQuery.endTime = this.value1[1]
this.$refs.inspectionComplete.updateData(this.completeListQuery)
- this.value3 = [(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' + 1).toString() + ' ' + '00:00:00',(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' + newTime.getDate()).toString() + ' ' + '23:59:59']
+ this.value3 = [(newTime.getFullYear()+ '-' + ((newTime.getMonth() + 1) < 10 ? '0' + (newTime.getMonth() + 1) : (newTime.getMonth() + 1)) + '-' + '01').toString() + ' ' + '00:00:00',(newTime.getFullYear()+ '-' + ((newTime.getMonth() + 1) < 10 ? '0' + (newTime.getMonth() + 1) : (newTime.getMonth() + 1)) + '-' + newTime.getDate()).toString() + ' ' + '23:59:59']
+ this.taskListQuery.startTime = this.value3[0]
+ this.taskListQuery.endTime = this.value3[1]
+ this.$refs.todayUnusual.updateData(this.taskListQuery)
},
changeTimeInspectionPerson() {
if(this.value1 !== null){
@@ -177,6 +210,13 @@
}
this.$refs.inspectionPerson.updateData(this.personListQuery)
},
+ changeTimeTask(){
+ if(this.value3 !== null){
+ this.taskListQuery.startTime = this.value1[0]
+ this.taskListQuery.endTime = this.value1[1]
+ }
+ this.$refs.todayUnusual.updateData(this.personListQuery)
+ },
changeCompleteTimeInspectionPerson() {
if(this.value2 !== null){
this.completeListQuery.startTime = this.value2[0]
@@ -184,6 +224,9 @@
}
this.$refs.inspectionComplete.updateData(this.completeListQuery)
},
+ changeInspectionTask() {
+ this.$refs.todayUnusual.updateData(this.personListQuery)
+ },
changeInspectionPerson() {
this.$refs.inspectionPerson.updateData(this.personListQuery)
},
--
Gitblit v1.9.2