no message
This commit is contained in:
parent
eee1a6cb96
commit
bf106f67e3
@ -288,7 +288,6 @@ class Project extends AbstractModel
|
||||
public function deleteProject()
|
||||
{
|
||||
AbstractModel::transaction(function () {
|
||||
WebSocketDialog::whereId($this->dialog_id)->delete();
|
||||
$columns = ProjectColumn::whereProjectId($this->id)->get();
|
||||
foreach ($columns as $column) {
|
||||
$column->deleteColumn(false);
|
||||
|
@ -609,9 +609,6 @@ class ProjectTask extends AbstractModel
|
||||
public function deleteTask($pushMsg = true)
|
||||
{
|
||||
AbstractModel::transaction(function () {
|
||||
if ($this->dialog_id) {
|
||||
WebSocketDialog::whereId($this->dialog_id)->delete();
|
||||
}
|
||||
$this->delete();
|
||||
$this->addLog("删除{任务}:" . $this->name);
|
||||
});
|
||||
|
@ -262,7 +262,7 @@ class User extends AbstractModel
|
||||
if (!$user) {
|
||||
$authorization = Base::getToken();
|
||||
if ($authorization) {
|
||||
throw new ApiException('身份已失效,请重新登录', $user, -1);
|
||||
throw new ApiException('身份已失效,请重新登录', [], -1);
|
||||
} else {
|
||||
throw new ApiException('请登录后继续...', [], -1);
|
||||
}
|
||||
|
@ -3,7 +3,7 @@
|
||||
namespace App\Models;
|
||||
|
||||
use App\Exceptions\ApiException;
|
||||
use App\Module\Base;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
/**
|
||||
* Class WebSocketDialog
|
||||
@ -21,6 +21,7 @@ use App\Module\Base;
|
||||
* @property-read int|null $dialog_user_count
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newQuery()
|
||||
* @method static \Illuminate\Database\Query\Builder|WebSocketDialog onlyTrashed()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereDeletedAt($value)
|
||||
@ -30,10 +31,14 @@ use App\Module\Base;
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereName($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereType($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereUpdatedAt($value)
|
||||
* @method static \Illuminate\Database\Query\Builder|WebSocketDialog withTrashed()
|
||||
* @method static \Illuminate\Database\Query\Builder|WebSocketDialog withoutTrashed()
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class WebSocketDialog extends AbstractModel
|
||||
{
|
||||
use SoftDeletes;
|
||||
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
@ -100,10 +105,10 @@ class WebSocketDialog extends AbstractModel
|
||||
break;
|
||||
case "group":
|
||||
if ($dialog->group_type === 'project') {
|
||||
$dialog->group_info = Project::select(['id', 'name'])->whereDialogId($dialog->id)->first();
|
||||
$dialog->group_info = Project::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
|
||||
$dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
|
||||
} elseif ($dialog->group_type === 'task') {
|
||||
$dialog->group_info = ProjectTask::select(['id', 'name'])->whereDialogId($dialog->id)->first();
|
||||
$dialog->group_info = ProjectTask::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
|
||||
$dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
|
||||
}
|
||||
break;
|
||||
|
@ -8,14 +8,14 @@
|
||||
<li @click="dashboard='today'">
|
||||
<div class="block-title">{{$L('今日待完成')}}</div>
|
||||
<div class="block-data">
|
||||
<div class="block-num">{{projectStatistics.today || '...'}}</div>
|
||||
<div class="block-num">{{projectStatistics.today || 0}}</div>
|
||||
<i class="iconfont"></i>
|
||||
</div>
|
||||
</li>
|
||||
<li @click="dashboard='overdue'">
|
||||
<div class="block-title">{{$L('超期未完成')}}</div>
|
||||
<div class="block-data">
|
||||
<div class="block-num">{{projectStatistics.overdue || '...'}}</div>
|
||||
<div class="block-num">{{projectStatistics.overdue || 0}}</div>
|
||||
<i class="iconfont"></i>
|
||||
</div>
|
||||
</li>
|
||||
@ -27,6 +27,7 @@
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<template v-if="list.length > 0">
|
||||
<div class="dashboard-title">{{title}}</div>
|
||||
<ul class="dashboard-list overlay-y">
|
||||
<li v-for="item in list" :key="item.id" :style="item.color ? {backgroundColor: item.color} : {}">
|
||||
@ -76,6 +77,7 @@
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -9,6 +9,7 @@
|
||||
width: 664px;
|
||||
max-width: 80%;
|
||||
max-height: 80%;
|
||||
margin-bottom: 2%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.dashboard-hello {
|
||||
|
Loading…
x
Reference in New Issue
Block a user