diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 974eeaf..9cf31be 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -153,7 +153,7 @@ aside { //main-container全局样式 .app-container { height: calc(100vh - 85px); - padding: 8px 20px 20px; + padding: 8px 20px 10px; overflow: auto; } .app-viewContent { diff --git a/src/components/echartsList/line.vue b/src/components/echartsList/line.vue index 9c6f9ca..ee3cfbe 100644 --- a/src/components/echartsList/line.vue +++ b/src/components/echartsList/line.vue @@ -166,9 +166,9 @@ legend: legendData, tooltip: { trigger: 'axis', - confine: true, // 将tooltip限制在图表的区域内,防止超出屏幕[1,7](@ref) - enterable: true, // 关键配置:允许鼠标移入tooltip内部[1,2,7](@ref) - extraCssText: 'z-index: 2000;', // 设置一个较高的层级 + confine: true, // 将tooltip限制在图表的区域内,防止超出屏幕 + enterable: dataXY.tooltipFormatter ? true : false, // 关键配置:允许鼠标移入tooltip内部 + extraCssText: dataXY.tooltipFormatter ? 'z-index: 2000;' : 'z-index: 2000;background-color: #ffffffb3;', // 设置一个较高的层级 axisPointer: { type: 'cross', label: { @@ -198,11 +198,11 @@ const date = params[0].name; // 构建提示框HTML内容 let html = `