From 01f62968de39cacddaed903bb936cc5163573fc4 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 23 十二月 2022 14:51:37 +0800
Subject: [PATCH] 更改列表显示
---
src/views/doublePreventAction/hiddenDanger/inspectionStatistics/components/todayUnusual/index.vue | 10 ++++------
src/views/doubleIndex/saftyScreen/components/screen.vue | 6 +++---
src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue | 22 +++++++++++-----------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/views/doubleIndex/saftyScreen/components/screen.vue b/src/views/doubleIndex/saftyScreen/components/screen.vue
index 05c4e4f..0eda9fd 100644
--- a/src/views/doubleIndex/saftyScreen/components/screen.vue
+++ b/src/views/doubleIndex/saftyScreen/components/screen.vue
@@ -885,7 +885,7 @@
},
series: [
{
- name: '任务数量',
+ name: '当日认领数量',
type: 'bar',
data: this.claimedData,
itemStyle:{
@@ -893,7 +893,7 @@
}
},
{
- name: '已完成',
+ name: '当日完成数量',
type: 'bar',
data: this.completedData,
itemStyle:{
@@ -901,7 +901,7 @@
}
},
{
- name: '未完成',
+ name: '累计领取未完成数量',
type: 'bar',
data: this.uncompletedData,
itemStyle:{
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/components/todayUnusual/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/components/todayUnusual/index.vue
index 77f7d80..5422a71 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/components/todayUnusual/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/components/todayUnusual/index.vue
@@ -19,10 +19,8 @@
},
methods:{
async updateData(val) {
- debugger
let res = await getInspectTask(val)
if(res.data.code === '200'){
- debugger
this.claimedData = res.data.data.claimed.map(item =>{
return item.num
})
@@ -52,7 +50,7 @@
legend: {
left: 'center',
top: '5%',
- data:['任务数量','已完成','未完成']
+ data:['当日认领数量','当日完成数量','累计领取未完成数量']
},
xAxis: {
type: 'category',
@@ -66,7 +64,7 @@
{
data: this.claimedData,
type: 'bar',
- name:'任务数量',
+ name:'当日认领数量',
showBackground: true,
backgroundStyle: {
color: '#91cc75'
@@ -75,7 +73,7 @@
{
data: this.completedData,
type: 'bar',
- name:'已完成',
+ name:'当日完成数量',
showBackground: true,
backgroundStyle: {
color: '#fac858'
@@ -84,7 +82,7 @@
{
data: this.uncompletedData,
type: 'bar',
- name:'未完成',
+ name:'累计领取未完成数量',
showBackground: true,
backgroundStyle: {
color: '#ee6666'
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
index 9d6ceea..13c4558 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionStatistics/index.vue
@@ -157,16 +157,16 @@
startTime:'',
endTime:'',
},
- taskListQuery:{
- depId:41,
- startTime:'',
- endTime:'',
- },
completeListQuery:{
depId:41,
startTime:'',
endTime:'',
status:1,
+ },
+ taskListQuery:{
+ depId:41,
+ startTime:'',
+ endTime:'',
},
stateList:[
{id:1,name:'正常'},
@@ -195,8 +195,8 @@
this.personListQuery.endTime = this.value1[1]
this.$refs.inspectionPerson.updateData(this.personListQuery)
this.value2 = [(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.completeListQuery.startTime = this.value1[0]
- this.completeListQuery.endTime = this.value1[1]
+ this.completeListQuery.startTime = this.value2[0]
+ this.completeListQuery.endTime = this.value2[1]
this.$refs.inspectionComplete.updateData(this.completeListQuery)
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]
@@ -212,10 +212,10 @@
},
changeTimeTask(){
if(this.value3 !== null){
- this.taskListQuery.startTime = this.value1[0]
- this.taskListQuery.endTime = this.value1[1]
+ this.taskListQuery.startTime = this.value3[0]
+ this.taskListQuery.endTime = this.value3[1]
}
- this.$refs.todayUnusual.updateData(this.personListQuery)
+ this.$refs.todayUnusual.updateData(this.taskListQuery)
},
changeCompleteTimeInspectionPerson() {
if(this.value2 !== null){
@@ -225,7 +225,7 @@
this.$refs.inspectionComplete.updateData(this.completeListQuery)
},
changeInspectionTask() {
- this.$refs.todayUnusual.updateData(this.personListQuery)
+ this.$refs.todayUnusual.updateData(this.taskListQuery)
},
changeInspectionPerson() {
this.$refs.inspectionPerson.updateData(this.personListQuery)
--
Gitblit v1.9.2