From ddad5f19e0cd21f5f499e45d8155cb793c621158 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 12 Dec 2022 10:00:27 +0800
Subject: [PATCH] 修改大屏时间选择
---
src/views/doubleIndex/saftyScreen/components/screen.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/doubleIndex/saftyScreen/components/screen.vue b/src/views/doubleIndex/saftyScreen/components/screen.vue
index d40ed0a..a7eb7a5 100644
--- a/src/views/doubleIndex/saftyScreen/components/screen.vue
+++ b/src/views/doubleIndex/saftyScreen/components/screen.vue
@@ -449,6 +449,7 @@
},
changeCompleteTimeInspectionPerson() {
+ console.log(this.value2,this.completeListQuery,'222')
if(this.value2 !== null){
this.completeListQuery.startTime = this.value2[0]
this.completeListQuery.endTime = this.value2[1]
@@ -516,14 +517,15 @@
await this.initRiskLevel()
},
changeInspectionTask() {
- this.updateMission(this.personListQuery)
+ this.updateMission(this.taskListQuery)
},
changeTimeTask(){
+ console.log(this.value3,this.taskListQuery,'333')
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.updateMission(this.personListQuery)
+ this.updateMission(this.taskListQuery)
},
// 各部门预约
@@ -735,7 +737,7 @@
option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1;
}
myChart.setOption(option);
- }, 3000)
+ }, 6000)
}
window.addEventListener('resize', myChart.resize);
setTimeout(()=>{
@@ -1211,7 +1213,7 @@
.main-cont {
display: grid;
grid-template-columns: repeat(3, minmax(100px, 1fr));
- grid-template-rows: repeat(2, 1fr);
+ grid-template-rows: repeat(2, calc(50% - 20px));
grid-auto-flow: row;
padding: 10px;
margin-bottom: 20px;
@@ -1253,7 +1255,7 @@
.main-cont {
display: grid;
grid-template-columns: repeat(3, minmax(100px, 1fr));
- grid-template-rows: repeat(2, 1fr);
+ grid-template-rows: repeat(2, calc((100% - 35px)/2));
grid-auto-flow: row;
padding: 10px;
margin-bottom: 20px;
--
Gitblit v1.9.2