update

@@ -71,15 +71,25 @@ class RankDataController extends BaseController
      * @date 2023/5/15
      */
     public function export(RankDataLogic $logic){
+        $lang = $this->request['lang'] ??'';
         $data = $logic->keywords_rank_list(true);
 
+        $img_position = $video_position= false;
         foreach ($data as &$item){
             $item['domain'] = explode('：', $item['domain'])[1];
             $item['lang'] = $this->request['lang'] ?: 'en';
             $item['g_text'] = RankData::gMap()[$item['g']]??'';
+            $item['img_position'] = $item['img_position'] ?? '';
+            $item['video_position'] = $item['video_position'] ?? '';
             foreach ($item['position'] as $date => $position){
                 $item[$date] = $position;
             }
+            if(isset($item['img_position'])){
+                $img_position = true;
+            }
+            if(isset($item['video_position'])){
+                $video_position = true;
+            }
         }
 
         $map = [
@@ -91,9 +101,11 @@ class RankDataController extends BaseController
         foreach ($data[0]['position'] as $date => $position){
             $map[$date] = $date;
         }
+        $img_position && $map['img_position'] = '图片';
+        $video_position && $map['video_position'] = '视频';
 
         //生成文件，发送到客户端
-        $table = new BatchExportService("关键词数据导出");
+        $table = new BatchExportService($lang . "关键词数据导出");
         $file = $table->head($map)->data($data)->save();
         if (!$file) {
             throw new \Exception('文件生成失败，请重试');
@@ -104,7 +116,7 @@ class RankDataController extends BaseController
     }
 
     /**
-     * 数据导出
+     * 历史数据导出
      * @author zbj
      * @date 2023/5/15
      */

@@ -184,8 +184,17 @@ class RankDataLogic extends BaseLogic
                 'keyword' => $key,
                 'domain' => $domain_text,
                 'g' => $last['g'],  //1核心关键词
-                'position' => $data
+                'position' => $data,
             ];
+            //图片排名
+            if(isset($last['p_img'])){
+                $v['img_position'] = $last['p_img'];
+            }
+            //视频排名
+            if(isset($last['p_vid'])){
+                $v['video_position'] = $last['p_vid'];
+            }
+
             if ($last['position'] == 0) {
                 $list0[] = $v;
             } elseif ($last['position'] <= 30) {