github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-20 15:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 新增OKR图标和task图标对等显示

Browse Source
This commit is contained in:
ganzizi 2023-07-31 14:57:27 +08:00
parent 142de587e4
commit 9d7d2b3fda
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/UserSelect.vue
View File

@ -45,6 +45,7 @@
<i v-else-if="item.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i> <i v-else-if="item.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i>
<i v-else-if="item.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i> <i v-else-if="item.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i>
<i v-else-if="item.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i> <i v-else-if="item.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i>
<i v-else-if="item.group_type=='okr'" class="taskfont icon-avatar task">&#xe6f4;</i>
<Icon v-else class="icon-avatar" type="ios-people" /> <Icon v-else class="icon-avatar" type="ios-people" />
</template> </template>
<UserAvatar v-else :userid="item.userid" tooltip-disabled/> <UserAvatar v-else :userid="item.userid" tooltip-disabled/>
@ -112,6 +113,7 @@
<i v-else-if="item.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i> <i v-else-if="item.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i>
<i v-else-if="item.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i> <i v-else-if="item.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i>
<i v-else-if="item.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i> <i v-else-if="item.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i>
<i v-else-if="item.group_type=='okr'" class="taskfont icon-avatar task">&#xe6f4;</i>
<Icon v-else class="icon-avatar" type="ios-people" /> <Icon v-else class="icon-avatar" type="ios-people" />
<div class="avatar-name"> <div class="avatar-name">
<span>{{item.name}}</span> <span>{{item.name}}</span>

1
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -24,6 +24,7 @@
<i v-else-if="dialogData.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i> <i v-else-if="dialogData.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i>
<i v-else-if="dialogData.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i> <i v-else-if="dialogData.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i>
<i v-else-if="dialogData.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i> <i v-else-if="dialogData.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i>
<i v-else-if="dialogData.group_type=='okr'" class="taskfont icon-avatar task">&#xe6f4;</i>
<Icon v-else class="icon-avatar" type="ios-people" /> <Icon v-else class="icon-avatar" type="ios-people" />
</template> </template>
<div v-else-if="dialogData.dialog_user" class="user-avatar"> <div v-else-if="dialogData.dialog_user" class="user-avatar">

1
resources/assets/js/pages/manage/messenger.vue
View File

@ -69,6 +69,7 @@
<i v-else-if="dialog.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i> <i v-else-if="dialog.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i>
<i v-else-if="dialog.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i> <i v-else-if="dialog.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i>
<i v-else-if="dialog.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i> <i v-else-if="dialog.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i>
<i v-else-if="dialog.group_type=='okr'" class="taskfont icon-avatar task">&#xe6f4;</i>
<Icon v-else class="icon-avatar" type="ios-people" /> <Icon v-else class="icon-avatar" type="ios-people" />
</template> </template>
<div v-else-if="dialog.dialog_user" class="user-avatar"><UserAvatar :userid="dialog.dialog_user.userid" :size="42"/></div> <div v-else-if="dialog.dialog_user" class="user-avatar"><UserAvatar :userid="dialog.dialog_user.userid" :size="42"/></div>

4
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -316,6 +316,10 @@
background-image: url("../images/dialog/task.svg"); background-image: url("../images/dialog/task.svg");
} }
&.okr i {
background-image: url("../images/dialog/task.svg");
}
&.active { &.active {
font-weight: 500; font-weight: 500;
color: $primary-color; color: $primary-color;