Commit c5b55285 by 周田

Merge branch 'yzh' into 'main'

修改cron组件

See merge request !8
parents b904cf02 5b14a4c2
// API路径配置文件 // API路径配置文件
// 这个文件确保所有API路径在一处统一管理,方便修改 // 这个文件确保所有API路径在一处统一管理,方便修改
import { pauseJob } from "./schedule"
export const authApi = { export const authApi = {
login: '/auth/login', login: '/auth/login',
logout: '/auth/logout' logout: '/auth/logout'
...@@ -53,8 +55,8 @@ export const scrapydServerApi = { ...@@ -53,8 +55,8 @@ export const scrapydServerApi = {
deleteScrapydServer: '/scrapydServer/deleteScrapydServer' deleteScrapydServer: '/scrapydServer/deleteScrapydServer'
} as const } as const
export const systemApi = {
// 系统相关 // 系统相关
export const systemApi = {
systemInfo: '/system/systemInfo', systemInfo: '/system/systemInfo',
systemData: '/system/systemData', systemData: '/system/systemData',
systemConfig: '/system/systemConfig', systemConfig: '/system/systemConfig',
...@@ -62,16 +64,16 @@ export const systemApi = { ...@@ -62,16 +64,16 @@ export const systemApi = {
scrapydServerList: '/system/scrapydServerList' // 没用 scrapydServerList: '/system/scrapydServerList' // 没用
} as const } as const
export const statsApi = {
// 统计相关 // 统计相关
export const statsApi = {
statsList: '/statsCollection/listItem', statsList: '/statsCollection/listItem',
statsDetail: '/statsCollection/detail', statsDetail: '/statsCollection/detail',
removeStats: '/statsCollection/delete', removeStats: '/statsCollection/delete',
clearAllStats: '/statsCollection/clearAll' // TODO 未实现 clearAllStats: '/statsCollection/clearAll' // TODO 未实现
} as const } as const
export const userApi = {
// 系统用户相关接口 // 系统用户相关接口
export const userApi = {
userList: '/user/list', userList: '/user/list',
addUser: '/user/insert', addUser: '/user/insert',
updateUser: '/user/update', updateUser: '/user/update',
...@@ -79,13 +81,28 @@ export const userApi = { ...@@ -79,13 +81,28 @@ export const userApi = {
batchDelete: '/user/batchDelete', batchDelete: '/user/batchDelete',
} as const } as const
export const spiderApi = {
// 系统用户相关接口 // 系统用户相关接口
export const spiderApi = {
spiderList: '/scrapyd/listSpiders', spiderList: '/scrapyd/listSpiders',
} as const } as const
export const spiderTaskApi = {
// 爬虫任务相关接口 // 爬虫任务相关接口
export const spiderTaskApi = {
taskList: '/schedule/getJobs', taskList: '/schedule/getJobs',
taskRecord: '/schedule/scheduleLogs', taskRecord: '/schedule/scheduleLogs',
addTask: '/schedule/addJob',
deleteTask: '/schedule/removeJob',
pauseJob: '/schedule/pauseJob',
resumeJob: '/schedule/resumeJob',
jobDetail: '/schedule/jobDetail',
} as const
// 爬虫数据相关接口
export const spiderDataApi = {
dsnList: '/dsn/list',
dsnDetail: '/dsn/detail',
dsnDataDelete: '/dsn/delete',
ituList: '/itu/list',
ituDetail: '/itu/detail',
ituDataDelete: '/itu/delete',
} as const } as const
\ No newline at end of file
import { request, POST } from '@/utils/request'
import type { ApiResponse, QueryParams, UserQueryParams } from '@/utils/request'
import { spiderDataApi } from './apiPaths'
// 获取dsn数据列表
export function getDsnlist(data: UserQueryParams) {
return request({
url: spiderDataApi.dsnList,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 获取dsn数据详情
export function getDsnDetail(data: UserQueryParams) {
return request({
url: spiderDataApi.dsnDetail,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 删除dsn数据
export function deleteDsnData(data: UserQueryParams) {
return request({
url: spiderDataApi.dsnDataDelete,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 获取itu数据列表
export function getItulist(data: UserQueryParams) {
return request({
url: spiderDataApi.ituList,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 获取itu数据详情
export function getItuDetail(data: UserQueryParams) {
return request({
url: spiderDataApi.ituDetail,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 删除itu数据
export function deleteItuData(data: UserQueryParams) {
return request({
url: spiderDataApi.ituDataDelete,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
\ No newline at end of file
...@@ -18,4 +18,49 @@ export function getSpiderTaskList(data: UserQueryParams) { ...@@ -18,4 +18,49 @@ export function getSpiderTaskList(data: UserQueryParams) {
method: POST, method: POST,
data data
}) as unknown as Promise<ApiResponse> }) as unknown as Promise<ApiResponse>
}
// 新增/更新爬虫任务
export function addSpiderTask(data: UserQueryParams) {
return request({
url: spiderTaskApi.addTask,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 删除爬虫任务
export function deleteSpiderTask(data: UserQueryParams) {
return request({
url: spiderTaskApi.deleteTask,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 暂停爬虫任务
export function pauseSpiderTask(data: UserQueryParams) {
return request({
url: spiderTaskApi.pauseJob,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 继续爬虫任务
export function resumeSpiderTask(data: UserQueryParams) {
return request({
url: spiderTaskApi.resumeJob,
method: POST,
data
}) as unknown as Promise<ApiResponse>
}
// 获取爬虫任务数据
export function getTaskData(data: UserQueryParams) {
return request({
url: spiderTaskApi.jobDetail,
method: POST,
data
}) as unknown as Promise<ApiResponse>
} }
\ No newline at end of file
import Crontab from './src/Crontab.vue'
export { Crontab }
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
export enum DeleteMode { export enum DeleteMode {
BATCH_DELETE = 0, BATCH_DELETE = 0,
SINGLE_DELETE = 1, SINGLE_DELETE = 1,
JOB_DELETE = 2,
} }
...@@ -23,7 +23,7 @@ interface deleteDialogPropType { ...@@ -23,7 +23,7 @@ interface deleteDialogPropType {
dialogVisible: boolean, dialogVisible: boolean,
deleteMode: DeleteMode, deleteMode: DeleteMode,
id: number, id: number,
ids: number[] ids: number[],
} }
const props = defineProps<deleteDialogPropType>() const props = defineProps<deleteDialogPropType>()
const emit = defineEmits(['update:dialogVisible', 'confirm', 'getUserList', 'update:deleteMode']) const emit = defineEmits(['update:dialogVisible', 'confirm', 'getUserList', 'update:deleteMode'])
...@@ -35,7 +35,6 @@ const handleDelelte = async () => { ...@@ -35,7 +35,6 @@ const handleDelelte = async () => {
await deleteUser({ id: props.id }) await deleteUser({ id: props.id })
emit('getUserList') emit('getUserList')
deleteDialogVisible.value = false deleteDialogVisible.value = false
} }
else if (props.deleteMode == DeleteMode.BATCH_DELETE) { else if (props.deleteMode == DeleteMode.BATCH_DELETE) {
console.log(props.ids); console.log(props.ids);
......
...@@ -5,22 +5,22 @@ import router from './router' ...@@ -5,22 +5,22 @@ import router from './router'
import pinia from './store' import pinia from './store'
import ElementPlus from 'element-plus' import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css' import 'element-plus/dist/index.css'
import { import {
UserFilled, UserFilled,
Lock, Lock,
View, View,
Hide, Hide,
CaretBottom, CaretBottom,
HomeFilled, HomeFilled,
Menu, Menu,
Document, Document,
Tickets, Tickets,
List, List,
Folder, Folder,
Files, Files,
Loading, Loading,
VideoPlay, VideoPlay,
Refresh, Refresh,
Back, Back,
Upload, Upload,
Plus, Plus,
......
...@@ -111,6 +111,12 @@ export interface UserQueryParams { ...@@ -111,6 +111,12 @@ export interface UserQueryParams {
ids?: any ids?: any
scrapydServerId?: string scrapydServerId?: string
project?: string project?: string
spiders?:any spiders?: any
times?:any times?: any
job_id?: string
scrapyd_server_id?: string
schedule_type?: string
spider?: string
cron?: string
options?: string
} }
\ No newline at end of file
...@@ -200,9 +200,10 @@ ...@@ -200,9 +200,10 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue' import { onMounted, ref } from 'vue'
import Pagination from '@/components/pagination/index.vue' import Pagination from '@/components/pagination/index.vue'
import exportDialog from '@/components/Export/index.vue' import exportDialog from '@/components/Export/index.vue'
import { getDsnlist, getDsnDetail, deleteDsnData } from '@/api/spiderData'
const showDeleteDialog = ref(false) const showDeleteDialog = ref(false)
const timeValue = ref('') const timeValue = ref('')
...@@ -243,51 +244,7 @@ const recordTime = ref('') ...@@ -243,51 +244,7 @@ const recordTime = ref('')
const isSuspended = ref('') const isSuspended = ref('')
const tableData = ref([ const tableData = ref([
{
number: '1',
targetName: 'maven',
distance: '2000',
roundTripTime: '12',
stationName: 'CANBERRA',
targetAzimuth: '11',
targetElevation: '24',
targetDistance: '2000',
windSpeed: '10',
upSignalSource: 'maven',
upSignalFrequencyBand: 'X',
upSignalLaunchPower: '123',
downSignalSignalSource: 'maven',
downSignalFrequencyBand: 'S',
downSignalReceptionPower: '23',
dataTime: '2025-06-21 12:00:00',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
]) ])
const pageObj = ref({ const pageObj = ref({
total: 10, total: 10,
...@@ -299,8 +256,11 @@ const handleDetails = (row: any) => { ...@@ -299,8 +256,11 @@ const handleDetails = (row: any) => {
detailVisibleValue.value = true detailVisibleValue.value = true
} }
const getData = () => { const getData = async () => {
console.log('getData'); console.log('getData');
const res = await getDsnlist({page:pageObj.value.pageNo,size:pageObj.value.pageSize})
tableData.value = res.data.list
pageObj.value.total = res.data.total
} }
const handleClose = () => { const handleClose = () => {
...@@ -312,6 +272,9 @@ const handleExportConfirm = () => { ...@@ -312,6 +272,9 @@ const handleExportConfirm = () => {
const handleExport = () => { const handleExport = () => {
showDeleteDialog.value = true showDeleteDialog.value = true
} }
onMounted(() => {
getData()
})
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
......
...@@ -242,9 +242,10 @@ ...@@ -242,9 +242,10 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue' import { onMounted, ref } from 'vue'
import Pagination from '@/components/pagination/index.vue' import Pagination from '@/components/pagination/index.vue'
import exportDialog from '@/components/Export/index.vue' import exportDialog from '@/components/Export/index.vue'
import { getItulist, getItuDetail, deleteItuData } from '@/api/spiderData'
const showDeleteDialog = ref(false) const showDeleteDialog = ref(false)
const timeValue = ref('') const timeValue = ref('')
...@@ -295,55 +296,7 @@ const isRestoreUsed = ref('') ...@@ -295,55 +296,7 @@ const isRestoreUsed = ref('')
const validityPeriodSatelliteNetworkOldName = ref('') const validityPeriodSatelliteNetworkOldName = ref('')
// 最新相关 BR IFIC 发布日期 // 最新相关 BR IFIC 发布日期
const BFIFICdate = ref('') const BFIFICdate = ref('')
const tableData = ref([ const tableData = ref([])
{
number: '1',
SNSNoticeID: '86550007',
department: 'ARG',
targetName: 'ARGOS',
planType: '计划',
syncType: '否',
syncPosition: '-',
perigee: '2000',
apogee: '2500',
lowestAltitude: '165',
referenceSubject: '地球',
lowestFrequency: 'None',
highestFrequency: 'None',
status: 'None',
validityPeriod: '-',
earliestUsageDate: 'None',
isUsed: 'No',
isPauseUsed: 'No',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
{
name: '1',
},
])
const pageObj = ref({ const pageObj = ref({
total: 10, total: 10,
pageSize: 10, pageSize: 10,
...@@ -353,8 +306,11 @@ const handleDetails = (row: any) => { ...@@ -353,8 +306,11 @@ const handleDetails = (row: any) => {
console.log(row); console.log(row);
detailVisibleValue.value = true detailVisibleValue.value = true
} }
const getData = () => { const getData = async () => {
console.log('getData'); const res = await getItulist({page:pageObj.value.pageNo,size:pageObj.value.pageSize})
pageObj.value.total = res.data.length
tableData.value = res.data
} }
const handleClose = () => { const handleClose = () => {
detailVisibleValue.value = false detailVisibleValue.value = false
...@@ -365,6 +321,10 @@ const handleExportConfirm = () => { ...@@ -365,6 +321,10 @@ const handleExportConfirm = () => {
const handleExport = () => { const handleExport = () => {
showDeleteDialog.value = true showDeleteDialog.value = true
} }
onMounted(() => {
getData()
})
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
......
...@@ -157,12 +157,11 @@ const handleConfirm = async () => { ...@@ -157,12 +157,11 @@ const handleConfirm = async () => {
if (!firstRuleFormRef.value) { if (!firstRuleFormRef.value) {
return; return;
} }
// 3. 使用Promise形式的validate(不传入回调),确保await生效 // 使用Promise形式的validate(不传入回调),确保await生效
const valid = await firstRuleFormRef.value.validate(); const valid = await firstRuleFormRef.value.validate();
if (valid) { if (valid) {
// 进入这里即197行附近逻辑
await addUser({ await addUser({
nickname: firstForm.value.userName, // 注意:根据实际接口字段调整 nickname: firstForm.value.userName,
username: firstForm.value.userAccount, username: firstForm.value.userAccount,
password: firstForm.value.userPassword, password: firstForm.value.userPassword,
role: userRoleValue.value, role: userRoleValue.value,
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
<deleteDialog v-model:dialogVisible="showDeleteDialog" @get-user-list="getUserListData" <deleteDialog v-model:dialogVisible="showDeleteDialog" @get-user-list="getUserListData"
:ids="userIds" :deleteMode="deleteMode" :id="userId" /> :ids="userIds" :deleteMode="deleteMode" :id="userId" />
<!-- 创建用户弹窗组件 --> <!-- 创建用户弹窗组件 -->
<!-- todo -->
<addUserDialog v-model:dialogVisible="dialogVisible" :mode="mode" :nickName="nickName" :userName="userName" <addUserDialog v-model:dialogVisible="dialogVisible" :mode="mode" :nickName="nickName" :userName="userName"
:id="userId" :userRole="userRole" :userStatus="userStatus" :userPassword="userPassword" :id="userId" :userRole="userRole" :userStatus="userStatus" :userPassword="userPassword"
@get-user-list="getUserListData" /> @get-user-list="getUserListData" />
......
<template> <template>
<el-dialog v-model="currentVisible" :title="currentMode === '1' ? '新增' : '修改'" width="610" center align-center <el-dialog v-model="currentVisible" :title="currentMode === AddMode.ADD_TASK ? '新增' : '修改'" width="710" center
@close="handleClose" draggable> align-center @close="handleClose" draggable>
<el-form :inline="true" v-if="currentMode === '1'"> <el-form :model="ruleForm" :rules="rules" ref="ruleFormRef" label-width="100px">
<el-form-item label="任务名称:"> <el-form-item label="任务名称:" v-if="currentMode === AddMode.ADD_TASK" prop="taskName">
<el-input v-model="taskName" placeholder="请输入任务名称" /> <el-input v-model="ruleForm.taskName" placeholder="请输入任务名称"style="width: 90%" />
</el-form-item> </el-form-item>
<el-form-item label="执行时间:"> <el-form-item label="所属爬虫:" v-if="currentMode === AddMode.ADD_TASK" prop="spiderTypeValue">
<el-input v-model="taskFrequency" placeholder="请输入执行时间" /> <el-select v-model="ruleForm.spiderTypeValue" placeholder="请选择所属爬虫" style="width: 90%">
</el-form-item>
</el-form>
<div class="m-t-4" />
<el-form :inline="true">
<el-form-item label="所属爬虫:">
<el-select v-model="spiderTypeValue" placeholder="请选择爬虫类型" style="width: 181px">
<el-option v-for="item in spiderTypeOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in spiderTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="执行频率:"> <el-form-item label="执行频率:" prop="cronExpression">
<el-input v-model="taskFrequency" placeholder="请输入执行频率" /> <Crontab v-model="ruleForm.cronExpression" style="width: 90%" />
</el-form-item>
</el-form>
<div class="m-t-4" />
<el-form :inline="true">
<el-form-item label="启用/停止:">
<el-switch v-model="taskSwitchValue" class="ml-2"
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
...@@ -39,65 +26,125 @@ ...@@ -39,65 +26,125 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue' import { onMounted, ref } from 'vue'
import { defineProps } from 'vue'; import { defineProps } from 'vue';
import { watch } 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'
const props = defineProps({ interface RuleForm {
dialogVisible: { taskName: string
type: Boolean, spiderTypeValue: string
default: false cronExpression: string
}, }
mode: { const ruleFormRef = ref<FormInstance>()
type: String, const ruleForm = ref<RuleForm>({
default: '1' taskName: '',
}, spiderTypeValue: '',
spiderType: { cronExpression: '',
type: String, })
default: '' interface addDialogPropType {
}, dialogVisible: boolean,
frequency: { mode: AddMode,
type: String, jobId: string,
default: '' cron: string,
}, spiderType: string,
taskStatus: { options: string,
type: Boolean, }
default: false const props = defineProps<addDialogPropType>()
} const rules = ref<FormRules<RuleForm>>({
taskName: [
{ required: true, message: '请输入任务名称', trigger: 'blur' },
{ min: 1, max: 50, message: '任务名称应在1-50个字符之间', trigger: 'blur' },
],
spiderTypeValue: [
{
required: true,
message: '请选择所属爬虫',
trigger: 'change',
},
],
cronExpression: [
{
required: true,
message: '请输入执行频率',
trigger: 'change',
},
{ min: 1, message: '执行频率应为cron表达式', trigger: 'blur' },
]
}) })
// 向父组件传递dialog值 // 向父组件传递dialog值
const emit = defineEmits(['update:dialogVisible', 'confirm']) const emit = defineEmits(['update:dialogVisible', 'confirm', 'update:mode', 'getTaskList'])
// 组件的状态 // 组件的状态
const currentVisible = ref(props.dialogVisible) const currentVisible = ref(props.dialogVisible)
const currentMode = ref(props.mode) const currentMode = ref(props.mode)
const taskName = ref('') const taskName = ref('')
const taskFrequency = ref('')
const taskSwitchValue = ref(false)
const spiderTypeValue = ref('') const spiderTypeValue = ref('')
const spiderTypeOptions = ref([ const spiderTypeOptions = ref([
{ {
value: '选项1', value: 'api_spider',
label: 'DSN爬虫' label: 'api_spider'
}, },
{ {
value: '选项2', value: 'dsn_now',
label: 'ITU爬虫' label: 'dsn_now'
}, },
{ {
value: '选项3', value: 'itu_space_explorer',
label: 'ST爬虫' label: 'itu_space_explorer'
}, },
]) ])
const taskParams = ref({
scrapyd_server_id: '1',
schedule_type: '0',
project: 'spiders'
})
const cronExpression = ref('')
// 关闭的方法 // 关闭的方法
const handleClose = () => { const handleClose = () => {
ruleForm.value.taskName = ''
ruleForm.value.spiderTypeValue
ruleForm.value.cronExpression = ''
currentVisible.value = false currentVisible.value = false
} }
// 确定的方法 // 确定的方法
const handleConfirm = () => { const handleConfirm = async () => {
emit('confirm') if (!ruleFormRef.value) return
currentVisible.value = false await ruleFormRef.value.validate(async (valid, fields) => {
console.log('开始校验');
//验证表单内容是否通过,通过继续执行
if (valid) {
if (currentMode.value === AddMode.ADD_TASK) {
await addSpiderTask({
scrapyd_server_id: taskParams.value.scrapyd_server_id,
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')
} else if (currentMode.value === AddMode.UPDATE_TASK) {
await addSpiderTask({
scrapyd_server_id: taskParams.value.scrapyd_server_id,
schedule_type: taskParams.value.schedule_type,
project: taskParams.value.project,
spider: props.spiderType,
job_id: props.jobId,
cron: ruleForm.value.cronExpression,
options: props.options
})
currentVisible.value = false
emit('getTaskList')
}
} else {
console.log('校验不通过');
}
})
} }
// 监听props变化,同步给组件内部 // 监听props变化,同步给组件内部
...@@ -119,6 +166,28 @@ watch(() => props.mode, ...@@ -119,6 +166,28 @@ watch(() => props.mode,
currentMode.value = newVal currentMode.value = newVal
} }
) )
watch(() => currentMode.value,
(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 = ''
}
},
{ immediate: true }
);
onMounted(() => {
})
</script> </script>
<style> <style>
...@@ -133,6 +202,10 @@ watch(() => props.mode, ...@@ -133,6 +202,10 @@ watch(() => props.mode,
.el-dialog__title { .el-dialog__title {
color: #ffffff; color: #ffffff;
} }
.el-input__inner {
color: #ffffff;
}
} }
/* 修改表单样式 */ /* 修改表单样式 */
......
<template>
<el-dialog v-model="deleteDialogVisible" title="删除" width="250" center align-center @close="close" draggable>
<div class="text-center">
<span style="color: #fff;font-size: 15px;">确定删除吗?</span>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="handleDelelte">
确定
</el-button>
</div>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { ref, watch } from 'vue'
import { defineProps } from 'vue';
import { deleteSpiderTask } from '@/api/spiderTask.ts'
interface deleteDialogPropType {
dialogVisible: boolean,
jobId: string
}
const props = defineProps<deleteDialogPropType>()
const emit = defineEmits(['update:dialogVisible', 'confirm', 'getUserList', 'update:deleteMode'])
const deleteDialogVisible = ref(props.dialogVisible)
// 删除方法
const handleDelelte = async () => {
await deleteSpiderTask({job_id: props.jobId})
emit('getUserList')
deleteDialogVisible.value = false
}
// 关闭弹窗的方法
const close = () => {
deleteDialogVisible.value = false
}
// 监听父组件传过来的值
watch(() => props.dialogVisible,
(newVal) => {
deleteDialogVisible.value = newVal
}
)
// 监听组件内的值并向父组件更新
watch(() => deleteDialogVisible.value,
(newVal) => {
emit('update:dialogVisible', newVal)
}
)
</script>
\ No newline at end of file
/// @ts-ignore
export enum AddMode {
ADD_TASK = 0,
UPDATE_TASK = 1,
}
\ No newline at end of file
...@@ -2,63 +2,27 @@ ...@@ -2,63 +2,27 @@
<div> <div>
<div class="backStyle" v-if="route.query.jump === 'yes'" @click="goToTaskInformation" /> <div class="backStyle" v-if="route.query.jump === 'yes'" @click="goToTaskInformation" />
<div class="m-t-10" /> <div class="m-t-10" />
<div class="text-left p-4 toolbarStyle"> <div >
<div class="formStyle">
<el-form inline>
<el-form-item>
<el-text class="mx-1">所属爬虫:</el-text>
</el-form-item>
<el-form-item>
<div>
<el-select v-model="taskValue" placeholder="请选择" style="width: 220px">
<el-option v-for="item in taskOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</el-form-item>
<el-form-item>
<el-text class="mx-1">任务名称:</el-text>
</el-form-item>
<el-form-item>
<el-input v-model="taskValue" placeholder="请输入" style="width: 220px" />
</el-form-item>
<el-form-item>
<el-space>
<el-button type="primary">查询</el-button>
</el-space>
</el-form-item>
<el-form-item>
<el-space>
<el-button type="primary" @click="openTaskDialog">新建任务</el-button>
</el-space>
</el-form-item>
</el-form>
</div>
</div>
<div class="cardStyle">
<taskCard successTask="100" failTask="10" unusualTask="1" /> <taskCard successTask="100" failTask="10" unusualTask="1" />
<!-- <div class="pagination w-full flex flex-row-reverse pr-18 m-t-0"> <!-- <div class="pagination w-full flex flex-row-reverse pr-18 m-t-0">
<Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize" <Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
@pagination="getData" /> @pagination="getData" />
</div> --> </div> -->
</div> </div>
<!-- 添加任务对话框组件 -->
<addTaskDialog v-model:dialogVisible="showDialog" @confirm="handleDeleteConfirm" :mode="editMode" />
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import Pagination from '@/components/pagination/index.vue' import Pagination from '@/components/pagination/index.vue'
import taskCard from './components/taskCard.vue' import taskCard from './components/taskCard.vue'
import addTaskDialog from './components/addTaskDialog.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { getSpiderTaskList } from '@/api/spiderTask' import { getSpiderTaskList,getTaskData } from '@/api/spiderTask'
import { AddMode } from './components/enum'
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const editMode = ref('1')
const taskValue = ref('') const taskValue = ref('')
const taskList = ref([]) const taskList = ref([])
const taskOptions = [ const taskOptions = [
...@@ -81,23 +45,9 @@ const pageObj = ref({ ...@@ -81,23 +45,9 @@ const pageObj = ref({
pageNo: 1 pageNo: 1
}) })
// 控制对话框显示/隐藏的状态变量
const showDialog = ref(false)
// 处理删除确认
const handleDeleteConfirm = () => {
console.log('用户确认删除')
}
const openTaskDialog = () => {
showDialog.value = true
}
const goToTaskInformation = () => { const goToTaskInformation = () => {
router.push({ path: '/osSpiderManager/list' }) router.push({ path: '/osSpiderManager/list' })
} }
onMounted(() => {
})
</script> </script>
<style scoped> <style scoped>
......
...@@ -6,7 +6,7 @@ import { resolve } from 'path' ...@@ -6,7 +6,7 @@ import { resolve } from 'path'
// https://vite.dev/config/ // https://vite.dev/config/
export default defineConfig({ export default defineConfig({
plugins: [ plugins: [
vue(), vue(),
UnoCSS() UnoCSS()
], ],
resolve: { resolve: {
......
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