Skip to content

Commit ec656cf

Browse files
liaodeitygitee-org
liaodeity
authored and
gitee-org
committed
!3 更新版本8.0.0
Merge pull request !3 from liaodeity/8.x
2 parents 0b7cea3 + 640b86b commit ec656cf

File tree

13 files changed

+173
-572
lines changed

13 files changed

+173
-572
lines changed

‎app/Http/Controllers/Admin/MainController.php

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use App\Models\Menu;
2424
use App\Models\Recall;
2525
use App\Models\User;
26+
use App\Models\WebView;
2627
use Illuminate\Http\Request;
2728
use Illuminate\Support\Carbon;
2829
use Illuminate\Support\Facades\Artisan;
@@ -45,7 +46,7 @@ public function console ()
4546
$shortcutList = Menu::where ('status', 1)->where ('is_shortcut', 1)->orderBy ('sort', 'ASC')->get ();
4647
foreach ($shortcutList as $key => $menu) {
4748
//屏蔽无权限菜单
48-
if ($menu['auth_name'] && !check_admin_auth ($menu['auth_name'].'_index')) {
49+
if ($menu['auth_name'] && !check_admin_auth ($menu['auth_name'] . '_index')) {
4950
unset($shortcutList[ $key ]);
5051
}
5152
}
@@ -226,40 +227,25 @@ protected function authMenu ($initData)
226227
/**
227228
* 获取实时统计数据 add by gui
228229
*/
229-
public function sync_real_num ()
230+
public function syncRealNum ()
230231
{
231232
$monthDate = date ('Y-m-01');
232233
$userId = get_login_user_id ();
233-
$noDone = 0;
234-
$againNoDone = 0;
235-
$monthDone = 0;
236-
$allDone = 0;
237-
$noAssigner = 0;
238-
if (User::onlyOperatorAuth ()) {
239-
//只有话务员权限的时候
240-
$noDone = Recall::where ('is_done', 0)->where ('recall_user_id', $userId)->count ('id');
241-
$againNoDone = Recall::where ('is_done', 0)->where ('recallstatus', '>', 0)->where ('recall_user_id', $userId)->count ('id');
242-
$monthDone = Recall::where ('is_done', 1)->where ('recalldate', '>=', $monthDate)->where ('recall_user_id', $userId)->count ('id');
243-
$allDone = Recall::where ('is_done', 1)->where ('recall_user_id', $userId)->count ('id');
244-
} else {
245-
$noDone = Recall::where ('is_done', 0)->count ('id');
246-
$againNoDone = Recall::where ('is_done', 0)->where ('recallstatus', '>', 0)->count ('id');
247-
$monthDone = Recall::where ('is_done', 1)->where ('recalldate', '>=', $monthDate)->count ('id');
248-
$allDone = Recall::where ('is_done', 1)->count ('id');
249-
$noAssigner = Recall::where ('recall_user_id', 0)->count ('id');
250-
}
234+
$todayOrderCount = 0;
235+
$monthOrderCount = 0;
236+
$monthOrderMoney = '0.00';
237+
$memberCount = User\UserMember::count ();
251238

252239

253-
$result['no_done'] = $noDone;
254-
$result['again_no_done'] = $againNoDone;
255-
$result['month_done'] = $monthDone;
256-
$result['all_done'] = $allDone;
257-
$result['no_assigner'] = $noAssigner;
240+
$result['member'] = $memberCount;
241+
$result['today_order'] = $todayOrderCount;
242+
$result['month_order'] = $monthOrderCount;
243+
$result['month_order_money'] = $monthOrderMoney;
258244

259245
return ajax_success_result ('', $result);
260246
}
261247

262-
public function get_echart ()
248+
public function getEchart ()
263249
{
264250
$date_str = request ()->input ('dates');
265251
$date = array_get_date ($date_str);
@@ -273,29 +259,36 @@ public function get_echart ()
273259
if (empty($end_date)) {
274260
$end_date = Carbon::now ()->toDateString ();
275261
}
276-
//已完成回访数
277-
$doneRecall = Recall::selectRaw ('COUNT(1) as count,DATE(recalldate) as date')
278-
->whereDate ('recalldate', '>=', $start_date)
279-
->whereDate ('recalldate', '<=', $end_date)
280-
->where ('is_done', '=', 1)
281-
->groupByRaw ('DATE(recalldate)')
282-
->orderBy ('date', 'ASC');
283-
$doneDate = [];
284-
if (User::onlyOperatorAuth ()) {
285-
//只有话务员权限的时候
286-
$doneRecall = $doneRecall->where ('recall_user_id', get_login_user_id ());
262+
//访问用户
263+
$webUser = WebView::selectRaw ('COUNT(DISTINCT web_user) as count,DATE(view_at) as date')
264+
->whereDate ('view_at', '>=', $start_date)
265+
->whereDate ('view_at', '<=', $end_date)
266+
->groupByRaw ('DATE(view_at)')
267+
->orderBy ('date', 'ASC')->get ();
268+
$userData = [];
269+
270+
foreach ($webUser as $log) {
271+
$userData[ $log->date ] = $log->count ?? 0;
287272
}
288-
foreach ($doneRecall->get () as $log) {
289-
$doneDate[ $log->date ] = $log->count ?? 0;
273+
//访问次数
274+
$webView = WebView::selectRaw ('COUNT(web_user) as count,DATE(view_at) as date')
275+
->whereDate ('view_at', '>=', $start_date)
276+
->whereDate ('view_at', '<=', $end_date)
277+
->groupByRaw ('DATE(view_at)')
278+
->orderBy ('date', 'ASC')->get();
279+
$viewData = [];
280+
foreach ($webView as $log) {
281+
$viewData[ $log->date ] = $log->count ?? 0;
290282
}
291283

292-
for ($i = 0; $i < 90; $i++) {
284+
for ($i = 0; $i < 100; $i++) {
293285
$_date = Carbon::parse ($start_date)->addDays ($i)->toDateString ();
294286
if ($_date > $end_date) {
295287
break;
296288
}
297289
$x_data[] = $_date;
298-
$series['done'][] = isset($doneDate[ $_date ]) ? $doneDate[ $_date ] : 0;
290+
$series['users'][] = isset($userData[ $_date ]) ? $userData[ $_date ] : 0;
291+
$series['views'][] = isset($viewData[ $_date ]) ? $viewData[ $_date ] : 0;
299292
}
300293

301294
return ajax_success_result ('', [

‎app/Http/Controllers/Home/PublicController.php

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/*
3+
|-----------------------------------------------------------------------------------------------------------
4+
| laravel-admin-cms [ 简单高效的开发插件系统 ]
5+
|-----------------------------------------------------------------------------------------------------------
6+
| Licensed ( MIT )
7+
| ----------------------------------------------------------------------------------------------------------
8+
| Copyright (c) 2020-2021 https://gitee.com/liaodeiy/laravel-admin-cms All rights reserved.
9+
| ----------------------------------------------------------------------------------------------------------
10+
| Author: 廖春贵 < liaodeity@gmail.com >
11+
|-----------------------------------------------------------------------------------------------------------
12+
*/
13+
14+
namespace App\Http\Controllers\Home;
15+
16+
17+
use App\Http\Controllers\Controller;
18+
use App\Models\WebView;
19+
use Illuminate\Http\Request;
20+
21+
class PublicController extends Controller
22+
{
23+
public function webViewBrowsing (Request $request)
24+
{
25+
$web_user = get_login_user_id ();
26+
$userAgent = $request->userAgent ();
27+
$clientId = $request->getClientIp ();
28+
$viewUrl = $request->input ('url');
29+
if (!$viewUrl) {
30+
$viewUrl = $request->header ('referer');
31+
}
32+
if (!$web_user) {
33+
$web_user = session ()->getId ();
34+
}
35+
$insArr = [
36+
'web_user' => $web_user,
37+
'user_agent' => $userAgent,
38+
'client_id' => $clientId,
39+
'view_url' => $viewUrl,
40+
'view_at' => now ()
41+
];
42+
$ret = WebView::create ($insArr);
43+
$data = ['result' => $ret ? true : false];
44+
45+
return ajax_success_result ('', $data);
46+
}
47+
}

‎app/Models/WebView.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
/*
3+
|-----------------------------------------------------------------------------------------------------------
4+
| laravel-admin-cms [ 简单高效的开发插件系统 ]
5+
|-----------------------------------------------------------------------------------------------------------
6+
| Licensed ( MIT )
7+
| ----------------------------------------------------------------------------------------------------------
8+
| Copyright (c) 2020-2021 https://gitee.com/liaodeiy/laravel-admin-cms All rights reserved.
9+
| ----------------------------------------------------------------------------------------------------------
10+
| Author: 廖春贵 < liaodeity@gmail.com >
11+
|-----------------------------------------------------------------------------------------------------------
12+
*/
13+
14+
namespace App\Models;
15+
16+
use Illuminate\Database\Eloquent\Model;
17+
18+
class WebView extends Model
19+
{
20+
public $timestamps = false;
21+
protected $fillable = ['web_user', 'view_url', 'client_ip', 'user_agent', 'view_at'];
22+
}

‎public/static/layuimini/js/lay-module/layuimini/miniAdmin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ layui.define(["jquery", "miniMenu", "element","miniTab", "miniTheme"], function
262262
$.getJSON(clearUrl, function (data, status) {
263263
layer.close(loading);
264264
if (data.code !== 0) {
265-
return miniAdmin.error(data.msg);
265+
return miniAdmin.error(data.message);
266266
} else {
267-
return miniAdmin.success(data.msg);
267+
return miniAdmin.success(data.message);
268268
}
269269
}).fail(function () {
270270
layer.close(loading);

‎readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ php artisan serve
6767
### 开发文档
6868

6969
- [https://www.jianbaizhan.com/cmf/docs](https://www.jianbaizhan.com/cmf/docs)
70-
- [https://gitee.com/liaodeiy/laravel-admin-docs](https://gitee.com/liaodeiy/laravel-admin-docs)
7170

7271

7372

0 commit comments

Comments
 (0)