Commit 7534ac92 authored by spc's avatar spc

Merge branch 'dev' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into dev

parents ce7a6d75 d42beb5f
...@@ -415,7 +415,6 @@ const generateCurveData1 = (lineData, type, arrayName, minOrMax) =>{ ...@@ -415,7 +415,6 @@ const generateCurveData1 = (lineData, type, arrayName, minOrMax) =>{
data.push(point); data.push(point);
}); });
console.log('data888888=', data);
return data; return data;
} }
// slightHighRange // slightHighRange
...@@ -966,7 +965,8 @@ const onScroll = (e) => { ...@@ -966,7 +965,8 @@ const onScroll = (e) => {
height: 2700rpx; height: 2700rpx;
// box-sizing: border-box; // box-sizing: border-box;
position: relative; position: relative;
overflow: hidden; overflow-x: hidden;
overflow-y: auto;
.result-bg{ .result-bg{
......
...@@ -591,8 +591,8 @@ onMounted(async () => { ...@@ -591,8 +591,8 @@ onMounted(async () => {
<style lang="less" scoped> <style lang="less" scoped>
.shengzhang-tools-container { .shengzhang-tools-container {
width: 100%; width: 100%;
height: 100vh; overflow-x: hidden;
overflow: hidden; overflow-y: auto;
background-color: #fdf6eb; background-color: #fdf6eb;
.banner-swiper { .banner-swiper {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment