From 5f77609d5118737e135c6ca3add168ad01aa52b6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 十一月 2024 16:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/assets/css/theme-light.css | 4 ++++
web/src/views/modules/taskReliability/TimeDiagram.vue | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/web/src/assets/css/theme-light.css b/web/src/assets/css/theme-light.css
index d8633d9..f2ac0a4 100644
--- a/web/src/assets/css/theme-light.css
+++ b/web/src/assets/css/theme-light.css
@@ -252,6 +252,10 @@
background: #17507c;
border-color: #17507c;
}
+.zt.light .el-button--primary.is-disabled{
+ background-color: #8bd9d1;
+ border-color: #8bd9d1;
+}
.zt.light .el-tabs__item.is-active{
color:#4877e8;
}
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index 15c0973..5aaf2c8 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -143,11 +143,11 @@
},
created() {
let scrollView = this.$refs['scrollView']
- window.addEventListener('scroll', this.handleScroll,true);
+ window.addEventListener('scroll', this.handleScroll,{passive:false});
},
destroyed() {
let scrollView = this.$refs['scrollView']
- window.removeEventListener('scroll', this.handleScroll,true);
+ window.removeEventListener('scroll', this.handleScroll);
},
mounted() {
this.getProductList()
--
Gitblit v1.9.1