Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint205_leiyong_task_57878' into 'master'

Browse Source 
Sprint205 leiyong task 57878

See merge request easycorp/zentaopms!4074
This commit is contained in:
王怡栋
2022-06-23 00:41:00 +00:00
parent 4dab93ee3b aeaf517513
commit 6fd3c28a23
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/todoblock.html.php
+26 -10
View File
@@ -21,10 +21,10 @@ if(!$selfCall) die(include('./todolist.html.php'));
.block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto; overflow-x:hidden}
.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;}
.block-todoes .todoes > li:hover {background-color: #e9f2fb;}
.block-todoes .todo-title {padding: 5px 15px 5px 5px;}
.block-todoes .todo-title {padding: 0px;}
.titleBox {max-width: 700px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;}
.block-todoes .todo-pri {margin: 0 5px;}
.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px;}
.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px; min-width: 95px;}
.block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;}
.block-todoes .todo-check:hover {border-color: #8e939a;}
.block-todoes .active > .todo-check {color: #00da88; background: transparent;border: none;}
@@ -34,6 +34,10 @@ if(!$selfCall) die(include('./todolist.html.php'));
.block-todoes .todoes-form > .form-group:last-child {margin-bottom: 0;}
.block-todoes .todoes-form > h3 {padding: 0 20px 15px; margin: 0 -20px 5px; font-size: 14px; line-height: 20px;}
.block-todoes.show-form .todoes-form {visibility: visible; opacity: 1;}
.block-todoes .todo-flexbetween {display: flex; justify-content: space-between;}
.block-todoes #todoList {display: flex; overflow: hidden;}
.block-todoes .label-todo {width: 50px; min-width: 50px!important; border: none; color: #43A047;}
[lang^='en'] .block-todoes .todo-pri {width: 60px; min-width: 60px;}
</style>
<div class='block-todoes'>
<div class='panel-body'>
@@ -97,14 +101,17 @@ if(!$selfCall) die(include('./todolist.html.php'));
?>
<li data-id='<?php echo $todo->id?>' class='titleBox'>
<span class="todo-check icon icon-check-circle"></span>
<a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe' data-width='1000px' data-toggle='modal' <?php echo $appid?>>
<?php if ($todo->date == '2030-01-01') :?>
<span class="todo-time"><?php echo $lang->todo->periods['future'] ?></span>
<?php else:?>
<span class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></span>
<?php endif;?>
<span class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span>
<span class="todo-title" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></span>
<a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe todo-flexbetween' data-width='1000px' data-toggle='modal' <?php echo $appid?>>
<div id='todoList'>
<?php if ($todo->date == '2030-01-01') :?>
<div class="todo-time"><?php echo $lang->todo->periods['future'] ?></div>
<?php else:?>
<div class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></div>
<?php endif;?>
<div class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></div>
<div class="todo-title text-ellipsis" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></div>
</div>
<span class="label label-id label-todo hidden"><?php echo $lang->block->done;?></span>
</a>
</li>
<?php endforeach;?>
@@ -166,6 +173,15 @@ if(!$selfCall) die(include('./todolist.html.php'));
if(!isFinished) $liTag.addClass('active');
if(isFinished) $liTag.removeClass('active');
});
if(isFinished)
{
$(this).next().find('.label-todo').addClass('hidden');
}
else
{
$(this).next().find('.label-todo').removeClass('hidden');
}
});
});
module/task/view/report.html.php
+4 -2
View File
@@ -62,7 +62,7 @@
<tr>
<th class='chart-label' colspan='2'><?php echo $lang->task->report->$chartType->item;?></th>
<th class='w-60px text-right'><?php echo $lang->task->report->value;?></th>
<th class='w-60px'><?php echo $lang->report->percent;?></th>
<th class='w-60px text-right'><?php echo $lang->report->percent;?></th>
</tr>
</thead>
<tbody>
@@ -71,7 +71,9 @@
<td class='chart-color w-20px'><i class='chart-color-dot'></i></td>
<td class='chart-label text-left'><?php echo $data->name;?></td>
<td class='chart-value text-right'><?php echo $data->value;?></td>
<td class='text-right'><?php echo ($data->percent * 100) . '%';?></td>
<?php $percent = $data->percent * 100;?>
<?php $percent = sprintf("%.2f", $percent);?>
<td class='text-right'><?php echo $percent . '%';?></td>
</tr>
<?php endforeach;?>
</tbody>