diff --git a/src/assets/images/create-plan.png b/src/assets/images/create-plan.png new file mode 100644 index 0000000..ce1a979 Binary files /dev/null and b/src/assets/images/create-plan.png differ diff --git a/src/assets/images/create-task-detail.png b/src/assets/images/create-task-detail.png new file mode 100644 index 0000000..08c93bf Binary files /dev/null and b/src/assets/images/create-task-detail.png differ diff --git a/src/assets/images/create-task-quick.png b/src/assets/images/create-task-quick.png new file mode 100644 index 0000000..1372907 Binary files /dev/null and b/src/assets/images/create-task-quick.png differ diff --git a/src/assets/images/manage-collaborator.png b/src/assets/images/manage-collaborator.png new file mode 100644 index 0000000..4066425 Binary files /dev/null and b/src/assets/images/manage-collaborator.png differ diff --git a/src/assets/images/subtask-view.png b/src/assets/images/subtask-view.png new file mode 100644 index 0000000..3751987 Binary files /dev/null and b/src/assets/images/subtask-view.png differ diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index 3186611..ab12ff5 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -11,9 +11,12 @@ /> - + - {{t('layout.header.welcomeIn')}} {{ title }} + {{ t('layout.header.welcomeIn') }} {{ title }} @@ -42,6 +45,7 @@ + {{ realname }} @@ -108,7 +112,7 @@ const { prefixCls } = useDesign('layout-header'); const userStore = useUserStore(); const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting(); - const { getUseErrorHandle, /* getShowSettingButton, getSettingButtonPosition, getAiIconShow */ } = useRootSetting(); + const { getUseErrorHandle /* getShowSettingButton, getSettingButtonPosition, getAiIconShow */ } = useRootSetting(); const { title } = useGlobSetting(); const { @@ -167,6 +171,10 @@ return unref(getSplit) ? MenuModeEnum.HORIZONTAL : null; }); + const realname = computed(() => { + return userStore.getUserInfo?.realname || ''; + }); + /** * 首页多租户部门弹窗逻辑 */ @@ -210,6 +218,7 @@ getUseErrorHandle, getLogoWidth, getIsMixSidebar, + realname, // getShowSettingButton, // getShowSetting, // getShowSearch, @@ -228,7 +237,7 @@ //update-begin---author:scott ---date:2022-09-30 for:默认隐藏顶部菜单面包屑----------- //顶部欢迎语展示样式 @prefix-cls: ~'@{namespace}-layout-header'; - + .ant-layout .@{prefix-cls} { display: flex; padding: 0 8px; @@ -236,7 +245,7 @@ height: @header-height; // update-end--author:liaozhiyang---date:20240407---for:【QQYUN-8762】顶栏高度 align-items: center; - + .headerIntroductionClass { margin-right: 4px; margin-bottom: 2px; @@ -251,7 +260,26 @@ height: 32px; width: auto; } - + + .header-username { + font-size: 13px; + font-weight: 500; + cursor: default; + pointer-events: none; + } + + &--light { + .header-username { + color: #1677ff; + } + } + + &--dark { + .header-username { + color: rgba(255, 255, 255, 0.85); + } + } + &--light { .headerIntroductionClass { color: #000; @@ -262,7 +290,8 @@ .headerIntroductionClass { color: rgba(255, 255, 255, 1); } - .anticon, .truncate { + .anticon, + .truncate { color: rgba(255, 255, 255, 1); } } diff --git a/src/views/tasklist/components/HelpModal.vue b/src/views/tasklist/components/HelpModal.vue new file mode 100644 index 0000000..8a38764 --- /dev/null +++ b/src/views/tasklist/components/HelpModal.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/src/views/tasklist/components/TaskContent.vue b/src/views/tasklist/components/TaskContent.vue index 9dd76c4..83d1376 100644 --- a/src/views/tasklist/components/TaskContent.vue +++ b/src/views/tasklist/components/TaskContent.vue @@ -1,8 +1,23 @@