Skip to content

F
fk-spider-web
Commit 4c265c8e by liucan
Options

feat:完成卫星编号弹窗相关功能，修复部分爆红组件

parent 0b581533
Showing with 1003 additions and 594 deletions
package-lock.json
......@@ -13,6 +13,7 @@
"@types/node": "^22.15.17",
"@types/nprogress": "^0.2.3",
"@types/uuid": "^10.0.0",
"animate.css": "^4.1.1",
"axios": "^1.9.0",
"cron-parser": "^5.4.0",
"echarts": "^5.6.0",
......@@ -2293,6 +2294,12 @@
"dev": true,
"license": "MIT"
},
"node_modules/animate.css": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==",
"license": "MIT"
},
"node_modules/anymatch": {
"version": "3.1.3",
"resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
......
package.json
......@@ -14,6 +14,7 @@
"@types/node": "^22.15.17",
"@types/nprogress": "^0.2.3",
"@types/uuid": "^10.0.0",
"animate.css": "^4.1.1",
"axios": "^1.9.0",
"cron-parser": "^5.4.0",
"echarts": "^5.6.0",
......
src/App.vue
......@@ -7,7 +7,8 @@
</template>
<style>
html, body {
html,
body {
margin: 0;
padding: 0;
height: 100%;
......
src/api/apiPaths.ts
// API路径配置文件
// 这个文件确保所有API路径在一处统一管理，方便修改
import { pauseJob } from "./schedule"
import { pauseJob } from "./schedule";
export const authApi = {
login: '/auth/login',
logout: '/auth/logout'
} as const
login: "/auth/login",
logout: "/auth/logout",
} as const;
export const scrapydApi = {
// scrapyd相关接口
listProjects: '/scrapyd/listProjects',
listVersions: '/scrapyd/listVersions',
listSpiders: '/scrapyd/listSpiders',
listJobsMerge: '/scrapyd/listJobsMerge',
cancel: '/scrapyd/cancel',
cancelAllJob: '/scrapyd/cancelAllJob',
deleteVersion: '/scrapyd/deleteVersion',
deleteProject: '/scrapyd/deleteProject',
schedule: '/scrapyd/schedule',
daemonStatus: '/scrapyd/daemonStatus',
addVersion: '/scrapyd/addVersion',
listProjects: "/scrapyd/listProjects",
listVersions: "/scrapyd/listVersions",
listSpiders: "/scrapyd/listSpiders",
listJobsMerge: "/scrapyd/listJobsMerge",
cancel: "/scrapyd/cancel",
cancelAllJob: "/scrapyd/cancelAllJob",
deleteVersion: "/scrapyd/deleteVersion",
deleteProject: "/scrapyd/deleteProject",
schedule: "/scrapyd/schedule",
daemonStatus: "/scrapyd/daemonStatus",
addVersion: "/scrapyd/addVersion",
// 日志相关
logs: '/scrapyd/logs',
projectLogs: '/scrapyd/projectLogs',
spiderLogs: '/scrapyd/spiderLogs',
jobLog: '/scrapyd/jobLog'
} as const
logs: "/scrapyd/logs",
projectLogs: "/scrapyd/projectLogs",
spiderLogs: "/scrapyd/spiderLogs",
jobLog: "/scrapyd/jobLog",
} as const;
export const scheduleApi = {
// 调度任务相关
addJob: '/schedule/addJob',
getJobs: '/schedule/getJobs',
pauseJob: '/schedule/pauseJob',
resumeJob: '/schedule/resumeJob',
removeJob: '/schedule/removeJob',
jobDetail: '/schedule/jobDetail',
state: '/schedule/state',
start: '/schedule/start',
shutdown: '/schedule/shutdown',
pause: '/schedule/pause',
resume: '/schedule/resume',
removeAllJobs: '/schedule/removeAllJobs',
scheduleLogs: '/schedule/scheduleLogs',
removeScheduleLogs: '/schedule/removeScheduleLogs',
} as const
addJob: "/schedule/addJob",
getJobs: "/schedule/getJobs",
pauseJob: "/schedule/pauseJob",
resumeJob: "/schedule/resumeJob",
removeJob: "/schedule/removeJob",
jobDetail: "/schedule/jobDetail",
state: "/schedule/state",
start: "/schedule/start",
shutdown: "/schedule/shutdown",
pause: "/schedule/pause",
resume: "/schedule/resume",
removeAllJobs: "/schedule/removeAllJobs",
scheduleLogs: "/schedule/scheduleLogs",
removeScheduleLogs: "/schedule/removeScheduleLogs",
} as const;
export const scrapydServerApi = {
getScrapydServerPage: '/scrapydServer/getScrapydServerPage',
addScrapydServer: '/scrapydServer/addScrapydServer',
updateScrapydServer: '/scrapydServer/updateScrapydServer',
updateScrapydServerStatus: '/scrapydServer/updateScrapydServerStatus',
deleteScrapydServer: '/scrapydServer/deleteScrapydServer'
} as const
// 系统相关
getScrapydServerPage: "/scrapydServer/getScrapydServerPage",
addScrapydServer: "/scrapydServer/addScrapydServer",
updateScrapydServer: "/scrapydServer/updateScrapydServer",
updateScrapydServerStatus: "/scrapydServer/updateScrapydServerStatus",
deleteScrapydServer: "/scrapydServer/deleteScrapydServer",
} as const;
// 系统相关
export const systemApi = {
systemInfo: '/system/systemInfo',
systemData: '/system/systemData',
systemConfig: '/system/systemConfig',
loginHistoryList: '/actionHistory/loginHistoryList',
scrapydServerList: '/system/scrapydServerList' // 没用
} as const
// 统计相关
systemInfo: "/system/systemInfo",
systemData: "/system/systemData",
systemConfig: "/system/systemConfig",
loginHistoryList: "/actionHistory/loginHistoryList",
scrapydServerList: "/system/scrapydServerList", // 没用
} as const;
// 统计相关
export const statsApi = {
statsList: '/statsCollection/listItem',
statsDetail: '/statsCollection/detail',
removeStats: '/statsCollection/delete',
clearAllStats: '/statsCollection/clearAll' // TODO 未实现
} as const
statsList: "/statsCollection/listItem",
statsDetail: "/statsCollection/detail",
removeStats: "/statsCollection/delete",
clearAllStats: "/statsCollection/clearAll", // TODO 未实现
} as const;
// 系统用户相关接口
// 系统用户相关接口
export const userApi = {
userList: '/user/list',
addUser: '/user/insert',
updateUser: '/user/update',
deleteUser: '/user/delete',
batchDelete: '/user/batchDelete',
} as const
// 系统用户相关接口
userList: "/user/list",
addUser: "/user/insert",
updateUser: "/user/update",
deleteUser: "/user/delete",
batchDelete: "/user/batchDelete",
} as const;
// 系统用户相关接口
export const spiderApi = {
spiderList: '/scrapyd/listSpiders',
} as const
spiderList: "/scrapyd/listSpiders",
} as const;
// 爬虫任务相关接口
// 爬虫任务相关接口
export const spiderTaskApi = {
taskList: '/schedule/getJobs',
taskRecord: '/schedule/scheduleLogs',
addTask: '/schedule/addJob',
deleteTask: '/schedule/removeJob',
pauseJob: '/schedule/pauseJob',
resumeJob: '/schedule/resumeJob',
jobDetail: '/schedule/jobDetail',
taskCount:'/schedule/getAllJobCount'
} as const
// 爬虫数据相关接口
taskList: "/schedule/getJobs",
taskRecord: "/schedule/scheduleLogs",
addTask: "/schedule/addJob",
deleteTask: "/schedule/removeJob",
pauseJob: "/schedule/pauseJob",
resumeJob: "/schedule/resumeJob",
jobDetail: "/schedule/jobDetail",
taskCount: "/schedule/getAllJobCount",
addSateNo: "/schedule/resetNoradID",
getSateIdList: "/schedule/getNoradIDList",
} as const;
// 爬虫数据相关接口
export const spiderDataApi = {
dsnList: '/dsn/list',
dsnDetail: '/dsn/detail',
dsnDataDelete: '/dsn/delete',
ituList: '/itu/list',
ituDetail: '/itu/detail',
ituDataDelete: '/itu/delete',
stList: '/spaceTrack/list',
stDetail: '/spaceTrack/detail',
stDataDelete: '/sspaceTrackt/delete',
exportSpiderData: '/export/downloadFile',
esaList: '/esa/list',
esaMissionDetail: '/esa/missionDetail',
esaStationDetail: '/esa/stationDetail',
} as const
// 爬虫数据相关接口
dsnList: "/dsn/list",
dsnDetail: "/dsn/detail",
dsnDataDelete: "/dsn/delete",
ituList: "/itu/list",
ituDetail: "/itu/detail",
ituDataDelete: "/itu/delete",
stList: "/spaceTrack/list",
stDetail: "/spaceTrack/detail",
stDataDelete: "/sspaceTrackt/delete",
exportSpiderData: "/export/downloadFile",
esaList: "/esa/list",
esaMissionDetail: "/esa/missionDetail",
esaStationDetail: "/esa/stationDetail",
} as const;
// 爬虫数据相关接口
export const dataApi = {
dataStatistics: '/statistic/dataStatistics',
taskStatistics: '/statistic/taskStatistics',
performanceStatistics: '/statistic/performanceStatistics',
allSpiderTaskStatistics: '/statistic/getAllTaskStatistics',
} as const
dataStatistics: "/statistic/dataStatistics",
taskStatistics: "/statistic/taskStatistics",
performanceStatistics: "/statistic/performanceStatistics",
allSpiderTaskStatistics: "/statistic/getAllTaskStatistics",
} as const;
src/api/system.ts
import { request, POST } from '@/utils/request'
import type { ApiResponse, QueryParams ,UserQueryParams } from '@/utils/request'
import { systemApi, scrapydServerApi, spiderApi } from './apiPaths'
import { request, POST } from "@/utils/request";
import type { ApiResponse, QueryParams, UserQueryParams } from "@/utils/request";
import { systemApi, scrapydServerApi, spiderApi, spiderTaskApi } from "./apiPaths";
// 获取系统信息
export function getSystemInfo(): Promise<ApiResponse> {
return request({
url: systemApi.systemInfo,
method: POST
}) as unknown as Promise<ApiResponse>
method: POST,
}) as unknown as Promise<ApiResponse>;
}
// 获取系统数据
......@@ -15,16 +15,16 @@ export function getSystemData(data: QueryParams): Promise<ApiResponse> {
return request({
url: systemApi.systemData,
method: POST,
data
}) as unknown as Promise<ApiResponse>
data,
}) as unknown as Promise<ApiResponse>;
}
// 获取系统配置
export function getSystemConfig(): Promise<ApiResponse> {
return request({
url: systemApi.systemConfig,
method: POST
}) as unknown as Promise<ApiResponse>
method: POST,
}) as unknown as Promise<ApiResponse>;
}
// 更新系统配置
......@@ -32,8 +32,8 @@ export function updateSystemConfig(data: Record<string, any>): Promise<ApiRespon
return request({
url: systemApi.systemConfig,
method: POST,
data
}) as unknown as Promise<ApiResponse>
data,
}) as unknown as Promise<ApiResponse>;
}
// 获取登录历史
......@@ -41,22 +41,39 @@ export function getLoginHistory(params: QueryParams): Promise<ApiResponse> {
return request({
url: systemApi.loginHistoryList,
method: POST,
params
}) as unknown as Promise<ApiResponse>
params,
}) as unknown as Promise<ApiResponse>;
}
export const getScrapydServerList = (): Promise<ApiResponse> => {
return request({
url: scrapydServerApi.getScrapydServerPage,
method: POST,
}) as unknown as Promise<ApiResponse>
}
}) as unknown as Promise<ApiResponse>;
};
// 爬虫列表
export function getSpiderList(data: UserQueryParams) {
return request({
url: spiderApi.spiderList,
method: POST,
data
}) as unknown as Promise<ApiResponse>
data,
}) as unknown as Promise<ApiResponse>;
}
//添加卫星编号
export function addSateNo(data: { id: string[] }) {
return request({
url: spiderTaskApi.addSateNo,
method: POST,
data,
}) as unknown as Promise<ApiResponse>;
}
//获取编号列表
export function getSateIdList() {
return request({
url: spiderTaskApi.getSateIdList,
method: POST,
}) as unknown as Promise<ApiResponse>;
}
src/components/Export/index.vue
<template>
<div>
<el-dialog v-model="exportDialogVisible" v-loading="fullscreenLoading" title="导出" width="500" center align-center
@close="close" draggable>
<el-dialog v-model="exportDialogVisible" title="导出" width="500" center align-center @close="close" draggable>
<div class="dialog-content" v-loading="fullscreenLoading">
<el-form class="formStyle" :rules="rules" ref="formRef" :model="exportObject">
<el-form-item prop="timeValue">
<el-date-picker v-model="exportObject.timeValue" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间" end-placeholder="结束时间" date-format="YYYY/MM/DD ddd" time-format="A hh:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" id="export-time-picker"/>
<el-date-picker
v-model="exportObject.timeValue"
type="datetimerange"
format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
date-format="YYYY/MM/DD ddd"
time-format="A hh:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item prop="spiderType">
<el-checkbox-group v-model="exportObject.spiderType" class="checkboxStyle">
<el-checkbox label="DSN数据" value="dsn" id="dsn-checkbox"/>
<el-checkbox label="ITU数据" value="itu" id="itu-checkbox"/>
<el-checkbox label="ST数据" value="spaceTrack" id="st-checkbox"/>
<el-checkbox label="ESA数据" value="esa" id="st-checkbox"/>
<el-checkbox label="DSN数据" value="dsn" id="dsn-checkbox" />
<el-checkbox label="ITU数据" value="itu" id="itu-checkbox" />
<el-checkbox label="ST数据" value="spaceTrack" id="st-checkbox" />
<el-checkbox label="ESA数据" value="esa" id="esa-checkbox" />
</el-checkbox-group>
</el-form-item>
</el-form>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="handleExport">
确定
</el-button>
<el-button type="primary" @click="handleExport"> 确定 </el-button>
</div>
</template>
</el-dialog>
......@@ -31,64 +36,64 @@
</template>
<script lang="ts" setup>
import { ref, watch } from 'vue'
import { defineProps } from 'vue';
import axios from 'axios'
import { ElLoading, ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { ref, watch } from "vue";
import { defineProps } from "vue";
import axios from "axios";
import { ElLoading, ElMessage } from "element-plus";
import type { FormInstance, FormRules } from "element-plus";
interface RuleForm {
//表单字段的类型
timeValue: string
spiderType: Array<string>
timeValue: string;
spiderType: Array<string>;
}
const formRef = ref<FormInstance>()
const formRef = ref<FormInstance>();
const rules = ref<FormRules<RuleForm>>({
timeValue: [
{
// type: 'date',
required: true,
message: '请选择时间段',
trigger: 'change',
message: "请选择时间段",
trigger: "change",
validator: (rule, value, callback) => {
// 检查是否为数组且长度为2
if (!Array.isArray(value) || value.length !== 2) {
callback(new Error('请选择完整的时间段'));
callback(new Error("请选择完整的时间段"));
} else {
// 检查日期格式是否有效（可选）
const isValid = value.every(date => /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date));
const isValid = value.every((date) => /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date));
if (!isValid) {
callback(new Error('时间段格式不正确'));
callback(new Error("时间段格式不正确"));
} else {
callback();
}
}
}
},
},
],
spiderType: [
{
type: 'array',
type: "array",
required: true,
message: '请至少选择一种数据类型',
trigger: 'change',
message: "请至少选择一种数据类型",
trigger: "change",
},
]
})
],
});
//表单绑定的字段
const exportObject = ref({
timeValue: [],
spiderType: []
})
const fullscreenLoading = ref(false)
spiderType: [],
});
const fullscreenLoading = ref(false);
const props = defineProps({
dialogVisible: {
type: Boolean,
default: false
}
})
const emit = defineEmits(['update:dialogVisible'])
const exportDialogVisible = ref(props.dialogVisible)
default: false,
},
});
const emit = defineEmits(["update:dialogVisible"]);
const exportDialogVisible = ref(props.dialogVisible);
// 导出方法
// const handleExport = async () => {
......@@ -145,7 +150,6 @@ const exportDialogVisible = ref(props.dialogVisible)
// }
// })
// }
// const handleExport = async () => {
......@@ -209,7 +213,7 @@ const handleExport = async () => {
// 1. 先在用户点击时获取保存文件句柄（关键：在用户手势中执行）
const fileHandle = await getSaveFileHandle();
if (!fileHandle) {
ElMessage.info('已取消保存');
ElMessage.info("已取消保存");
return;
}
......@@ -218,19 +222,19 @@ const handleExport = async () => {
if (valid) {
const loading = ElLoading.service({
lock: true,
text: '正在导出文件...',
background: 'rgba(0, 0, 0, 0.7)',
text: "正在导出文件...",
background: "rgba(0, 0, 0, 0.7)",
});
try {
// 3. 请求文件数据
const res = await axios.post(
'/api/export/downloadFile',
"/api/export/downloadFile",
{ times: exportObject.value.timeValue, filters: exportObject.value.spiderType },
{
responseType: 'blob',
responseType: "blob",
headers: {
'Token': localStorage.getItem('Admin-Token') || '',
Token: localStorage.getItem("Admin-Token") || "",
},
}
);
......@@ -238,12 +242,12 @@ const handleExport = async () => {
// 4. 使用之前获取的句柄保存文件
await saveToSelectedLocation(res.data, fileHandle);
loading.close();
ElMessage.success('数据导出成功');
close()
ElMessage.success("数据导出成功");
close();
} catch (e) {
console.error('导出失败', e);
console.error("导出失败", e);
loading.close();
ElMessage.error('ZIP文件导出失败,请重试');
ElMessage.error("ZIP文件导出失败,请重试");
}
}
});
......@@ -257,24 +261,26 @@ const handleExport = async () => {
const getSaveFileHandle = async () => {
// 检查浏览器是否支持
if (!(window as any).showSaveFilePicker) {
ElMessage.warning('您的浏览器不支持选择保存位置,请使用最新版Chrome或Edge浏览器');
ElMessage.warning("您的浏览器不支持选择保存位置,请使用最新版Chrome或Edge浏览器");
return null;
}
try {
// 弹出保存对话框（必须在用户直接交互中调用）
return await (window as any).showSaveFilePicker({
suggestedName: 'export.zip',
types: [{
description: 'ZIP压缩文件',
accept: { 'application/zip': ['.zip'] },
}],
excludeAcceptAllOption: true
suggestedName: "export.zip",
types: [
{
description: "ZIP压缩文件",
accept: { "application/zip": [".zip"] },
},
],
excludeAcceptAllOption: true,
});
} catch (error: any) {
// 用户取消选择时也会触发错误，这里视为正常取消
if (error.name !== 'AbortError') {
console.error('获取保存位置失败', error);
if (error.name !== "AbortError") {
console.error("获取保存位置失败", error);
}
return null;
}
......@@ -283,7 +289,7 @@ const getSaveFileHandle = async () => {
// 保存数据到用户选择的位置
const saveToSelectedLocation = async (blobData: any, fileHandle: any) => {
if (!(blobData instanceof Blob) || blobData.size === 0) {
throw new Error('无效的ZIP文件数据');
throw new Error("无效的ZIP文件数据");
}
// 将blob转换为可写数据
......@@ -299,26 +305,25 @@ const saveToSelectedLocation = async (blobData: any, fileHandle: any) => {
const close = () => {
exportObject.value = {
timeValue: [],
spiderType: []
}
formRef.value?.clearValidate()
exportDialogVisible.value = false
}
spiderType: [],
};
formRef.value?.clearValidate();
exportDialogVisible.value = false;
};
// 监听父组件传过来的值
watch(() => props.dialogVisible,
watch(
() => props.dialogVisible,
(newVal) => {
exportDialogVisible.value = newVal
exportDialogVisible.value = newVal;
}
)
);
// 监听组件内的值并向父组件更新
watch(() => exportDialogVisible.value,
watch(
() => exportDialogVisible.value,
(newVal) => {
emit('update:dialogVisible', newVal)
emit("update:dialogVisible", newVal);
}
)
);
</script>
<style lang="scss" scoped>
......
src/layout/components/AppMain.vue
<script setup lang="ts">
import { computed } from 'vue'
import { useRoute } from 'vue-router'
import { computed } from "vue";
import { useRoute } from "vue-router";
const route = useRoute()
const key = computed(() => route.path)
const route = useRoute();
const key = computed(() => route.path);
</script>
<template>
......@@ -28,7 +28,7 @@ const key = computed(() => route.path)
overflow-y: auto; /* 修改为auto允许垂直滚动 */
overflow-x: hidden; /* 防止水平滚动 */
}
.fixed-header+.app-main {
.fixed-header + .app-main {
padding-top: 50px;
}
</style>
src/layout/components/Sidebar/Logo.vue
<script setup lang="ts">
import settings from '@/settings'
import settings from "@/settings";
const props = defineProps({
collapse: {
type: Boolean,
required: true
}
})
required: true,
},
});
const title = settings.title || 'fk spider web'
const title = settings.title || "fk spider web";
// Logo 图片可在后续使用实际的 logo 文件
// const logo = require('@/assets/logo.png')
const logo = '' // 暂时为空
const logo = ""; // 暂时为空
</script>
<template>
<div class="sidebar-logo-container" :class="{'collapse': collapse}">
<div class="sidebar-logo-container" :class="{ collapse: collapse }">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" alt="logo">
<img v-if="logo" :src="logo" class="sidebar-logo" alt="logo" />
<h1 v-else class="sidebar-title">{{ title }}</h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" alt="logo">
<img v-if="logo" :src="logo" class="sidebar-logo" alt="logo" />
<h1 class="sidebar-title">{{ title }}</h1>
</router-link>
</transition>
......
src/main.ts
import { createApp } from 'vue'
import 'virtual:uno.css'
import App from './App.vue'
import router from './router'
import pinia from './store'
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import { createApp } from "vue";
import "virtual:uno.css";
import App from "./App.vue";
import router from "./router";
import pinia from "./store";
import ElementPlus from "element-plus";
import "element-plus/dist/index.css";
import {
UserFilled,
Lock,
......@@ -31,46 +31,47 @@ import {
Message,
DataAnalysis,
Notebook,
Setting
} from '@element-plus/icons-vue'
import 'normalize.css/normalize.css'
import './styles/index.scss'
import './style.css'
import './permission' // 权限控制
Setting,
} from "@element-plus/icons-vue";
import "normalize.css/normalize.css";
import "./styles/index.scss";
import "./style.css";
import "./permission"; // 权限控制
import "animate.css";
const app = createApp(App)
const app = createApp(App);
// 注册 Element Plus 图标
app.component('Monitor', Monitor)
app.component('Document', Document)
app.component('List', List)
app.component('Key', Key)
app.component('House', House)
app.component('Clock', Clock)
app.component('Message', Message)
app.component('DataAnalysis', DataAnalysis)
app.component('Notebook', Notebook)
app.component('Setting', Setting)
app.component("Monitor", Monitor);
app.component("Document", Document);
app.component("List", List);
app.component("Key", Key);
app.component("House", House);
app.component("Clock", Clock);
app.component("Message", Message);
app.component("DataAnalysis", DataAnalysis);
app.component("Notebook", Notebook);
app.component("Setting", Setting);
app.component('UserFilled', UserFilled)
app.component('Lock', Lock)
app.component('View', View)
app.component('Hide', Hide)
app.component('CaretBottom', CaretBottom)
app.component('HomeFilled', HomeFilled)
app.component('Menu', Menu)
app.component('Tickets', Tickets)
app.component('Folder', Folder)
app.component('Files', Files)
app.component('Loading', Loading)
app.component('VideoPlay', VideoPlay)
app.component('Refresh', Refresh)
app.component('Back', Back)
app.component('Upload', Upload)
app.component('Plus', Plus)
app.component("UserFilled", UserFilled);
app.component("Lock", Lock);
app.component("View", View);
app.component("Hide", Hide);
app.component("CaretBottom", CaretBottom);
app.component("HomeFilled", HomeFilled);
app.component("Menu", Menu);
app.component("Tickets", Tickets);
app.component("Folder", Folder);
app.component("Files", Files);
app.component("Loading", Loading);
app.component("VideoPlay", VideoPlay);
app.component("Refresh", Refresh);
app.component("Back", Back);
app.component("Upload", Upload);
app.component("Plus", Plus);
app.use(router)
app.use(pinia)
app.use(ElementPlus, { size: 'default' })
app.use(router);
app.use(pinia);
app.use(ElementPlus, { size: "default" });
app.mount('#app')
app.mount("#app");
src/styles/index.scss
......@@ -58,3 +58,7 @@ body {
display: table;
clear: both;
}
:root {
--animate-duration: 0.15s !important;
}
\ No newline at end of file
src/utils/request.ts
import axios from 'axios'
import { ElMessage } from 'element-plus'
import { getToken, removeToken } from '@/utils/auth'
import axios from "axios";
import { ElMessage } from "element-plus";
import { getToken, removeToken } from "@/utils/auth";
// 创建axios实例
const instance = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API || '',
baseURL: import.meta.env.VITE_APP_BASE_API || "",
timeout: 10000, // 毫秒
headers: {
'Content-Type': 'application/zip; charset=utf-8'
}
})
"Content-Type": "application/zip; charset=utf-8",
},
});
// 请求拦截器
instance.interceptors.request.use(
(config) => {
const token = getToken()
const token = getToken();
if (token) {
// 保持与原项目相同的Token头设置
config.headers['Token'] = token
config.headers["Token"] = token;
}
return config
return config;
},
(err) => {
console.log('请求出错')
return Promise.reject(err)
console.log("请求出错");
return Promise.reject(err);
}
)
);
// 响应拦截器
instance.interceptors.response.use(
(res) => {
let result = res.data
let result = res.data;
if (typeof res.data === 'string') {
if (typeof res.data === "string") {
try {
result = JSON.parse(res.data)
result = JSON.parse(res.data);
} catch (e) {
// 不是JSON格式，保持原样
}
} else {
// 4000 token无效或者过期
if (result.code === 4000) {
removeToken()
window.location.reload()
removeToken();
window.location.reload();
}
if (result.code === 0) {
result.ok = true
result.ok = true;
} else {
result.ok = false
ElMessage.error(result.msg || '请求失败')
result.ok = false;
ElMessage.error(result.msg || "请求失败");
}
}
return result
return result;
},
(err) => {
ElMessage.error('网络请求出错, 请检查网络')
return Promise.reject(err)
ElMessage.error("网络请求出错, 请检查网络");
return Promise.reject(err);
}
)
);
// HTTP 请求方法常量
export const GET = 'get'
export const POST = 'post'
export const PUT = 'put'
export const DELETE = 'delete'
export const GET = "get";
export const POST = "post";
export const PUT = "put";
export const DELETE = "delete";
// 请求函数类型
export interface RequestConfig {
url: string;
method: 'get' | 'post' | 'put' | 'delete';
method: "get" | "post" | "put" | "delete";
params?: any;
data?: any;
headers?: Record<string, string>;
}
export interface ApiResponse<T = any> {
code: number
data: T
message: string
code: number;
data: T;
message: string;
}
export interface QueryParams {
page?: number
size?: number
project?: string
spider?: string
scrapydServerId?: string
order_prop?: string
order_type?: string
status?: any
job?:any
page?: number;
size?: number;
project?: string;
spider?: string;
scrapydServerId?: string;
order_prop?: string;
order_type?: string;
status?: any;
job?: any;
}
// 请求函数
export const request = (config: RequestConfig) => {
return instance(config);
}
};
export interface UserQueryParams {
page?: number
size?: number
username?: string
nickname?: string
password?: string
role?: number
status?: any
id?: number
ids?: any
scrapydServerId?: string
project?: string
spiders?: any
times?: any
job_id?: string
scrapyd_server_id?: string
schedule_type?: string
spider?: string
cron?: string
options?: string
sat_name?: string
ntc_id?: string
filters?: any
norad_cat_id?: string
object_name?: string
name?:string
spacecraft?:string
station?:string
page?: number;
size?: number;
username?: string;
nickname?: string;
password?: string;
role?: number;
status?: any;
id?: number;
ids?: any;
scrapydServerId?: string;
project?: string;
spiders?: any;
times?: any;
job_id?: string;
scrapyd_server_id?: string;
schedule_type?: string;
spider?: string;
cron?: string;
options?: string;
sat_name?: string;
ntc_id?: string;
filters?: any;
norad_cat_id?: string;
object_name?: string;
name?: string;
spacecraft?: string;
station?: string;
interval?: number[];
}
src/views/os-dataDisplay/index.vue
......@@ -11,16 +11,15 @@
<!-- <allDataTab v-if="mode === '综合数据'">
</allDataTab> -->
<!-- DSN数据页面组件 -->
<dsnDataTab v-if="mode === 'DSN数据'"> </dsnDataTab>
<dsnDataTab v-if="mode === 'DSN数据'"></dsnDataTab>
<!-- ITU数据页面组件 -->
<ituDataTab v-if="mode === 'ITU数据'"> </ituDataTab>
<ituDataTab v-if="mode === 'ITU数据'"></ituDataTab>
<!-- ST数据页面组件 -->
<stDataTab v-if="mode === 'ST数据'"> </stDataTab>
<stDataTab v-if="mode === 'ST数据'"></stDataTab>
<!-- ESA数据页面组件 -->
<esDataTab v-if="mode === 'ESA数据'"> </esDataTab>
</div>
<esDataTab v-if="mode === 'ESA数据'"></esDataTab>
<exportDialog v-model:dialogVisible="showDeleteDialog" @confirm="handleExportConfirm" />
</div>
</template>
<script setup lang="ts">
......
src/views/os-spiderManager/components/NoItem.vue 0 → 100644
<template>
<div class="No-Item" :class="{ selected: isSelected }" @click="selectNo">
<!-- 新增选中标识，增强视觉反馈 -->
<span class="selected-icon" v-if="isSelected">✓</span>
{{ props.No }}
</div>
</template>
<script setup lang="ts">
import { ref, watch } from "vue";
const props = defineProps<{
No: string | number;
resetSelected?: boolean;
}>();
const isSelected = ref(false);
const emit = defineEmits<{
(e: "addNo", sateNo: string | number): void;
(e: "delNo", sateNo: string | number): void;
}>();
const selectNo = () => {
isSelected.value = !isSelected.value;
isSelected.value ? emit("addNo", props.No) : emit("delNo", props.No);
};
watch(
() => props.resetSelected,
(newVal) => {
if (newVal) isSelected.value = false;
},
{ immediate: true }
);
</script>
<style scoped>
.No-Item {
width: 100% !important;
letter-spacing: 6px;
background-color: #e8f4f8;
font-size: 16px;
font-weight: 600;
color: #192a3e;
height: 32px;
border-radius: 8px;
display: flex;
align-items: center;
padding: 0 16px;
transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
cursor: pointer;
box-sizing: border-box;
user-select: none;
border: 1px solid transparent;
}
.No-Item:not(.selected):hover {
background-color: #f0f8fb;
border-color: #4299e1;
}
.selected {
background-color: #4299e1;
color: #ffffff;
box-shadow: 0 4px 12px rgba(66, 153, 225, 0.3);
border-color: #2563eb;
}
.selected-icon {
margin-right: 8px;
font-size: 14px;
font-weight: bold;
color: #ffffff;
}
</style>
src/views/os-spiderManager/index.vue
......@@ -13,13 +13,19 @@
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
:row-style="{ height: '60px' }"
v-loading="tableData.length == 0"
element-loading-background="rgba(48, 65, 86, 0.7)"
>
<!-- <el-table-column type="selection" width="40" height="40" /> -->
<el-table-column property="number" label="序号" type="index" width="80" />
<el-table-column property="spider" label="爬虫名称" show-overflow-tooltip />
<el-table-column label="查看任务">
<el-table-column property="spider" label="爬虫代号" show-overflow-tooltip />
<el-table-column property="spider_name" label="爬虫名称" show-overflow-tooltip />
<el-table-column property="spider_info" label="任务描述" show-overflow-tooltip />
<el-table-column label="操作">
<template #default="scope">
<el-button type="primary" plain @click="handleDetails(scope.row)"> 任务 </el-button>
<div class="btn-group">
<el-button type="primary" plain @click="handleDetails(scope.row)">查看任务</el-button>
<el-button type="primary" plain @click="handleEditSateId">编辑</el-button>
</div>
</template>
</el-table-column>
</el-table>
......@@ -32,14 +38,56 @@
@pagination="getData"
/>
</div>
//编辑弹窗
<el-dialog style="z-index: 999999" draggable v-model="editDialogVisible" title="指定下载以下卫星" width="400">
<div class="No-Content" ref="noContentRef">
<TransitionGroup
enter-active-class="animate__animated animate__slideInRight"
leave-active-class="animate__animated animate__slideOutRight"
enter-from-class="animate__opacity-0"
leave-to-class="animate__opacity-0"
>
<NoItem
v-for="(no, index) in sateNoList"
:key="index"
class="no-item-row"
:-no="no"
@add-no="handleSateAdd"
@del-no="handleSateDel"
:reset-selected="resetSelected"
></NoItem>
/>
</TransitionGroup>
</div>
<div class="footer">
<div class="No">
<span style="color: white; font-weight: 500">NORAD编号：</span>
<el-input
@input="handleNumInput"
maxlength="5"
placeholder="请输入编号"
v-model="curSateNo"
style="width: 100px"
></el-input>
</div>
<div class="btn">
<el-button :disabled="curSateNo == ''" plain type="primary" @click="addNoToList">添加</el-button>
<el-button plain type="danger" @click="delNoList">删除</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted } from "vue";
import { ref, onMounted, nextTick } from "vue";
import Pagination from "@/components/pagination/index.vue";
import { useRouter } from "vue-router";
import { getSpiderList } from "@/api/system.ts";
import { getSpiderList, addSateNo, getSateIdList } from "@/api/system.ts";
import NoItem from "./components/NoItem.vue";
import { ElMessage } from "element-plus";
const router = useRouter();
const tableData = ref([]);
const pageObj = ref({
......@@ -48,7 +96,6 @@ const pageObj = ref({
pageNo: 1,
});
const handleDetails = (row: any) => {
// console.log(row);
router.push({
path: "/osTaskInformation/list",
query: {
......@@ -64,6 +111,100 @@ const getData = async () => {
tableData.value = res.data;
};
const editDialogVisible = ref(false);
const sateNoList = ref<string[]>([]);
const curSateNo = ref("");
const curSelSateNo = ref<(string | number)[]>([]);
const resetSelected = ref(false);
//添加选中项到当前列表
const handleSateAdd = (no: string | number) => {
curSelSateNo.value.push(padZeroTo5Digits(no));
};
//从当前列表删除选中项
const handleSateDel = (no: string | number) => {
curSelSateNo.value = curSelSateNo.value.filter((item) => item != no);
};
//添加编号到列表并整体发到后端
const addNoToList = async () => {
try {
if (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 delNoList = async () => {
try {
sateNoList.value = sateNoList.value.filter((item) => !curSelSateNo.value.includes(item));
const res = await addSateNo({ id: sateNoList.value as string[] });
if (res.code === 0) {
}
resetSelected.value = true;
curSelSateNo.value = [];
nextTick(() => {
resetSelected.value = false;
});
} catch (error: any) {}
};
const noContentRef = ref<HTMLDivElement | null>(null);
//新添加滚动到底部
const scrollToBottom = () => {
nextTick(() => {
const container = noContentRef.value;
if (container) {
container.scrollTop = container.scrollHeight - container.clientHeight;
}
});
};
const handleNumInput = (value: string) => {
const filtered = value.replace(/\D/g, "");
curSateNo.value = filtered.slice(0, 5);
};
//编号格式化
const padZeroTo5Digits = (num: number | string): string => {
const numStr = String(num);
const pureNumStr = numStr.replace(/\D/g, "");
return pureNumStr.padStart(5, "0").slice(-5);
};
const handleEditSateId = async () => {
editDialogVisible.value = true;
try {
const res = await getSateIdList();
if (res.code === 0) {
sateNoList.value = res.data || [];
}
console.log(res);
} catch (error: any) {
ElMessage.error(error.message);
}
};
onMounted(() => {
getData();
});
......@@ -94,4 +235,68 @@ onMounted(() => {
.divider {
margin-top: 15px;
}
.No-Content {
width: 100%;
height: 200px;
background-color: #1d5484;
border: 4px solid #083b67;
display: flex;
padding: 10px;
box-sizing: border-box;
flex-direction: column;
gap: 10px;
overflow-y: auto;
overflow-x: hidden;
}
.footer {
margin-top: 20px;
display: flex;
justify-content: space-between;
}
.No {
display: flex;
align-items: center;
}
.No-Content::-webkit-scrollbar {
width: 6px;
height: 6px;
}
.No-Content::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 3px;
}
.No-Content::-webkit-scrollbar-thumb {
background: #c1c1c1;
border-radius: 3px;
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.1);
}
.No-Content::-webkit-scrollbar-thumb:hover {
background: #999;
}
.No-Content::-webkit-scrollbar-button {
display: none;
}
.No-Content {
scrollbar-width: thin;
scrollbar-color: #c1c1c1 #f1f1f1;
}
.btn-group {
display: flex;
gap: 8px;
white-space: nowrap;
justify-content: center;
}
.btn-group .el-button {
flex-shrink: 0;
}
</style>
src/views/os-taskInformation/components/addTaskDialog.vue
<template>
<el-dialog v-model="currentVisible" :title="currentMode === AddMode.ADD_TASK ? '新增' : '修改'" width="710" center
align-center @close="handleClose" draggable>
<el-dialog
v-model="currentVisible"
:title="currentMode === AddMode.ADD_TASK ? '新增' : '修改'"
width="710"
center
align-center
@close="handleClose"
draggable
>
<el-form :model="ruleForm" :rules="rules" ref="ruleFormRef" label-width="100px">
<el-form-item label="任务名称:" v-if="currentMode === AddMode.ADD_TASK" prop="taskName">
<el-input v-model="ruleForm.taskName" placeholder="请输入任务名称" style="width: 90%" />
</el-form-item>
<el-form-item label="所属爬虫:" v-if="currentMode === AddMode.ADD_TASK" prop="spiderTypeValue">
<el-select v-model="ruleForm.spiderTypeValue" placeholder="请选择所属爬虫" style="width: 90%" >
<el-option v-for="item in spiderTypeOptions" :key="item.spider" :label="item.spider"
:value="item.spider" :id="item.spider" />
<el-select v-model="ruleForm.spiderTypeValue" placeholder="请选择所属爬虫" style="width: 90%">
<el-option
v-for="item in spiderTypeOptions"
:key="item.spider"
:label="item.spider"
:value="item.spider"
:id="item.spider"
/>
</el-select>
</el-form-item>
<el-form-item label="执行频率:" prop="cronExpression">
<Crontab v-model="ruleForm.cronExpression" style="width: 90%" />
<el-form-item label="执行频率:">
<!-- <Crontab v-model="ruleForm.cronExpression" style="width: 90%"/> -->
<div class="gap-units">
<div class="gap-unit">
<el-input-number
v-model="exGaps.day"
class="gap-ipt"
:min="0"
:precision="0"
size="small"
></el-input-number>
<span class="unit-num">天</span>
</div>
<div class="gap-unit">
<el-input-number
v-model="exGaps.hour"
class="gap-ipt"
:min="0"
:precision="0"
size="small"
></el-input-number>
<span class="unit-num">小时</span>
</div>
<div class="gap-unit">
<el-input-number
v-model="exGaps.minute"
class="gap-ipt"
:min="0"
:precision="0"
size="small"
></el-input-number>
<span class="unit-num">分钟</span>
</div>
<div class="gap-unit">
<el-input-number
v-model="exGaps.second"
class="gap-ipt"
:min="0"
:precision="2"
size="small"
></el-input-number>
<span class="unit-num">秒</span>
</div>
</div>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="handleClose">取消</el-button>
<el-button type="primary" @click="handleConfirm">
确定
</el-button>
<el-button type="primary" @click="handleConfirm"> 确定 </el-button>
</div>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue'
import { defineProps } from 'vue';
import { watch } from 'vue'
import { addSpiderTask } from '@/api/spiderTask'
import { AddMode } from './enum'
import { Crontab } from '@/components/Crontab/index'
import type { FormInstance, FormRules } from 'element-plus'
import { ElMessage } from 'element-plus'
import { getSpiderList } from '@/api/system.ts'
import { onMounted, reactive, ref } from "vue";
import { defineProps } from "vue";
import { watch } from "vue";
import { addSpiderTask } from "@/api/spiderTask";
import { AddMode } from "./enum";
import type { FormInstance, FormRules } from "element-plus";
import { ElMessage } from "element-plus";
import { getSpiderList } from "@/api/system.ts";
interface RuleForm {
taskName: string
spiderTypeValue: string
cronExpression: string
taskName: string;
spiderTypeValue: string;
}
const ruleFormRef = ref<FormInstance>()
const ruleFormRef = ref<FormInstance>();
const ruleForm = ref<RuleForm>({
taskName: '',
spiderTypeValue: '',
cronExpression: '',
})
taskName: "",
spiderTypeValue: "",
});
interface addDialogPropType {
dialogVisible: boolean,
mode: AddMode,
jobId: string,
cron: string,
spiderType: string,
options: string,
dialogVisible: boolean;
mode: AddMode;
jobId: string;
exGap: number[];
spiderType: string;
options: string;
}
const props = defineProps<addDialogPropType>()
const props = defineProps<addDialogPropType>();
const rules = ref<FormRules<RuleForm>>({
taskName: [
{ required: true, message: '请输入任务名称', trigger: 'blur' },
{ min: 2, max: 50, message: '任务名称应在2-20个字符之间', trigger: 'blur' },
{ required: true, message: "请输入任务名称", trigger: "blur" },
{ min: 2, max: 50, message: "任务名称应在2-20个字符之间", trigger: "blur" },
],
spiderTypeValue: [
{
required: true,
message: '请选择所属爬虫',
trigger: 'change',
message: "请选择所属爬虫",
trigger: "change",
},
],
cronExpression: [
{
required: true,
message: '请输入执行频率',
trigger: 'change',
},
{
validator: (rule, value, callback) => {
// 计算字符串中'*'的数量
const starCount = (value.match(/\//g) || []).length;
if (starCount > 1) {
callback(new Error('cron表达式最多设置一个间隔'));
}else if(starCount == 0){
callback(new Error('请设置cron表达式'));
}else {
callback();
}
},
trigger: 'blur'
}
]
})
});
// 向父组件传递dialog值
const emit = defineEmits(['update:dialogVisible', 'confirm', 'update:mode', 'getTaskList'])
const emit = defineEmits(["update:dialogVisible", "confirm", "update:mode", "getTaskList"]);
// 组件的状态
const currentVisible = ref(props.dialogVisible)
const currentMode = ref(props.mode)
const spiderTypeOptions = ref()
const currentVisible = ref(props.dialogVisible);
const currentMode = ref(props.mode);
const spiderTypeOptions = ref();
const taskParams = ref({
scrapyd_server_id: '1',
schedule_type: '0',
project: 'spiders'
})
const cronExpression = ref('')
scrapyd_server_id: "1",
schedule_type: "0",
project: "spiders",
});
// 关闭的方法
const handleClose = () => {
ruleForm.value.taskName = ''
ruleForm.value.spiderTypeValue
ruleForm.value.cronExpression = ''
ruleFormRef.value?.resetFields()
currentVisible.value = false
}
ruleForm.value.taskName = "";
ruleForm.value.spiderTypeValue;
ruleFormRef.value?.resetFields();
currentVisible.value = false;
};
//间隔数据
const exGaps = reactive({
second: 0,
minute: 0,
hour: 0,
day: 0,
});
// 确定的方法
const handleConfirm = async () => {
console.log(ruleForm.value.cronExpression);
if (!ruleFormRef.value) return
await ruleFormRef.value.validate(async (valid, fields) => {
console.log('开始校验');
if (!ruleFormRef.value) return;
await ruleFormRef.value.validate(async (valid) => {
//验证表单内容是否通过，通过继续执行
if (valid) {
if (currentMode.value === AddMode.ADD_TASK) {
......@@ -127,12 +159,13 @@ const handleConfirm = async () => {
schedule_type: taskParams.value.schedule_type,
project: taskParams.value.project,
spider: ruleForm.value.spiderTypeValue,
cron: ruleForm.value.cronExpression,
options: JSON.stringify({ jobName: ruleForm.value.taskName })
})
currentVisible.value = false
emit('getTaskList')
ElMessage.success('添加成功')
options: JSON.stringify({ jobName: ruleForm.value.taskName }),
interval: [exGaps.second, exGaps.minute, exGaps.hour, exGaps.day],
});
currentVisible.value = false;
emit("getTaskList");
ElMessage.success("添加成功");
} else if (currentMode.value === AddMode.UPDATE_TASK) {
await addSpiderTask({
scrapyd_server_id: taskParams.value.scrapyd_server_id,
......@@ -140,65 +173,68 @@ const handleConfirm = async () => {
project: taskParams.value.project,
spider: props.spiderType,
job_id: props.jobId,
cron: ruleForm.value.cronExpression,
options: props.options
})
currentVisible.value = false
emit('getTaskList')
ElMessage.success('修改成功')
options: props.options,
interval: [exGaps.second, exGaps.minute, exGaps.hour, exGaps.day],
});
currentVisible.value = false;
emit("getTaskList");
ElMessage.success("修改成功");
}
} else {
console.log('校验不通过');
console.log("校验不通过");
}
})
}
exGaps.second = 0;
exGaps.minute = 0;
exGaps.hour = 0;
exGaps.day = 0;
});
};
const getData = async () => {
const res = await getSpiderList({scrapydServerId:'1',project:'spiders'})
spiderTypeOptions.value = res.data
console.log(res);
}
const res = await getSpiderList({ scrapydServerId: "1", project: "spiders" });
spiderTypeOptions.value = res.data;
};
// 监听props变化，同步给组件内部
watch(() => props.dialogVisible,
watch(
() => props.dialogVisible,
(newVal) => {
currentVisible.value = newVal
currentVisible.value = newVal;
}
)
);
// 监听组件内部状态变化，同步给父组件，这样才能做到控制对话框组件的显隐
watch(() => currentVisible.value,
watch(
() => currentVisible.value,
(newVal) => {
emit('update:dialogVisible', newVal)
emit("update:dialogVisible", newVal);
}
)
);
watch(() => props.mode,
watch(
() => props.mode,
(newVal) => {
currentMode.value = newVal
currentMode.value = newVal;
}
)
);
watch(() => currentMode.value,
watch(
() => currentMode.value,
(newVal) => {
emit('update:mode', newVal)
emit("update:mode", newVal);
}
)
);
watch(
[() => props.dialogVisible, () => props.mode, () => props.cron],
([newVisible, newMode, newCron]) => {
if (newVisible && newMode === AddMode.UPDATE_TASK) {
ruleForm.value.cronExpression = newCron;
}
if (!newVisible) {
// 清空表单
// cronExpression.value = ''
}
() => props.exGap,
(newVal) => {
exGaps.second = newVal[0] || 0;
exGaps.minute = newVal[1] || 0;
exGaps.hour = newVal[2] || 0;
exGaps.day = newVal[3] || 0;
},
{ immediate: true }
);
onMounted(() => {
getData()
})
getData();
});
</script>
<style>
......@@ -226,3 +262,23 @@ onMounted(() => {
}
}
</style>
<style scope>
.gap-unit {
display: flex;
gap: 2px;
align-items: center;
margin-right: 10px;
}
.unit-num {
color: white;
}
.gap-units {
display: flex;
}
.gap-ipt {
width: 100px;
}
</style>
src/views/os-taskInformation/components/taskCard.vue
......@@ -10,26 +10,25 @@
</el-form-item>
<el-form-item>
<div>
<el-select v-model="searchCondition.spiders" placeholder="请选择" style="width: 220px">
<el-select
v-model="searchCondition.spiders"
placeholder="请选择"
style="width: 220px"
:disabled="!taskSelectOptions.length"
>
<el-option
v-for="item in taskSelectOptions"
:key="item.spider"
:label="item.spider"
:value="item.spider"
v-for="item in taskSelectOptions || []"
:key="item?.spider"
:label="item?.spider || '未知'"
:value="item?.spider"
/>
</el-select>
</div>
</el-form-item>
<!-- <el-form-item>
<el-text class="mx-1" style="color: #fff;">任务名称:</el-text>
</el-form-item>
<el-form-item>
<el-input v-model="taskName" placeholder="请输入" style="width: 220px" />
</el-form-item> -->
<el-form-item>
<el-space>
<el-button type="primary" @Click="search">查询</el-button>
<el-button type="primary" @Click="resetData">重置列表</el-button>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="resetData">重置列表</el-button>
<el-button type="primary" @click="openTaskDialog">新建任务</el-button>
</el-space>
</el-form-item>
......@@ -37,32 +36,42 @@
</div>
</div>
<div class="cardStyle">
<el-row v-loading="taskList.length == 0" element-loading-background="rgba(48, 65, 86, 0.7)">
<div class="taskCard p-6" v-for="task in taskList" :key="task.taskId">
<!-- 加载状态优化：用专门的 loading 变量，避免依赖 taskList 长度 -->
<el-row v-loading="isLoading" element-loading-background="rgba(48, 65, 86, 0.7)">
<!-- 任务列表为空时显示提示，避免空循环 -->
<div v-if="taskList.length === 0 && !isLoading" class="empty-tip">暂无任务数据</div>
<!-- 循环前确保 taskList 是数组，key 用安全的 id -->
<div class="taskCard p-6" v-for="task in taskList || []" :key="task?.id || task?.taskId">
<div class="taskContent">
<div>
<el-form-item class="form-item">
<!-- 安全访问 JSON 解析，避免 options 为 undefined 或 JSON 解析失败 -->
<span class="titleStyle">{{
task.kwargs.options === "" ? "无名称" : JSON.parse(task.kwargs.options).jobName
(task?.kwargs?.options && JSON.parse(task.kwargs.options).jobName) || "无名称"
}}</span>
</el-form-item>
</div>
<div>
<el-form-item class="form-item">
<el-button type="primary" @click="editTask(task)" class="editButton">编辑</el-button>
<!-- <el-button type="success" @click="goToTaskRecord" class="recordButton">执行记录 </el-button> -->
<el-button type="danger" @click="deleteTask(task)" class="deleteButton">删除</el-button>
<el-button type="primary" @click="editTask(task)" class="editButton" :disabled="!task?.id"
>编辑</el-button
>
<el-button type="danger" @click="deleteTask(task)" class="deleteButton" :disabled="!task?.id"
>删除</el-button
>
</el-form-item>
</div>
<div class="wordStyle">
<el-form-item class="form-item">
<el-space>
<span class="wordStyle">启用/停止: </span>
<!-- 确保 task.status 有默认值，避免 v-model 绑定 undefined -->
<el-switch
v-model="task.status"
:active-value="'running'"
:inactive-value="'paused'"
@change="(newStatus: any) => changeStatus(task, newStatus)"
:disabled="!task?.id"
/>
</el-space>
</el-form-item>
......@@ -72,7 +81,7 @@
<el-space>
<span class="wordStyle"
>执行频率:
<span style="color: skyblue">{{ parseCronExpression(task.kwargs.cron) }} </span>
<span style="color: skyblue">{{ parseCronExpression(task?.kwargs?.cron) || "未设置" }} </span>
</span>
</el-space>
</el-form-item>
......@@ -81,7 +90,7 @@
<el-form-item class="form-item">
<el-space>
<span class="wordStyle"
>执行次数: <span style="color: skyblue">{{ formatExactLargeNum(task.count) }}</span>
>执行次数: <span style="color: skyblue">{{ formatExactLargeNum(task?.count || 0) }}</span>
</span>
</el-space>
</el-form-item>
......@@ -90,19 +99,11 @@
<el-form-item class="form-item">
<el-space>
<span class="wordStyle"
>所属爬虫: <span style="color: skyblue"> {{ task.kwargs.spider }}</span></span
>所属爬虫: <span style="color: skyblue"> {{ task?.kwargs?.spider || "未知" }}</span></span
>
</el-space>
</el-form-item>
</div>
<!-- <div class="wordStyle">
<el-form-item class="form-item">
<el-space>
<span class="wordStyle">失败次数: </span>
<span class="wordStyle">异常记录: </span>
</el-space>
</el-form-item>
</div> -->
</div>
</div>
</el-row>
......@@ -114,12 +115,12 @@
:mode="editMode"
@getTaskList="getData"
:jobId="jobId"
:cron="frequency"
:spiderType="belongSpiderType"
:options="taskOptions"
:exGap="frequency || []"
:spiderType="belongSpiderType || ''"
:options="taskOptions || ''"
/>
<deleteDialog v-model:dialogVisible="showDeleteDialog" @get-user-list="getData" :jobId="jobId" />
<deleteDialog v-model:dialogVisible="showDeleteDialog" @get-user-list="getData" :jobId="jobId" :disabled="!jobId" />
</div>
</template>
......@@ -150,17 +151,19 @@ const props = defineProps({
},
});
const taskSelectOptions = ref();
// 所有响应式变量初始化时避免 undefined
const taskSelectOptions = ref<any[]>([]); // 初始化为空数组
const searchCondition = ref({
spiders: "",
options: "",
});
const belongSpider = ref("");
const taskName = ref("");
const taskValue = ref("");
const belongSpiderType = ref("");
const router = useRouter();
const frequency = ref();
const frequency = ref([]); // 初始化为空字符串，解决 cron 类型错误
const editMode = ref(AddMode.UPDATE_TASK);
const deleteMode = ref(DeleteMode.SINGLE_DELETE);
const showDeleteDialog = ref(false);
......@@ -169,23 +172,32 @@ const taskSwitch = ref(false);
const taskOptions = ref("");
const jobId = ref("");
const taskList = ref<any[]>([]);
const isLoading = ref(false); // 新增专门的加载状态变量
// 删除任务的方法
const deleteTask = (task: any) => {
if (!task?.id) return; // 避免 task 为 undefined
jobId.value = task.id;
deleteMode.value = DeleteMode.SINGLE_DELETE;
showDeleteDialog.value = true;
};
// 编辑任务的方法
const editTask = (task: any) => {
if (!task?.id) return; // 避免 task 为 undefined
jobId.value = task.id;
taskOptions.value = JSON.stringify(JSON.parse(task.kwargs.options));
belongSpiderType.value = task.kwargs.spider;
frequency.value = task.kwargs.cron;
// 安全处理 JSON 字符串，避免解析失败
try {
taskOptions.value = JSON.stringify(task?.kwargs?.options ? JSON.parse(task.kwargs.options) : {});
} catch (err) {
taskOptions.value = "{}";
}
belongSpiderType.value = task?.kwargs?.spider || "";
frequency.value = task?.kwargs?.interval || []; // 兜底空字符串
editMode.value = AddMode.UPDATE_TASK;
showTaskDialog.value = true;
// console.log(JSON.stringify(JSON.parse(task.kwargs.options)));
};
const goToTaskRecord = () => {
router.push({
path: "/osTaskRecord/list",
......@@ -195,107 +207,166 @@ const goToTaskRecord = () => {
},
});
};
// 启动与停止任务的方法
const changeStatus = async (task: any, newStatus: string) => {
if (!task?.id) return; // 避免 task 为 undefined
try {
if (newStatus === "running") {
await resumeSpiderTask({ job_id: task.id });
ElMessage.success("任务已启动");
} else if (newStatus === "paused") {
await pauseSpiderTask({ job_id: task.id });
ElMessage.success("任务已暂停");
}
} catch (err) {
ElMessage.error("状态切换失败");
console.error(err);
// 状态回滚，避免界面显示错误
task.status = newStatus === "running" ? "paused" : "running";
}
// await getData();
};
const handleEdit = () => {};
// 打开新建任务弹窗
const openTaskDialog = () => {
editMode.value = AddMode.ADD_TASK;
frequency.value = "* * * * * *";
frequency.value = [];
showTaskDialog.value = true;
};
// 获取任务列表的方法
const getData = async () => {
isLoading.value = true; // 开始加载
try {
const res = await getSpiderTaskList({
spiders: searchCondition.value.spiders ? [searchCondition.value.spiders] : [],
});
const resId = await getTaskCount({});
for (let i = 0; i < res.data.length; i++) {
res.data[i].count = resId.data[res.data[i].id] === undefined ? 0 : resId.data[res.data[i].id];
// 安全处理返回数据，避免 res.data 为 undefined
const taskData = res?.data || [];
const countData = resId?.data || {};
// 遍历赋值时兜底
taskList.value = taskData.map((item: any) => ({
...item,
count: countData[item?.id] ?? 0, // 执行次数兜底 0
status: item?.status || "paused", // 状态兜底
kwargs: item?.kwargs || {}, // kwargs 兜底空对象
}));
} catch (err) {
ElMessage.error("获取任务列表失败");
console.error(err);
taskList.value = []; // 错误时置空数组
} finally {
isLoading.value = false; // 结束加载
}
taskList.value = res.data;
};
// 重置任务列表的方法
const resetData = async () => {
searchCondition.value.spiders = "";
isLoading.value = true;
try {
const res = await getSpiderTaskList({ spiders: [], options: JSON.stringify({ jobName: taskName.value }) });
const resId = await getTaskCount({});
for (let i = 0; i < res.data.length; i++) {
res.data[i].count = resId.data[res.data[i].id] === undefined ? 0 : resId.data[res.data[i].id];
const taskData = res?.data || [];
const countData = resId?.data || {};
taskList.value = taskData.map((item: any) => ({
...item,
count: countData[item?.id] ?? 0,
status: item?.status || "paused",
kwargs: item?.kwargs || {},
}));
} catch (err) {
ElMessage.error("重置任务列表失败");
console.error(err);
taskList.value = [];
} finally {
isLoading.value = false;
}
taskList.value = res.data;
};
// 搜索任务的方法
const search = async () => {
if (searchCondition.value.spiders === "") {
ElMessage.warning("请先选择爬虫");
return;
}
isLoading.value = true;
try {
const res = await getSpiderTaskList({
spiders: searchCondition.value.spiders ? [searchCondition.value.spiders] : [],
spiders: [searchCondition.value.spiders],
options: JSON.stringify({ jobName: taskName.value }),
});
const resId = await getTaskCount({});
for (let i = 0; i < res.data.length; i++) {
res.data[i].count = resId.data[res.data[i].id] === undefined ? 0 : resId.data[res.data[i].id];
const taskData = res?.data || [];
const countData = resId?.data || {};
taskList.value = taskData.map((item: any) => ({
...item,
count: countData[item?.id] ?? 0,
status: item?.status || "paused",
kwargs: item?.kwargs || {},
}));
} catch (err) {
ElMessage.error("搜索任务失败");
console.error(err);
taskList.value = [];
} finally {
isLoading.value = false;
}
taskList.value = res.data;
};
// 解析cron表达式的方法
const parseCronExpression = (cronExpression: string) => {
const res = cronExpression.split("*").length - 1;
if (res >= 5) {
const aaa = cronExpression.split(" ");
for (let i = 0; i < aaa.length; i++) {
if (aaa[i] != "*") {
if (i == 0) {
if (aaa[i].length === 3) {
return `每${aaa[i][2]}秒执行一次`;
} else {
return `每${aaa[i][2] + aaa[i][3]}秒执行一次`;
}
} else if (i == 1) {
if (aaa[i].length === 3) {
return `每${aaa[i][2]}分钟执行一次`;
} else {
return `每${aaa[i][2] + aaa[i][3]}分钟执行一次`;
}
} else if (i == 2) {
if (aaa[i].length === 3) {
return `每${aaa[i][2]}小时执行一次`;
} else {
return `每${aaa[i][2] + aaa[i][3]}小时执行一次`;
}
} else if (i == 3) {
if (aaa[i].length === 3) {
return `每${aaa[i][2]}天执行一次`;
} else {
return `每${aaa[i][2] + aaa[i][3]}天执行一次`;
}
} else if (i == 4) {
if (aaa[i].length === 3) {
return `每${aaa[i][2]}月执行一次`;
} else {
return `每${aaa[i][2] + aaa[i][3]}月执行一次`;
}
}
// 解析cron表达式的方法（修复逻辑错误，避免数组越界）
const parseCronExpression = (cronExpression?: string) => {
// 兜底：cron表达式不存在时返回默认值
if (!cronExpression) return "未设置";
const parts = cronExpression.trim().split(" ");
// 只处理标准 5/6 位 cron 表达式
if (parts.length < 5 || parts.length > 6) return "表达式格式错误";
// 遍历每个字段，找到非 * 的字段（修复数组越界问题）
for (let i = 0; i < parts.length; i++) {
const part = parts[i].trim();
if (part !== "*" && part !== "") {
// 转换为数字，避免非数字字符导致的错误
const num = parseInt(part, 10);
const validNum = isNaN(num) ? 1 : num;
switch (i) {
case 0:
return `每${validNum}秒执行一次`;
case 1:
return `每${validNum}分钟执行一次`;
case 2:
return `每${validNum}小时执行一次`;
case 3:
return `每${validNum}天执行一次`;
case 4:
return `每${validNum}月执行一次`;
case 5:
return `每${validNum}周执行一次`;
default:
return "未知频率";
}
}
}
// 全是 * 时返回默认
return "每秒执行一次";
};
// 获取爬虫类型列表
const getSpiderTypeList = async () => {
try {
const res = await getSpiderList({ scrapydServerId: "1", project: "spiders" });
console.log(res, 8888888888888);
taskSelectOptions.value = res.data;
// taskSelectOptions.value = res.data
taskSelectOptions.value = res?.data || []; // 兜底空数组
} catch (err) {
ElMessage.error("获取爬虫列表失败");
console.error(err);
taskSelectOptions.value = [];
}
};
onMounted(() => {
if (props.spiderType !== "") {
searchCondition.value.spiders = props.spiderType;
......@@ -303,24 +374,6 @@ onMounted(() => {
getData();
getSpiderTypeList();
});
// const parseCronExpression=(cronExpression: string)=> {
// try {
// const interval = cronParser.parseExpression(cronExpression);
// const nextDate = interval.next().toDate();
// const hours = nextDate.getHours();
// const minutes = nextDate.getMinutes();
// const seconds = nextDate.getSeconds();
// return {
// hours,
// minutes,
// seconds
// };
// } catch (err) {
// console.error('Error parsing cron expression:', err);
// return null;
// }
// }
</script>
<style lang="scss" scoped>
......@@ -329,6 +382,8 @@ onMounted(() => {
padding: 18px;
gap: 15px;
width: auto !important;
display: flex;
flex-wrap: wrap; // 修复卡片溢出问题
}
.taskContent {
......@@ -338,7 +393,6 @@ onMounted(() => {
justify-content: center;
height: 100%;
gap: 6px;
/* 进一步减小项目之间的间距 */
padding: 5px 0;
}
......@@ -394,25 +448,11 @@ onMounted(() => {
padding: 2px;
}
// 去除按钮边框
.el-button:focus {
outline: none;
color: #ffffff;
border: none;
}
</style>
<style>
/* .el-button{
color: #ffffff;
border: none;
} */
.el-input {
color: #ffffff;
}
.el-select__placeholder {
color: #ffffff;
/* 空数据提示 */
.empty-tip {
width: 100%;
text-align: center;
color: #fff;
padding: 50px 0;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment