diff --git a/src/layout/components/Main/index.vue b/src/layout/components/Main/index.vue index 6da436f..304d828 100644 --- a/src/layout/components/Main/index.vue +++ b/src/layout/components/Main/index.vue @@ -3,7 +3,7 @@ -
+
@@ -58,10 +58,6 @@ watch(watermarkConfig, newv => { background: $color-fill-1; // 背景颜色 } -.main { - padding: $padding; -} - // 修改左侧滚动条宽度 :deep(.arco-scrollbar-thumb-direction-vertical .arco-scrollbar-thumb-bar) { width: 4px; diff --git a/src/layout/index.vue b/src/layout/index.vue index 7c2e3ce..b37e727 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -25,18 +25,6 @@ onMounted(() => { // 页面渲染完毕,结束loading loadingPage.done(200); }); - -// 页面加载前 -onBeforeMount(() => { - onLayoutResize(); - window.addEventListener("resize", onLayoutResize); -}); - -// 监听页面大小 -const onLayoutResize = () => { - let clientWidth = document.body.clientWidth; - console.log("窗口大小", clientWidth); -}; diff --git a/src/style/global-style.scss b/src/style/global-style.scss index 206be52..ac246b6 100644 --- a/src/style/global-style.scss +++ b/src/style/global-style.scss @@ -1,5 +1,6 @@ /* global style scss */ .dc-page { + margin: $padding; padding: $padding; background: $color-bg-1; } diff --git a/src/style/index.scss b/src/style/index.scss index ed4a2ed..8e8a30a 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -14,7 +14,7 @@ body, #app { margin: 0; padding: 0; - height: 100%; + overflow: hidden; } html { @@ -22,8 +22,6 @@ html { } #app { - width: 100vw; - height: 100vh; overflow: hidden; } diff --git a/src/views/home/components/monthly-analysis.vue b/src/views/home/components/analysis-chart.vue similarity index 100% rename from src/views/home/components/monthly-analysis.vue rename to src/views/home/components/analysis-chart.vue diff --git a/src/views/home/components/data-box.vue b/src/views/home/components/data-box.vue index 7f4011f..d6c2f2a 100644 --- a/src/views/home/components/data-box.vue +++ b/src/views/home/components/data-box.vue @@ -5,21 +5,21 @@ 销售额趋势 单位:元
- +
现金分析 单位:元
- +
diff --git a/src/views/home/components/data-box2.vue b/src/views/home/components/data-box2.vue deleted file mode 100644 index 646355d..0000000 --- a/src/views/home/components/data-box2.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/src/views/home/components/sell-histogram.vue b/src/views/home/components/histogram-chart.vue similarity index 100% rename from src/views/home/components/sell-histogram.vue rename to src/views/home/components/histogram-chart.vue