gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化日志显示

Browse Source
This commit is contained in:
kuaifan 2022-01-13 19:19:58 +08:00
parent ac6b90c986
commit 5c3bf0067e
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -66,8 +66,8 @@
</Poptip> </Poptip>
</li> </li>
<!--主任务--> <!--主任务-->
<div v-else-if="ready" v-show="taskDetail.id > 0" :class="{'task-detail':true, 'open-dialog': hasOpenDialog, 'completed': taskDetail.complete_at}"> <div v-else-if="ready" :class="{'task-detail':true, 'open-dialog': hasOpenDialog, 'completed': taskDetail.complete_at}">
<div class="task-info"> <div v-show="taskDetail.id > 0" class="task-info">
<div class="head"> <div class="head">
<TaskMenu <TaskMenu
:ref="`taskMenu_${taskDetail.id}`" :ref="`taskMenu_${taskDetail.id}`"
@ -339,7 +339,7 @@
</div> </div>
<TaskUpload ref="upload" class="upload"/> <TaskUpload ref="upload" class="upload"/>
</div> </div>
<div class="task-dialog" :style="dialogStyle"> <div v-show="taskDetail.id > 0" class="task-dialog" :style="dialogStyle">
<template v-if="hasOpenDialog"> <template v-if="hasOpenDialog">
<DialogWrapper v-if="taskId > 0" ref="dialog" :dialog-id="taskDetail.dialog_id"> <DialogWrapper v-if="taskId > 0" ref="dialog" :dialog-id="taskDetail.dialog_id">
<div slot="head" class="head"> <div slot="head" class="head">
@ -389,6 +389,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="!taskDetail.id" class="task-load"><Loading/></div>
</div> </div>
</template> </template>

24
resources/assets/sass/pages/components/project-log.scss vendored
View File

@ -109,17 +109,6 @@
position: relative; position: relative;
padding: 4px 0 4px 12px; padding: 4px 0 4px 12px;
&:before {
content: "";
position: absolute;
top: 11px;
left: 0;
width: 5px;
height: 5px;
border-radius: 50%;
background-color: rgba(0, 0, 0, 0.4);
}
> span, > span,
> a { > a {
padding-right: 6px; padding-right: 6px;
@ -129,7 +118,7 @@
.log-text { .log-text {
display: inline-block; display: inline-block;
color: rgba(0, 0, 0, .5); color: rgba(0, 0, 0, .8);
.detail-user { .detail-user {
display: inline-block; display: inline-block;
@ -163,22 +152,23 @@
.log-task { .log-task {
margin-left: 12px; margin-left: 12px;
margin-bottom: 3px; margin-bottom: 6px;
opacity: 0.8; opacity: 0.6;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
opacity: 1; opacity: 1;
> em {
color: #8bcf70;
}
} }
> em { > em {
display: inline-block; display: inline-block;
font-style: normal; font-style: normal;
font-size: 12px; font-size: 12px;
padding: 0 4px;
line-height: 18px; line-height: 18px;
height: 18px; height: 18px;
max-width: 100%; max-width: 100%;
background: #f1f1f1; color: #999999;
color: #9f9f9f;
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

13
resources/assets/sass/pages/components/task-detail.scss vendored
View File

@ -3,6 +3,7 @@
flex-direction: column; flex-direction: column;
margin: 0 -32px 12px -10px; margin: 0 -32px 12px -10px;
padding: 0 22px 12px 0; padding: 0 22px 12px 0;
min-height: 120px;
overflow: auto; overflow: auto;
.task-info { .task-info {
flex: 1; flex: 1;
@ -579,6 +580,18 @@
} }
} }
} }
.task-load {
margin-top: 6px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: flex;
.common-loading {
width: 32px;
height: 32px;
}
}
&.open-dialog { &.open-dialog {
flex-direction: row; flex-direction: row;