Merge branch 'liucan' into 'main'

fix:修复任务统计数据错误、时间选择器宽度不够

See merge request !20

src/api/spiderTask.ts

-import { request, POST } from '@/utils/request'
-import type { ApiResponse, QueryParams ,UserQueryParams } from '@/utils/request'
-import { systemApi, scrapydServerApi, spiderApi,spiderTaskApi} from './apiPaths'
+import { request, POST } from "@/utils/request";
+import type { ApiResponse, QueryParams, UserQueryParams } from "@/utils/request";
+import { systemApi, scrapydServerApi, spiderApi, spiderTaskApi, dataApi } from "./apiPaths";
 
 // 爬虫任务执行记录
 export function getSpiderTaskRecord(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.taskRecord,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 爬虫任务列表
@@ -16,8 +16,8 @@ export function getSpiderTaskList(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.taskList,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 新增/更新爬虫任务
@@ -25,8 +25,8 @@ export function addSpiderTask(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.addTask,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 删除爬虫任务
@@ -34,8 +34,8 @@ export function deleteSpiderTask(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.deleteTask,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 暂停爬虫任务
@@ -43,8 +43,8 @@ export function pauseSpiderTask(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.pauseJob,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 继续爬虫任务
@@ -52,8 +52,8 @@ export function resumeSpiderTask(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.resumeJob,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 获取爬虫任务数据
@@ -61,8 +61,8 @@ export function getTaskData(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.jobDetail,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
+    data,
+  }) as unknown as Promise<ApiResponse>;
 }
 
 // 获取爬虫任务统计
@@ -70,6 +70,14 @@ export function getTaskCount(data: UserQueryParams) {
   return request({
     url: spiderTaskApi.taskCount,
     method: POST,
-    data
-  }) as unknown as Promise<ApiResponse>
-}
\ No newline at end of file
+    data,
+  }) as unknown as Promise<ApiResponse>;
+}
+
+// 获取所有任务的统计
+export function getAllTaskStatistics() {
+  return request({
+    url: dataApi.allSpiderTaskStatistics,
+    method: POST,
+  });
+}

src/views/os-dataDisplay/components/esDataTab.vue

@@ -15,7 +15,7 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 v-model="searchTimeValue"
                 start-placeholder="开始时间"
-                style="width: 200px"
+                style="width: 400px"
                 end-placeholder="结束时间"
                 date-format="YYYY/MM/DD ddd"
                 time-format="A hh:mm:ss"

src/views/os-dataDisplay/components/ituDataTab.vue

@@ -15,7 +15,7 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 v-model="searchTimeValue"
                 start-placeholder="开始时间"
-                style="width: 200px"
+                style="width: 400px"
                 end-placeholder="结束时间"
                 date-format="YYYY/MM/DD ddd"
                 time-format="A hh:mm:ss"

src/views/os-dataDisplay/components/stDataTab.vue

@@ -18,7 +18,7 @@
                 end-placeholder="结束时间"
                 date-format="YYYY/MM/DD ddd"
                 time-format="A hh:mm:ss"
-                style="width: 200px"
+                style="width: 400px"
                 value-format="YYYY-MM-DD HH:mm:ss"
               />
             </el-config-provider>

src/views/os-status/components/taskCard.vue

@@ -53,11 +53,6 @@
           <span class="loading" v-else></span>
         </div>
         <div class="wordStyle">
-          <span>任务执行失败统计(个):</span>
-          <span class="total-num" v-if="ituTaskFailNumber != null">{{ formatExactLargeNum(ituTaskFailNumber) }}</span>
-          <span class="loading" v-else></span>
-        </div>
-        <div class="wordStyle">
           <span>错误率:</span>
           <span class="total-num" v-if="ituErrorRate != null">{{ ituErrorRate }}</span>
           <span class="loading" v-else></span>
@@ -95,7 +90,7 @@
 import { useRouter } from "vue-router";
 import { getAllSpiderTaskStatistics } from "@/api/staticData";
 import { onMounted, ref } from "vue";
-import { getSpiderTaskList } from "@/api/spiderTask";
+import { getAllTaskStatistics, getSpiderTaskList } from "@/api/spiderTask";
 import { useSlideStateStore } from "@/store/slideState";
 import { storeToRefs } from "pinia";
 import formatExactLargeNum from "@/utils/formatExactLargeNum";
@@ -152,18 +147,19 @@ const goToSTTaskRecordPage = () => {
 // 获取任务统计数据的方法
 const getData = async () => {
   const res = await getAllSpiderTaskStatistics({});
-  const dsnTask = await getSpiderTaskList({ spiders: "dsn_now" });
-  const ituTask = await getSpiderTaskList({ spiders: "itu_space_explorer" });
   const stTask = await getSpiderTaskList({ spiders: "api_spider" });
-  dsnTotalTaskNumber.value = dsnTask.data.length;
+  const allTask = await getAllTaskStatistics();
+  console.log(allTask);
+
+  dsnTotalTaskNumber.value = allTask.data.dsn_now.totalCount;
   dsnTaskSuccessNumber.value = res.data.dsn_now.successCount;
   dsnTaskFailNumber.value = res.data.dsn_now.failCount;
   dsnErrorRate.value = res.data.dsn_now.errorRate;
-  ituTotalTaskNumber.value = ituTask.data.length;
+  ituTotalTaskNumber.value = allTask.data.itu_space_explorer.totalCount;
   ituTaskSuccessNumber.value = res.data.itu_space_explorer.successCount;
   ituTaskFailNumber.value = res.data.itu_space_explorer.failCount;
   ituErrorRate.value = res.data.itu_space_explorer.errorRate;
-  stTotalTaskNumber.value = stTask.data.length;
+  stTotalTaskNumber.value = allTask.data.space_track.totalCount;
   stTaskSuccessNumber.value = res.data.space_track.successCount;
   stTaskFailNumber.value = res.data.space_track.failCount;
   stErrorRate.value = res.data.space_track.errorRate;