diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php index 2dd2e06..f68c923 100644 --- a/application/admin/controller/Dashboard.php +++ b/application/admin/controller/Dashboard.php @@ -23,60 +23,17 @@ class Dashboard extends Backend */ public function index() { - try { - \think\Db::execute("SET @@sql_mode='';"); - } catch (\Exception $e) { - } - $column = []; - $starttime = Date::unixtime('day', -6); - $endtime = Date::unixtime('day', 0, 'end'); - $joinlist = Db("user")->where('jointime', 'between time', [$starttime, $endtime]) - ->field('jointime, status, COUNT(*) AS nums, DATE_FORMAT(FROM_UNIXTIME(jointime), "%Y-%m-%d") AS join_date') - ->group('join_date') - ->select(); - for ($time = $starttime; $time <= $endtime;) { - $column[] = date("Y-m-d", $time); - $time += 86400; - } - $userlist = array_fill_keys($column, 0); - foreach ($joinlist as $k => $v) { - $userlist[$v['join_date']] = $v['nums']; - } + $car_num = Db::query('SELECT +COUNT(IF(car_type = 1,1,null)) new_car, +COUNT(IF(car_type = 3,1,null)) rent_car, +COUNT(IF(car_type = 2,1,null)) old_car + FROM cars;')[0]; - $dbTableList = Db::query("SHOW TABLE STATUS"); - $addonList = get_addon_list(); - $totalworkingaddon = 0; - $totaladdon = count($addonList); - foreach ($addonList as $index => $item) { - if ($item['state']) { - $totalworkingaddon += 1; - } - } $this->view->assign([ - 'totaluser' => User::count(), - 'totaladdon' => $totaladdon, - 'totaladmin' => Admin::count(), - 'totalcategory' => \app\common\model\Category::count(), - 'todayusersignup' => User::whereTime('jointime', 'today')->count(), - 'todayuserlogin' => User::whereTime('logintime', 'today')->count(), - 'sevendau' => User::whereTime('jointime|logintime|prevtime', '-7 days')->count(), - 'thirtydau' => User::whereTime('jointime|logintime|prevtime', '-30 days')->count(), - 'threednu' => User::whereTime('jointime', '-3 days')->count(), - 'sevendnu' => User::whereTime('jointime', '-7 days')->count(), - 'dbtablenums' => count($dbTableList), - 'dbsize' => array_sum(array_map(function ($item) { - return $item['Data_length'] + $item['Index_length']; - }, $dbTableList)), - 'totalworkingaddon' => $totalworkingaddon, - 'attachmentnums' => Attachment::count(), - 'attachmentsize' => Attachment::sum('filesize'), - 'picturenums' => Attachment::where('mimetype', 'like', 'image/%')->count(), - 'picturesize' => Attachment::where('mimetype', 'like', 'image/%')->sum('filesize'), + ...$car_num ]); - $this->assignconfig('column', array_keys($userlist)); - $this->assignconfig('userdata', array_values($userlist)); return $this->view->fetch(); } diff --git a/application/admin/view/dashboard/index.html b/application/admin/view/dashboard/index.html index 1b0bc3a..537c0fb 100644 --- a/application/admin/view/dashboard/index.html +++ b/application/admin/view/dashboard/index.html @@ -1,403 +1,78 @@ -