pengchanglu hace 3 años
padre
commit
f9d40e1c53

+ 9 - 9
application/admin/controller/Dashboard.php

@@ -65,7 +65,7 @@ class Dashboard extends Backend
             $starttime = Date::unixtime('day', -6);
             $endtime = Date::unixtime('day', 0, 'end');
         //$joinlist = Db("p_order")->where('jointime', 'between time', [$starttime, $endtime])->field('jointime, status, COUNT(*) AS nums, DATE_FORMAT(FROM_UNIXTIME(jointime), "%Y-%m-%d") AS join_date')
-            $joinlist = Db("p_order")->where($where)->field('createtime, status,COUNT(*) AS nums, SUM(num) AS sum, DATE_FORMAT(FROM_UNIXTIME(createtime), "%Y-%m-%d") AS join_date')
+            $joinlist = Db("p_order")->where($where)->field('leavetime, status,COUNT(*) AS nums, SUM(num) AS sum, DATE_FORMAT(FROM_UNIXTIME(leavetime), "%Y-%m-%d") AS join_date')
             ->group('join_date')
             ->select();
             for ($time = $starttime; $time <= $endtime;) {
@@ -85,12 +85,12 @@ class Dashboard extends Backend
             'totalorder'       => Order::where($where)->count(),//订单总数
             //'totaladdon'      => count(get_addon_list()),
             //'totaladmin'      => Admin::count();
-            'todaycode' => Order::where($where)->whereTime('createtime', 'today')->sum('num'),//码总数
-            'todayorder'  => Order::where($where)->whereTime('createtime', 'today')->count(),//订单总数
-            'sevencode'        => Order::where($where)->whereTime('createtime', '-7 days')->sum('num'),
-            'sevenorder'        => Order::where($where)->whereTime('createtime', '-7 days')->count(),
-            'thirtycode'       => Order::where($where)->whereTime('createtime', '-30 days')->sum('num'),
-            'thirtyorder'       => Order::where($where)->whereTime('createtime', '-30 days')->count(),
+            'todaycode' => Order::where($where)->whereTime('leavetime', 'today')->sum('num'),//码总数
+            'todayorder'  => Order::where($where)->whereTime('leavetime', 'today')->count(),//订单总数
+            'sevencode'        => Order::where($where)->whereTime('leavetime', '-7 days')->sum('num'),
+            'sevenorder'        => Order::where($where)->whereTime('leavetime', '-7 days')->count(),
+            'thirtycode'       => Order::where($where)->whereTime('leavetime', '-30 days')->sum('num'),
+            'thirtyorder'       => Order::where($where)->whereTime('leavetime', '-30 days')->count(),
 
             'totalcategory'   => \app\common\model\Category::count(),
             'dbtablenums'     => count($dbTableList),
@@ -105,7 +105,7 @@ class Dashboard extends Backend
 
 
             //饼图 7
-            $pielist = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.province_id = 1 AND o.createtime>='.$starttime.' AND o.`createtime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
+            $pielist = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.province_id = 1 AND o.leavetime>='.$starttime.' AND o.`leavetime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
 
             $piecolumn = [];
             $piedata = [];
@@ -121,7 +121,7 @@ class Dashboard extends Backend
 
             //饼图 30
             $starttime30 = Date::unixtime('day', -29);
-            $pielist30 = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.province_id = 1 AND o.createtime>='.$starttime30.' AND o.`createtime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
+            $pielist30 = Db::query('SELECT c.name,COUNT(*) AS num ,SUM(num) AS sums FROM `pi_p_order` AS o LEFT JOIN `pi_p_company` AS c ON o.`'.$pie_filed.'` = c.id  WHERE o.province_id = 1 AND o.leavetime>='.$starttime30.' AND o.`leavetime`<'.$endtime.' GROUP BY o.`'.$pie_filed.'` ;');
 
             $piecolumn30 = [];
             $piedata30 = [];

+ 24 - 48
application/admin/view/dashboard/index.html

@@ -173,50 +173,6 @@
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
-
-                <div class="row">
-<!--
-                    <div class="col-sm-3 col-xs-6">
-                        <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>
-                            <div class="sm-st-info">
-                                <span></span>
-                                {:__('Total user')}
-                            </div>
-                        </div>
-                    </div>
--->
-                    <div class="col-sm-3 col-xs-6">
-                        <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-violet"><i class="fa fa-magic"></i></span>
-                            <div class="sm-st-info">
-                                <span>{$totalcode}</span>
-                                溯源码数
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-3 col-xs-6">
-                        <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-blue"><i class="fa fa-leaf"></i></span>
-                            <div class="sm-st-info">
-                                <span>{$totalorder}</span>
-                                订单数
-                            </div>
-                        </div>
-                    </div>
-<!--
-                    <div class="col-sm-3 col-xs-6">
-                        <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-green"><i class="fa fa-user"></i></span>
-                            <div class="sm-st-info">
-                                <span></span>
-                                {:__('Total admin')}
-                            </div>
-                        </div>
-                    </div
--->
-                </div>
-
                 <div class="row">
                        <div class="col-lg-4">
                         <div class="card sameheight-item stats">
@@ -233,7 +189,7 @@
                                         </div>
                                     </div>
                                     <div class="col-xs-6 stat-col">
-                                        <div class="stat-icon"><i class="fa fa-vcard"></i></div>
+                                        <div class="stat-icon"><i class="fa fa-rocket"></i></div>
                                         <div class="stat">
                                             <div class="value"> {$todayorder}</div>
                                             <div class="name"> 今日订单数</div>
@@ -243,7 +199,7 @@
                                         </div>
                                     </div>
                                     <div class="col-xs-6  stat-col">
-                                        <div class="stat-icon"><i class="fa fa-calendar"></i></div>
+                                        <div class="stat-icon"><i class="fa fa-calendar-plus-o"></i></div>
                                         <div class="stat">
                                             <div class="value"> {$sevencode}</div>
                                             <div class="name"> 7日溯源码数</div>
@@ -263,7 +219,7 @@
                                         </div>
                                     </div>
                                     <div class="col-xs-6  stat-col">
-                                        <div class="stat-icon"><i class="fa fa-user-circle"></i></div>
+                                        <div class="stat-icon"><i class="fa fa-calendar"></i></div>
                                         <div class="stat">
                                             <div class="value"> {$thirtycode}</div>
                                             <div class="name"> 30日溯源码数</div>
@@ -273,7 +229,7 @@
                                         </div>
                                     </div>
                                     <div class="col-xs-6  stat-col">
-                                        <div class="stat-icon"><i class="fa fa-user-circle-o"></i></div>
+                                        <div class="stat-icon"><i class="fa fa-calendar"></i></div>
                                         <div class="stat">
                                             <div class="value"> {$thirtyorder}</div>
                                             <div class="name"> 30日订单数</div>
@@ -282,6 +238,26 @@
                                             <div class="progress-bar progress-bar-success" style="width: 20%"></div>
                                         </div>
                                     </div>
+                                    <div class="col-xs-6  stat-col">
+                                        <div class="stat-icon"><i class="fa fa-database"></i></div>
+                                        <div class="stat">
+                                            <div class="value"> {$totalcode}</div>
+                                            <div class="name"> 溯源码总数</div>
+                                        </div>
+                                        <div class="progress">
+                                            <div class="progress-bar progress-bar-success" style="width: 20%"></div>
+                                        </div>
+                                    </div>
+                                    <div class="col-xs-6  stat-col">
+                                        <div class="stat-icon"><i class="fa fa-database"></i></div>
+                                        <div class="stat">
+                                            <div class="value"> {$totalorder}</div>
+                                            <div class="name"> 订单总数</div>
+                                        </div>
+                                        <div class="progress">
+                                            <div class="progress-bar progress-bar-success" style="width: 20%"></div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>