feat:调整添加编号接口地址

src/api/apiPaths.ts

@@ -97,8 +97,10 @@ export const spiderTaskApi = {
   resumeJob: "/schedule/resumeJob",
   jobDetail: "/schedule/jobDetail",
   taskCount: "/schedule/getAllJobCount",
-  addSateNo: "/schedule/resetNoradID",
-  getSateIdList: "/schedule/getNoradIDList",
+  addSateNo: "/noradId/add",
+  getSateIdList: "/noradId/list",
+  deleteSateNoList: "/noradId/delete",
+  addSateNoList: "/noradId/batchAdd",
 } as const;
 
 // 爬虫数据相关接口

src/api/system.ts

@@ -62,7 +62,7 @@ export function getSpiderList(data: UserQueryParams) {
 }
 
 //添加卫星编号
-export function addSateNo(data: { id: string[] }) {
+export function addSateNo(data: { norad_id: string }) {
   return request({
     url: spiderTaskApi.addSateNo,
     method: POST,
@@ -70,6 +70,24 @@ export function addSateNo(data: { id: string[] }) {
   }) as unknown as Promise<ApiResponse>;
 }
 
+//批量删除编号
+export function deleteSateNoList(data: { norad_id: string[] }) {
+  return request({
+    url: spiderTaskApi.deleteSateNoList,
+    method: POST,
+    data,
+  }) as unknown as Promise<ApiResponse>;
+}
+
+//批量添加编号
+export function addSateNoList(data: { norad_id: string[] }) {
+  return request({
+    url: spiderTaskApi.addSateNoList,
+    method: POST,
+    data,
+  }) as unknown as Promise<ApiResponse>;
+}
+
 //获取编号列表
 export function getSateIdList() {
   return request({

src/permission.ts

 import router from './router'
-import { useUserStore } from './store/user'
-import { getToken } from '@/utils/auth'
+import {useUserStore} from './store/user'
+import {getToken} from '@/utils/auth'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 
 // NProgress 配置
-NProgress.configure({ showSpinner: false })
+NProgress.configure({showSpinner: false})
 
 // 白名单路由
 const whiteList = ['/login', '/404']
 
 router.beforeEach(async (to, from, next) => {
-  // 开始进度条
-  NProgress.start()
+    // 开始进度条
+    NProgress.start()
 
-  const userStore = useUserStore()
-  const hasToken = getToken()
+    const userStore = useUserStore()
+    const hasToken = getToken();
 
-  if (hasToken) {
-    if (to.path === '/login') {
-      // 已登录，重定向到首页
-      next({ path: '/' })
-      NProgress.done()
-    } else {
-      // 确定用户是否有用户信息
-      const hasGetUserInfo = userStore.name !== ''
-      if (hasGetUserInfo) {
-        next()
-      } else {
-        try {
-          // 获取用户信息
-          await userStore.getInfo()
-          next()
-        } catch (error) {
-          // 移除令牌并重新登录
-          await userStore.resetToken()
-          next(`/login?redirect=${to.path}`)
-          NProgress.done()
+    if (hasToken) {
+        if (to.path === '/login') {
+            // 已登录，重定向到首页
+            next({path: '/'})
+            NProgress.done()
+        } else {
+            // 确定用户是否有用户信息
+            const hasGetUserInfo = userStore.name !== ''
+            if (hasGetUserInfo) {
+                next()
+            } else {
+                try {
+                    // 获取用户信息
+                    await userStore.getInfo()
+                    next()
+                } catch (error) {
+                    // 移除令牌并重新登录
+                    await userStore.resetToken()
+                    next(`/login?redirect=${to.path}`)
+                    NProgress.done()
+                }
+            }
         }
-      }
-    }
-  } else {
-    // 没有令牌
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在白名单中直接通过
-      next()
     } else {
-      // 重定向到登录页
-      next(`/login?redirect=${to.path}`)
-      NProgress.done()
+        // 没有令牌
+        if (whiteList.indexOf(to.path) !== -1) {
+            // 在白名单中直接通过
+            next()
+        } else {
+            // 重定向到登录页
+            next(`/login?redirect=${to.path}`)
+            NProgress.done()
+        }
     }
-  }
 })
 
 router.afterEach(() => {
-  // 完成进度条
-  NProgress.done()
+    // 完成进度条
+    NProgress.done()
 })

src/views/os-spiderManager/components/NoItem.vue

@@ -10,14 +10,14 @@
 import { ref, watch } from "vue";
 
 const props = defineProps<{
-  No: string | number;
+  No: string;
   resetSelected?: boolean;
 }>();
 
 const isSelected = ref(false);
 const emit = defineEmits<{
-  (e: "addNo", sateNo: string | number): void;
-  (e: "delNo", sateNo: string | number): void;
+  (e: "addNo", sateNo: string): void;
+  (e: "delNo", sateNo: string): void;
 }>();
 
 const selectNo = () => {

src/views/os-spiderManager/index.vue

@@ -47,7 +47,7 @@
             v-for="(no, index) in sateNoList"
             :key="index"
             class="no-item-row"
-            :-no="no"
+            :-no="no.norad_cat_id"
             @add-no="handleSateAdd"
             @del-no="handleSateDel"
             :reset-selected="resetSelected"
@@ -59,7 +59,7 @@
           <span style="color: white; font-weight: 500">NORAD编号：</span>
           <el-input
             @input="handleNumInput"
-            maxlength="5"
+            maxlength="6"
             placeholder="请输入编号"
             v-model="curSateNo"
             style="width: 100px"
@@ -77,8 +77,8 @@
                 type="danger"
                 size="small"
                 @click="
-                  () => {
-                    confirm();
+                  (e:MouseEvent) => {
+                    confirm(e);
                     delNoList();
                   }
                 "
@@ -107,7 +107,7 @@
 import { ref, onMounted, nextTick, watch } from "vue";
 import Pagination from "@/components/pagination/index.vue";
 import { useRouter } from "vue-router";
-import { getSpiderList, addSateNo, getSateIdList } from "@/api/system.ts";
+import { getSpiderList, addSateNo, getSateIdList, deleteSateNoList, addSateNoList } from "@/api/system.ts";
 import NoItem from "./components/NoItem.vue";
 import { ElMessage, type UploadProps, type UploadRawFile } from "element-plus";
 import MenuTitle from "@/components/MenuTitle.vue";
@@ -137,57 +137,53 @@ const getData = async () => {
 
 const editDialogVisible = ref(false);
 
-const sateNoList = ref<string[]>([]);
+//编号item类型定义
+interface noradItem {
+  id: number;
+  norad_cat_id: string;
+  create_time: string;
+}
+
+const sateNoList = ref<noradItem[]>([]);
 
 const curSateNo = ref("");
 
-const curSelSateNo = ref<(string | number)[]>([]);
+const curSelSateNo = ref<string[]>([]);
 
 const resetSelected = ref(false);
 
 //添加选中项到当前列表
-const handleSateAdd = (no: string | number) => {
-  curSelSateNo.value.push(padZeroTo5Digits(no));
+const handleSateAdd = (no: string) => {
+  if (checkNoLeSix(no)) {
+    curSelSateNo.value.push(no);
+  }
 };
 
 //从当前列表删除选中项
 const handleSateDel = (no: string | number) => {
   curSelSateNo.value = curSelSateNo.value.filter((item) => item != no);
 };
-//添加编号到列表并整体发到后端
+
+//添加编号发到后端
 const addNoToList = async () => {
-  try {
-    if (curSateNo.value && sateNoList.value.includes(padZeroTo5Digits(curSateNo.value))) {
-      ElMessage.error("当前编号已存在，请重新输入");
-      curSateNo.value = "";
-      return;
-    }
-    sateNoList.value.push(padZeroTo5Digits(curSateNo.value));
-    const res = await addSateNo({ id: sateNoList.value });
-    if (res.code === 0) {
-      ElMessage.success("添加编号成功");
-    } else {
-      sateNoList.value.pop();
-      ElMessage.error(res.message);
-    }
-    curSateNo.value = "";
-    scrollToBottom();
-  } catch (error: any) {
-    ElMessage.error(error.message);
+  const res = await addSateNo({ norad_id: curSateNo.value });
+  if (res.code === 0) {
+    ElMessage.success("添加编号成功");
+    getSateNoList();
   }
+  curSateNo.value = "";
 };
 
 //编号文件导入后发送到后端
 const fileImptAddNoList = async () => {
   try {
-    const res = await addSateNo({ id: sateNoList.value });
+    console.log(textFileNumbers.value);
+    const res = await addSateNoList({ norad_id: textFileNumbers.value });
+    console.log(res);
     if (res.code === 0) {
-      ElMessage.success("编号导入成功");
-    } else {
-      sateNoList.value.pop();
-      ElMessage.error(res.message);
+      ElMessage.success("导入编号成功");
     }
-    scrollToBottom();
+    getSateNoList();
   } catch (error: any) {
     ElMessage.error(error.message);
   }
@@ -196,8 +192,7 @@ const fileImptAddNoList = async () => {
 //删除选中编号
 const delNoList = async () => {
   try {
-    sateNoList.value = sateNoList.value.filter((item) => !curSelSateNo.value.includes(item));
-    const res = await addSateNo({ id: sateNoList.value as string[] });
+    const res = await deleteSateNoList({ norad_id: curSelSateNo.value });
     if (res.code === 0) {
       ElMessage.success("删除编号成功");
     }
@@ -206,6 +201,7 @@ const delNoList = async () => {
     nextTick(() => {
       resetSelected.value = false;
     });
+    getSateNoList();
   } catch (error: any) {
     ElMessage.error(error.message);
   }
@@ -223,24 +219,31 @@ const scrollToBottom = () => {
   });
 };
 
-const handleNumInput = (value: string) => {
-  const filtered = value.replace(/\D/g, "");
-  curSateNo.value = filtered.slice(0, 5);
+//检查输入的编号个数不大于6
+const checkNoLeSix = (no: number | string): boolean => {
+  if (String(no).length > 6) {
+    ElMessage.error("编号位数错误，长度不能大于6位");
+    return false;
+  }
+  return true;
 };
 
-//编号格式化
-const padZeroTo5Digits = (num: number | string): string => {
-  const numStr = String(num);
-  const pureNumStr = numStr.replace(/\D/g, "");
-  return pureNumStr.padStart(5, "0").slice(-5);
+const handleNumInput = (value: string) => {
+  const filtered = value.replace(/\D/g, "");
+  curSateNo.value = filtered.slice(0, 6);
 };
 
 const handleEditSateId = async () => {
   editDialogVisible.value = true;
+  getSateNoList();
+};
+
+//获取编号列表
+const getSateNoList = async () => {
   try {
     const res = await getSateIdList();
     if (res.code === 0) {
-      sateNoList.value = res.data || [];
+      sateNoList.value = res.data.list || [];
     }
   } catch (error: any) {
     ElMessage.error(error.message);
@@ -248,16 +251,12 @@ const handleEditSateId = async () => {
 };
 
 //读取文本文件后存储读取的编号
-const textFileNumbers = ref<number[]>([]);
+const textFileNumbers = ref<string[]>([]);
 
 //监听导入文件的数组变化
 watch(textFileNumbers, (newVal) => {
   if (newVal.length > 0) {
-    newVal.map((num) => {
-      if (!sateNoList.value.includes(padZeroTo5Digits(num))) {
-        sateNoList.value.push(padZeroTo5Digits(num));
-      }
-    });
+    newVal.forEach((num) => {});
     fileImptAddNoList();
   }
 });
@@ -306,13 +305,12 @@ const handleFileChange: UploadProps["onChange"] = (uploadFile) => {
     if (!textContent) {
       throw new Error("文件内容为空");
     }
-    textFileNumbers.value = parseTextToNumbers(textContent);
+    textFileNumbers.value = parseTextToNumbers(textContent).map((item) => String(item));
   };
   //失败的回调
   reader.onerror = () => {
     ElMessage.error("文件导入失败，请检查文件是否损坏或重试");
   };
-
   //读取文件
   reader.readAsText(file, "utf-8");
 };

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

@@ -7,7 +7,11 @@
         <el-table :data="curTableData" border style="width: 100%">
           <el-table-column width="55" label="序号" type="index" />
           <el-table-column width="150" property="spider" label="爬虫名称" />
-          <el-table-column property="error" label="错误信息" />
+          <el-table-column property="error" label="错误信息">
+            <template #default="scope">
+              {{ scope.row.error.error }}
+            </template>
+          </el-table-column>
           <el-table-column width="160" property="timestamp" label="记录时间" />
         </el-table>
         <div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
@@ -138,6 +142,7 @@ const setChartData = async () => {
         data: dateList.value,
         name: "日期",
         nameLocation: "middle",
+        nameGap: 20,
         nameTextStyle: {
           color: "#fff",
           fontSize: 12,
@@ -155,6 +160,7 @@ const setChartData = async () => {
         type: "value",
         name: "数量",
         nameLocation: "middle",
+        nameGap: 20,
         max: maxVal.value,
         axisLabel: {
           color: "#fff",
@@ -192,6 +198,7 @@ const handleClickChart = (params: any) => {
   });
   pageObj.value.total = tableData.value.length;
   curTableData.value = tableData.value.slice(0, 5);
+  console.log(curTableData.value);
 };
 
 //生成图表