Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -54,6 +54,19 @@ class OptimizeController extends BaseController
                 $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
                 $v['g'] = $this->getGNum($v['id']);
                 $v = $this->handleParam($v);
+
+                //特殊项目 两个api_no
+//                if($v['id'] == 2104){
+//                    $keyword_num_map = [10690=>100, 11201 => 50];
+//                    foreach ($keyword_num_map as $api_no => $keyword_num){
+//                        $data = $rankDataModel->read(['project_id'=>$v['id'],'api_no' => $api_no, 'lang'=>''],['first_page_num','indexed_pages_num']);
+//                        $v['first_page_num'][] = $data['first_page_num'] ?? 0;
+//                        $v['indexed_pages_num'][] = $data['indexed_pages_num'] ?? 0;
+//                        $v['g'][] = $this->getGNum($v['id'], $api_no);
+//                        $v['keyword_num'][] = $keyword_num;
+//                    }
+//                }
+
                 $lists['list'][$k] = $v;
             }
         }
@@ -99,9 +112,12 @@ class OptimizeController extends BaseController
      * @method :post
      * @time   :2024/1/6 11:12
      */
-    public function getGNum($project_id){
+    public function getGNum($project_id, $api_no = ''){
         $num = 0;
-        $list = RankData::where('project_id', $project_id)->where('lang', '')->value('data') ?: [];
+        $list = RankData::where('project_id', $project_id)->where('lang', '')
+            ->when($api_no, function ($query, $api_no) {
+                return $query->where('api_no', $api_no);
+            })->value('data') ?: [];
         if(!empty($list)){
             foreach ($list as $v) {
                 $last = Arr::last($v);

@@ -181,6 +181,7 @@ class RankDataLogic extends BaseLogic
         //多个api_no项目 切换api_no查看数据
         if($project_id == 2104){
             $data['other_api_no'] = $api_no ==  10690 ? 11201 : 10690;
+            $data['other_api_no_source'] = $api_no ==  10690 ? 'yandex' : 'google';
         }
 
         return $data;