diff --git a/screen-vue/src/components/Layout/index.vue b/screen-vue/src/components/Layout/index.vue index 16a3a4e..f7391ac 100644 --- a/screen-vue/src/components/Layout/index.vue +++ b/screen-vue/src/components/Layout/index.vue @@ -696,20 +696,27 @@ onMounted(() => { color: #333; } +/* 核心修复:内容容器布局 */ .content-container { flex: 1; padding: 0 !important; - overflow: auto; + overflow: hidden !important; + display: flex !important; + flex-direction: column !important; } .content-wrapper { - margin: 16px; - padding: 24px; + margin: 8px; + padding: 2px; background: #fff; border: 1px solid #e6e6e6; border-radius: 8px; - min-height: calc(100% - 32px); + flex: 1 !important; + height: calc(100% - 16px) !important; + min-height: 0 !important; box-shadow: 0 1px 2px rgba(0,0,0,0.1); + display: flex !important; + flex-direction: column !important; } :deep(.el-sub-menu .el-menu) { diff --git a/screen-vue/src/views/desktop/components/ChartTop.vue b/screen-vue/src/views/desktop/components/ChartTop.vue new file mode 100644 index 0000000..ce3c94a --- /dev/null +++ b/screen-vue/src/views/desktop/components/ChartTop.vue @@ -0,0 +1,213 @@ + + + + + \ No newline at end of file diff --git a/screen-vue/src/views/desktop/index.vue b/screen-vue/src/views/desktop/index.vue index 3dc7c35..f48697a 100644 --- a/screen-vue/src/views/desktop/index.vue +++ b/screen-vue/src/views/desktop/index.vue @@ -1,17 +1,349 @@ \ No newline at end of file