diff --git a/nezha-fronted/src/assets/css/common/loading.scss b/nezha-fronted/src/assets/css/common/loading.scss index 038ff2787..3281e9721 100644 --- a/nezha-fronted/src/assets/css/common/loading.scss +++ b/nezha-fronted/src/assets/css/common/loading.scss @@ -83,24 +83,24 @@ loading-hide{ position: absolute; left: 8px; width: 8px; - background: $--background-color-empty; + background: $--color-primary; animation: ldsFacebook 1.2s cubic-bezier(0, 0.5, 0.5, 1) infinite; } .ldsFacebook div:nth-child(1) { left: 8px; - background: $--background-color-empty; + background: $--color-primary; filter: invert(50%); animation-delay: -0.24s; } .ldsFacebook div:nth-child(2) { left: 20px; - background: $--background-color-empty; + background: $--color-primary; filter: invert(50%); animation-delay: -0.12s; } .ldsFacebook div:nth-child(3) { left: 32px; - background: $--background-color-empty; + background: $--color-primary; filter: invert(50%); animation-delay: 0s; } @@ -121,7 +121,7 @@ loading-hide{ top: 50%; left: 50%; height: 50px; - width: 50px; + width: 38px; //margin: -25px 0 0 -25px; } @@ -129,33 +129,34 @@ loading-hide{ position: absolute; display: block; bottom: 10px; - width: 9px; + width: 5px; height: 5px; - background: rgba(0, 0, 0, 0.25); + background: $--color-primary; + opacity: 1; -webkit-animation: bars1 1.5s infinite ease-in-out; animation: bars1 1.5s infinite ease-in-out; } .bars1 span:nth-child(2) { - left: 11px; + left: 8px; -webkit-animation-delay: 0.2s; animation-delay: 0.2s; } .bars1 span:nth-child(3) { - left: 22px; + left: 16px; -webkit-animation-delay: 0.4s; animation-delay: 0.4s; } .bars1 span:nth-child(4) { - left: 33px; + left: 24px; -webkit-animation-delay: 0.6s; animation-delay: 0.6s; } .bars1 span:nth-child(5) { - left: 44px; + left: 32px; -webkit-animation-delay: 0.8s; animation-delay: 0.8s; } @@ -167,15 +168,15 @@ loading-hide{ transform: translateY(0px); -webkit-transform: translateY(0px); transform: translateY(0px); - background: rgba(0, 0, 0, 0.25); + opacity: 0.25; } 25% { - height: 30px; - -webkit-transform: translateY(15px); - transform: translateY(15px); - -webkit-transform: translateY(15px); - transform: translateY(15px); - background: #000000; + height: 24px; + -webkit-transform: translateY(12px); + transform: translateY(12px); + -webkit-transform: translateY(12px); + transform: translateY(12px); + opacity: 1; } 50% { height: 5px; @@ -183,7 +184,7 @@ loading-hide{ transform: translateY(0px); -webkit-transform: translateY(0px); transform: translateY(0px); - background: rgba(0, 0, 0, 0.25); + opacity: 0.25; } 100% { height: 5px; @@ -191,7 +192,7 @@ loading-hide{ transform: translateY(0px); -webkit-transform: translateY(0px); transform: translateY(0px); - background: rgba(0, 0, 0, 0.25); + opacity: 0.25; } } @-webkit-keyframes bars1 { @@ -199,25 +200,25 @@ loading-hide{ height: 5px; -webkit-transform: translateY(0px); transform: translateY(0px); - background: rgba(0, 0, 0, 0.25); + opacity: 0.25; } 25% { - height: 30px; - -webkit-transform: translateY(15px); - transform: translateY(15px); - background: #000000; + height: 24px; + -webkit-transform: translateY(12px); + transform: translateY(12px); + opacity: 1; } 50% { height: 5px; -webkit-transform: translateY(0px); transform: translateY(0px); - background: rgba(0, 0, 0, 0.25); + opacity: 0.25; } 100% { height: 5px; -webkit-transform: translateY(0px); transform: translateY(0px); - background: rgba(0, 0, 0, 0.25); + opacity: 0.25; } } /** END of bars1 */ diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 744488a97..ab944a960 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -98,6 +98,7 @@ import { getGroupHeight, getLayoutPosition, isGroup } from './chart/tools' import panelChart from '@/components/chart/panelChart' import bus from '@/libs/bus' import groupData from '@/components/chart/tempGroup' +import { lineChartMove } from '@/components/common/js/common' export default { name: 'chartList', @@ -435,6 +436,9 @@ export default { this.$store.commit('setChartListId', `chartList${this.timestamp}`) window.addEventListener('resize', this.resize) } + if (!document.onmousemove) { // 添加鼠标移动事件监听 + document.onmousemove = lineChartMove + } }, beforeDestroy () { window.removeEventListener('resize', this.resize) diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 368cde9df..844765baf 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -160,7 +160,6 @@ import chartTempBox from '@/components/common/rightBox/chartTempBox' import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions' import { fromRoute } from '@/components/common/js/constants' import { randomcolor } from '@/components/common/js/radomcolor/randomcolor' -import { lineChartMove } from '@/components/common/js/common' import routerPathParams from '@/components/common/mixin/routerPathParams' import htmlToPdfMixin from '@/components/common/mixin/htmlToPdfMixin' import exportHtmlMixin from '@/components/common/mixin/exportHtml' @@ -1031,9 +1030,6 @@ export default { this.onScroll() document.querySelector('#tableList').addEventListener('mouseenter', this.tableListEnter) document.querySelector('#tableList').addEventListener('mouseleave', this.tableListLeave) - if (!document.onmousemove) { // 添加鼠标移动事件监听 - document.onmousemove = lineChartMove - } if (this.nowTimeType) { this.nowTimeType.start_time = this.searchTime[0] this.nowTimeType.end_time = this.searchTime[1]