Merge remote-tracking branch 'origin/master' into akun

@@ -451,7 +451,7 @@ class RankDataLogic extends BaseLogic
         $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0;
         $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0;
         $first_page_without_extension_num = 0; //不算扩展词在首页的数量
         $first_page_without_extension_num = 0; //不算扩展词在首页的数量
         $first_page_extension_num = 0; //扩展词在首页的数量
         $first_page_extension_num = 0; //扩展词在首页的数量
-
+        $g_top_first_page_extension_num = 0;
         foreach ($data as &$ranks){
         foreach ($data as &$ranks){
             ksort($ranks);
             ksort($ranks);
 //                foreach ($ranks as &$rank){
 //                foreach ($ranks as &$rank){
@@ -473,6 +473,7 @@ class RankDataLogic extends BaseLogic
                 $first_page_num ++;
                 $first_page_num ++;
                 $last['g'] == 1 && $first_page_without_extension_num++;
                 $last['g'] == 1 && $first_page_without_extension_num++;
                 $last['g'] == 2 && $first_page_extension_num++;
                 $last['g'] == 2 && $first_page_extension_num++;
+                $last['g'] == 3 && $g_top_first_page_extension_num++;
             }
             }
             //排名前三页
             //排名前三页
             if($last['position'] > 0 && $last['position'] <= 30){
             if($last['position'] > 0 && $last['position'] <= 30){
@@ -496,7 +497,7 @@ class RankDataLogic extends BaseLogic
             $model = new RankData();
             $model = new RankData();
         }
         }
         //g-top方案达标天数
         //g-top方案达标天数
-        $this->g_top_plan($project_id,$first_page_without_extension_num);
+        $this->g_top_plan($project_id,$g_top_first_page_extension_num);
         //保证关键词数
         //保证关键词数
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $type = Project::where('id', $project_id)->value('type');
         $type = Project::where('id', $project_id)->value('type');