From d54ef2a3463e0129909741bf7fb0ac355bebe54d Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期二, 04 六月 2024 10:16:37 +0800 Subject: [PATCH] feat:课表考试信息 --- src/views/home/index.vue | 5 +- src/views/home/components/user-panel/index.vue | 2 components.d.ts | 2 + src/views/home/components/info-panel/index.vue | 12 ------ src/views/home/components/info-data/index.vue | 53 +++++++++++++++++++++++++- 5 files changed, 57 insertions(+), 17 deletions(-) diff --git a/components.d.ts b/components.d.ts index d14fc28..7a35975 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,6 +13,8 @@ ElCol: typeof import('element-plus/es')['ElCol'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] Header: typeof import('./src/components/Header/index.vue')['default'] HelloWorld: typeof import('./src/components/HelloWorld.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/views/home/components/info-data/index.vue b/src/views/home/components/info-data/index.vue index 95a2a13..0b048bf 100644 --- a/src/views/home/components/info-data/index.vue +++ b/src/views/home/components/info-data/index.vue @@ -46,15 +46,63 @@ </el-col> </el-row> - <el-row class="mb-5" :gutter="20"> - <el-col> + <el-row class="mb-5" :gutter="40"> + <el-col :span="12"> + <div class="title text-lg font-bold">鎴戠殑璇捐〃</div> + <div class="table-container"> + <el-table :data="classList" height="500"> + <el-table-column prop="date" label="璇剧▼鏃堕棿"/> + <el-table-column prop="name" label="璇剧▼鍚嶇О" /> + </el-table> + </div> + </el-col> + <el-col :span="12"> + <div class="title text-lg font-bold">鎴戠殑鑰冭瘯</div> + <div class="table-container"> + <el-table :data="classList" height="500"> + <el-table-column prop="date" label="璇剧▼鏃堕棿"/> + <el-table-column prop="name" label="璇剧▼鍚嶇О" /> + </el-table> + </div> </el-col> </el-row> </el-card> </template> <script setup> +import {ref} from 'vue'; + + const classList = ref([ + { + date: '2021-08-01', + name: '璇枃' + }, + { + date: '2021-08-01', + name: '璇枃' + }, + { + date: '2021-08-01', + name: '璇枃' + }, + { + date: '2021-08-01', + name: '璇枃' + }, + { + date: '2021-08-01', + name: '璇枃' + }, + { + date: '2021-08-01', + name: '璇枃' + }, + { + date: '2021-08-01', + name: '璇枃' + }, + ]) </script> @@ -64,6 +112,7 @@ font-weight: bold; margin-bottom: 0.5rem; } + .text-num { color: var(--el-color-primary); } diff --git a/src/views/home/components/info-panel/index.vue b/src/views/home/components/info-panel/index.vue index 4f360b5..a43e814 100644 --- a/src/views/home/components/info-panel/index.vue +++ b/src/views/home/components/info-panel/index.vue @@ -14,16 +14,4 @@ <style lang="scss" scoped> -.info-container { - position: relative; - .info-content { - top: 0; - left: 0; - right: 0; - position: absolute; - } - .info-wrapper { - width: 100%; - } -} </style> \ No newline at end of file diff --git a/src/views/home/components/user-panel/index.vue b/src/views/home/components/user-panel/index.vue index 6df38f4..443a832 100644 --- a/src/views/home/components/user-panel/index.vue +++ b/src/views/home/components/user-panel/index.vue @@ -1,5 +1,5 @@ <template> - <div class="user-panel sticky max-w-sm min-w-96"> + <div class="user-panel max-w-sm min-w-96 h-fit"> <el-card class="card"> <div class="panel-content flex flex-col items-center"> <div class="avatar-container w-40 h-40 rounded-full overflow-hidden"> diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 62dfd02..857a1ab 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,6 +1,6 @@ <template> <div class="home-page container mx-auto flex justify-between py-6"> - <UserPanel class="flex-shrink-0 mr-5"></UserPanel> + <UserPanel class="flex-shrink-0 mr-5 sticky top-6"></UserPanel> <InfoPanel class="flex-shrink-0 grow"></InfoPanel> </div> </template> @@ -12,7 +12,7 @@ </script> <style lang="scss" scoped> -::v-deep .card { +:deep(.card) { border-radius: 30px; } @@ -21,4 +21,5 @@ max-width: 1724px; } } + </style> \ No newline at end of file -- Gitblit v1.8.0