From c181527b88758cec56479f2076f06c8df9dd45c6 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 30 五月 2022 15:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
index 8e7db67..f938c1c 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
@@ -3,7 +3,16 @@
<div class="inspectionStatistics_part">
<div class="inspectionStatistics_part_person">
<div class="inspectionStatistics_part_title">{{"巡检人员统计"}}</div>
- <el-divider></el-divider>
+ <div class="inspectionStatistics_part_time">
+ <el-date-picker
+ v-model="value1"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ @change="changeInspectionPerson"
+ end-placeholder="结束日期">
+ </el-date-picker></div>
+ <el-divider></el-divider>
<div class="inspectionStatistics_part_body">
<inspection-person></inspection-person>
</div>
@@ -12,6 +21,15 @@
<div class="inspectionStatistics_part">
<div class="inspectionStatistics_part_complete">
<div class="inspectionStatistics_part_title">{{"巡检完成统计"}}</div>
+ <div class="inspectionStatistics_part_time">
+ <el-date-picker
+ v-model="value2"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期">
+ </el-date-picker>
+ </div>
<el-divider></el-divider>
<div class="inspectionStatistics_part_body">
<inspection-complete></inspection-complete>
@@ -30,6 +48,15 @@
<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>
@@ -44,20 +71,56 @@
import inspectionComplete from './components/inspectionComplete/index'
import inspectionUnusual from './components/inspectionUnusual/index'
import todayUnusual from './components/todayUnusual/index'
+import { getInspectionCount } from '../../../../api/inspectionTask'
export default {
name: "index",
+ data() {
+ return {
+ value1:['',''],
+ value2:['',''],
+ value3:['',''],
+ listQuery:{
+ "dateList": [
+ ],
+ "endDate": "",
+ "execUid": null,
+ "startDate": ""
+ }
+ }
+ },
components : {
inspectionPerson,
inspectionComplete,
inspectionUnusual,
todayUnusual
+ },
+ created() {
+ this.setTimeValue()
+ this.getInspectionCount()
+ },
+ methods: {
+ setTimeValue() {
+ let newTime = new Date()
+ this.value1 = [(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' + 1).toString() + ' ' + '00:00:00',(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' + newTime.getDate()).toString() + ' ' + '23:59:59']
+ this.value2 = [(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) + '-' + 1).toString() + ' ' + '00:00:00',(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' + newTime.getDate()).toString() + ' ' + '23:59:59']
+ },
+ async getInspectionCount() {
+ this.listQuery.startDate = this.value1[0]
+ this.listQuery.endDate = this.value1[1]
+ let res = await getInspectionCount(this.listQuery)
+ // this.$refs.inspectionPerson.setCount(res.data.result)
+ },
+ async changeInspectionPerson() {
+ let res = await getInspectionCount(this.listQuery)
+ },
}
}
</script>
<style scoped>
/deep/.el-divider--horizontal {
- margin-top: 0px !important;
+ margin-top: 1px !important;
}
.inspectionStatistics{
width:100%;
@@ -80,9 +143,15 @@
height:60px;
line-height: 60px;
padding-left:20px;
+ display: inline-block;
+ width:50%;
}
.inspectionStatistics_part_body{
width:100%;
height:410px;
}
+ .inspectionStatistics_part_time{
+ display: inline-block;
+
+ }
</style>
--
Gitblit v1.9.2