github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-10 08:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2023-04-10 12:36:41 +08:00
parent 1cf5a24c26
commit 4024cfb7c7
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/SystemController.php
View File

@ -575,12 +575,12 @@ class SystemController extends AbstractController
$data['error'][] = '终端MAC与License不匹配'; $data['error'][] = '终端MAC与License不匹配';
} }
} }
if ($data['user_count'] > $data['info']['people']) { }
$data['error'][] = '终端用户数超过License限制'; if ($data['user_count'] > $data['info']['people']) {
} $data['error'][] = '终端用户数超过License限制';
if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) { }
$data['error'][] = '终端License已过期'; if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) {
} $data['error'][] = '终端License已过期';
} }
// //
return Base::retSuccess('success', $data); return Base::retSuccess('success', $data);

4
resources/assets/js/pages/manage/dashboard.vue
View File

@ -2,7 +2,9 @@
<div class="page-dashboard"> <div class="page-dashboard">
<PageTitle :title="$L('仪表盘')"/> <PageTitle :title="$L('仪表盘')"/>
<div class="dashboard-wrapper"> <div class="dashboard-wrapper">
<Alert v-if="warningMsg" class="dashboard-warning" type="warning" show-icon>{{warningMsg}}</Alert> <Alert v-if="warningMsg" class="dashboard-warning" type="warning" show-icon>
<span @click="goForward({name: 'manage-setting-license'})">{{warningMsg}}</span>
</Alert>
<div class="dashboard-hello">{{$L('欢迎您，' + userInfo.nickname)}}</div> <div class="dashboard-hello">{{$L('欢迎您，' + userInfo.nickname)}}</div>
<div class="dashboard-desc"> <div class="dashboard-desc">
{{$L('以下是你当前的任务统计数据')}} {{$L('以下是你当前的任务统计数据')}}

4
resources/assets/sass/pages/page-dashboard.scss vendored
View File

@ -18,6 +18,10 @@
border-top: 0; border-top: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
padding-right: 14px;
> span {
cursor: pointer;
}
} }
.dashboard-hello, .dashboard-hello,