gx

@@ -35,7 +35,7 @@ class CountController extends BaseController
         //TODO::30天pv,ip统计
         //TODO::30天pv,ip统计
         $data['visit_data'] = $countLogic->visit_data_count();
         $data['visit_data'] = $countLogic->visit_data_count();
         //TODO::询盘国家统计
         //TODO::询盘国家统计
-        $data['country_data'] = $countLogic->inquiry_country_count();
+        $data['country_data'] = json_decode($data['yesterday']['country']);
         //TODO::来源排名
         //TODO::来源排名
         $data['referrer_count'] = $countLogic->referrer_count();
         $data['referrer_count'] = $countLogic->referrer_count();
         //TODO::访问国家前10
         //TODO::访问国家前10

@@ -30,7 +30,7 @@ class CountLogic extends BaseLogic
             'date' => $yesterday,
             'date' => $yesterday,
             'project_id' => $this->user['project_id']
             'project_id' => $this->user['project_id']
         ];
         ];
-        $info = $this->model->read($param,['pv_num','ip_num','inquiry_num','date','compliance_day','service_day']);
+        $info = $this->model->read($param,['pv_num','ip_num','inquiry_num','date','compliance_day','service_day','country']);
         if($info === false){
         if($info === false){
             $info = [];
             $info = [];
         }
         }
@@ -122,23 +122,6 @@ class CountLogic extends BaseLogic
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
-    /**
-     * @name   :(询盘国家统计)inquiry_country_count
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/24 14:58
-     */
-    public function inquiry_country_count(){
-        $data = DB::table('gl_xunpan_ipdata')
-            ->select('ip_area', DB::raw('COUNT(ip_area) as count'))
-            ->groupBy('ip_area')->orderBy('count','desc')->limit(10)->get()->toArray();
-        $data = object_to_array($data);
-        $total = DB::table('gl_xunpan_ipdata')->count();
-        foreach ($data as $k=>$v){
-            $data[$k]['proportion'] = ($v['count']/$total) * 100;
-        }
-        return $this->success($data);
-    }
 
 
     /**
     /**
      * @name   :(访问来源统计)referrer_count
      * @name   :(访问来源统计)referrer_count