diff --git a/src/components/FilterQueryModel/index.vue b/src/components/FilterQueryModel/index.vue index e5fda8e..451a0a6 100644 --- a/src/components/FilterQueryModel/index.vue +++ b/src/components/FilterQueryModel/index.vue @@ -104,6 +104,30 @@ export default { type: [Number, String], default: '', }, + proStatus: { + type: [Number, String], + default: '', + }, + volLevel: { + type: [Number, String], + default: '', + }, + proType: { + type: [Number, String], + default: '', + }, + sex: { + type: [String], + default: '', + }, + age: { + type: [Number, String], + default: '', + }, + postId: { + type: [Number, String], + default: '', + }, }, data() { return { @@ -326,6 +350,7 @@ export default { label: j.postName, }) }) + item.value = this.postId } if (item.label === '红绿灯状态') { @@ -339,6 +364,12 @@ export default { if (item.label === '分公司') { item.value = this.selectCompany } + if (item.label === '性别') { + item.value = this.sex + } + if (item.label === '年龄分布') { + item.value = this.age + } setTimeout(() => { if (item.label === '工程状态') { @@ -348,6 +379,8 @@ export default { label: j.label, }) }) + + item.value = this.proStatus } if (item.label === '工程类型') { this.dict.type.project_type.forEach((j) => { @@ -356,6 +389,8 @@ export default { label: j.label, }) }) + + item.value = this.proType } if (item.label === '电压等级') { this.dict.type.voltage_level.forEach((j) => { @@ -364,6 +399,7 @@ export default { label: j.label, }) }) + item.value = this.volLevel } }, 500) }) diff --git a/src/views/home-index/components/dataOverviewProject/components/item-two.vue b/src/views/home-index/components/dataOverviewProject/components/item-two.vue index cc07742..239f480 100644 --- a/src/views/home-index/components/dataOverviewProject/components/item-two.vue +++ b/src/views/home-index/components/dataOverviewProject/components/item-two.vue @@ -5,6 +5,9 @@ { - this.$emit('handleOpenDialog', this.type) - }) + // this.chart.on('click', (params) => { + // this.$emit('handleOpenDialog', this.type) + // }) }, }, diff --git a/src/views/home-index/components/personAttendance/index.vue b/src/views/home-index/components/personAttendance/index.vue index 544e2b3..0155ef6 100644 --- a/src/views/home-index/components/personAttendance/index.vue +++ b/src/views/home-index/components/personAttendance/index.vue @@ -5,7 +5,12 @@
-
+
{{ item.name }} @@ -41,24 +46,40 @@
+ + + +