From 21235ff6f4b7b9e8b6e7fa580f2de958ead12fa3 Mon Sep 17 00:00:00 2001 From: lxx <3039108793@qq.com> Date: Thu, 21 Nov 2024 20:20:04 +0800 Subject: [PATCH 01/74] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/common.scss | 4 +- src/components.d.ts | 4 + src/components/layout/aside.vue | 37 ++- src/components/layout/header.vue | 151 +++++----- src/router/index.ts | 5 + src/views/home/Homepage.vue | 4 +- src/views/home/components/MessagesBox.vue | 214 ++++++++++---- src/views/home/components/PointsBox.vue | 4 +- src/views/home/components/ProgressBox.vue | 2 +- src/views/home/utils/message.js | 57 ++++ src/views/login/index.vue | 17 +- src/views/personal-center/index.vue | 129 ++++++--- src/views/team/components/new-user.vue | 335 ++++++++++++++++++++++ src/views/team/index.vue | 11 +- 14 files changed, 776 insertions(+), 198 deletions(-) create mode 100644 src/views/home/utils/message.js create mode 100644 src/views/team/components/new-user.vue diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss index e1c92d8..da10322 100644 --- a/src/assets/styles/common.scss +++ b/src/assets/styles/common.scss @@ -22,7 +22,7 @@ html, body { #app { width: 100%; height: 100%; - overflow: hidden; + overflow: scroll; } /* 确保所有元素遵循盒模型 */ @@ -32,3 +32,5 @@ html, body { box-sizing: border-box; } + + diff --git a/src/components.d.ts b/src/components.d.ts index e23af5d..ee961b2 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -18,10 +18,14 @@ declare module 'vue' { ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] + ElInput: typeof import('element-plus/es')['ElInput'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] + ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] diff --git a/src/components/layout/aside.vue b/src/components/layout/aside.vue index dff37b7..f2c2f38 100644 --- a/src/components/layout/aside.vue +++ b/src/components/layout/aside.vue @@ -97,14 +97,41 @@ const additionalItems = [ + diff --git a/src/components/layout/header.vue b/src/components/layout/header.vue index aae69c6..9f8b22e 100644 --- a/src/components/layout/header.vue +++ b/src/components/layout/header.vue @@ -110,89 +110,100 @@ const updateCurrentGridData = (currentPage) => { diff --git a/src/views/home/components/MessagesBox.vue b/src/views/home/components/MessagesBox.vue index 2d266f5..99bd51b 100644 --- a/src/views/home/components/MessagesBox.vue +++ b/src/views/home/components/MessagesBox.vue @@ -2,41 +2,51 @@

消息

- 全部已读
+ + + +
+ + -onMounted(() => { - loadMessages(); -}); - diff --git a/src/views/team/components/new-user.vue b/src/views/team/components/new-user.vue new file mode 100644 index 0000000..a49922a --- /dev/null +++ b/src/views/team/components/new-user.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/src/views/team/index.vue b/src/views/team/index.vue index 825b6ce..95a77e5 100644 --- a/src/views/team/index.vue +++ b/src/views/team/index.vue @@ -1,4 +1,12 @@ - - - - \ No newline at end of file From 612769afcfedf7113694daae0d02d09d7d4a568c Mon Sep 17 00:00:00 2001 From: lxx <3039108793@qq.com> Date: Thu, 21 Nov 2024 21:19:50 +0800 Subject: [PATCH 05/74] =?UTF-8?q?fixed:=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/header.vue | 44 ++++++++++++-------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/src/components/layout/header.vue b/src/components/layout/header.vue index 267f976..0fda22d 100644 --- a/src/components/layout/header.vue +++ b/src/components/layout/header.vue @@ -110,33 +110,8 @@ const updateCurrentGridData = (currentPage) => { diff --git a/src/views/team/components/new-user.vue b/src/views/team/components/new-user.vue index a49922a..1d3dde3 100644 --- a/src/views/team/components/new-user.vue +++ b/src/views/team/components/new-user.vue @@ -15,6 +15,8 @@ const isLiked = ref(false); // 点赞状态 const initialIsLiked = ref(false); const initialLikeCount = ref(0); +const selectedGender = ref("null"); // 默认值为 "null" + // 获取用户数据函数 async function fetchUserData() { try { @@ -109,15 +111,16 @@ onMounted(() => {
真实姓名 - +
性别 + @@ -128,41 +131,41 @@ onMounted(() => {
加入时间 -

1360000000000000000

+

2000/00/00

-    所属团队/职位 -

   你好

+ 所属团队/职位 +

你好

身份证号 - +
手机号 - +

12345678912

邮箱 - +
年级 - +
专业 - +
学号 - +
@@ -173,7 +176,7 @@ onMounted(() => { + />
@@ -184,7 +187,7 @@ onMounted(() => { + />
@@ -304,7 +307,7 @@ onMounted(() => { .info-row { display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: 240px 240px 240px; /* 每列固定宽度 */ gap: 171px; align-items: start; } diff --git a/src/views/team/index.vue b/src/views/team/index.vue index 0cb26cb..c6492b2 100644 --- a/src/views/team/index.vue +++ b/src/views/team/index.vue @@ -9,6 +9,10 @@ const handleAddUser = () => { router.push('/team/new-user'); // 跳转到新增用户页面的路由 }; +const handleViewDetail = (id) => { + router.push(`/team/detail/${id}`); // 跳转到带有用户ID的详情页 +}; + const tableData = ref([]); const allData = ref([ @@ -336,8 +340,7 @@ onMounted(async() =>{