Merge branch 'yzh' into 'main'

完成了爬虫管理页面，任务执行记录页面

See merge request !7

src/api/apiPaths.ts

@@ -76,4 +76,16 @@ export const userApi = {
   addUser: '/user/insert',
   updateUser: '/user/update',
   deleteUser: '/user/delete',
+  batchDelete: '/user/batchDelete',
+} as const
+
+export const spiderApi = {
+  // 系统用户相关接口
+  spiderList: '/scrapyd/listSpiders',
+} as const
+
+export const spiderTaskApi = {
+  // 爬虫任务相关接口
+  taskList: '/schedule/getJobs',
+  taskRecord: '/schedule/scheduleLogs',
 } as const
\ No newline at end of file

src/api/spiderTask.ts

+import { request, POST } from '@/utils/request'
+import type { ApiResponse, QueryParams ,UserQueryParams } from '@/utils/request'
+import { systemApi, scrapydServerApi, spiderApi,spiderTaskApi} from './apiPaths'
+
+// 爬虫任务执行记录
+export function getSpiderTaskRecord(data: UserQueryParams) {
+  return request({
+    url: spiderTaskApi.taskRecord,
+    method: POST,
+    data
+  }) as unknown as Promise<ApiResponse>
+}
+
+// 爬虫任务列表
+export function getSpiderTaskList(data: UserQueryParams) {
+  return request({
+    url: spiderTaskApi.taskList,
+    method: POST,
+    data
+  }) as unknown as Promise<ApiResponse>
+}
\ No newline at end of file

src/api/system.ts

 import { request, POST } from '@/utils/request'
-import type { ApiResponse, QueryParams } from '@/utils/request'
-import { systemApi, scrapydServerApi } from './apiPaths'
+import type { ApiResponse, QueryParams ,UserQueryParams } from '@/utils/request'
+import { systemApi, scrapydServerApi, spiderApi } from './apiPaths'
 
 // 获取系统信息
 export function getSystemInfo(): Promise<ApiResponse> {
@@ -52,3 +52,11 @@ export const getScrapydServerList = (): 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>
+}
\ No newline at end of file

src/api/user.ts

@@ -67,4 +67,13 @@ export function deleteUser(data: UserQueryParams) {
     method: POST,
     data
   }) as unknown as Promise<ApiResponse>
+}
+
+// 批量删除用户
+export function batchDeleteUser(data: UserQueryParams) {
+  return request({
+    url: userApi.batchDelete,
+    method: POST,
+    data
+  }) as unknown as Promise<ApiResponse>
 }
\ No newline at end of file

src/components/Delete/enum.ts

+
+/// @ts-ignore
+export enum DeleteMode {
+  BATCH_DELETE = 0,
+  SINGLE_DELETE = 1,
+}
+

src/components/Delete/index.vue

@@ -17,24 +17,32 @@
 <script lang="ts" setup>
 import { ref, watch } from 'vue'
 import { defineProps } from 'vue';
-
-const props = defineProps({
-	dialogVisible: {
-		type: Boolean,
-		default: false
-	},
-	mode: {
-		type: String,
-		default: '1'
-	}
-})
-const emit = defineEmits(['update:dialogVisible', 'confirm'])
+import { getUserList, addUser, deleteUser, updateUser, batchDeleteUser } from '@/api/user.ts'
+import { DeleteMode } from '@/components/Delete/enum.ts'
+interface deleteDialogPropType {
+	dialogVisible: boolean,
+	deleteMode: DeleteMode,
+	id: number,
+	ids: number[]
+}
+const props = defineProps<deleteDialogPropType>()
+const emit = defineEmits(['update:dialogVisible', 'confirm', 'getUserList', 'update:deleteMode'])
 const deleteDialogVisible = ref(props.dialogVisible)
-
+const deleteMode = ref(props.deleteMode)
 // 删除方法
-const handleDelelte = () => {
-	emit('confirm')
-	deleteDialogVisible.value = false
+const handleDelelte = async () => {
+	if (props.deleteMode == DeleteMode.SINGLE_DELETE) {
+		await deleteUser({ id: props.id })
+		emit('getUserList')
+		deleteDialogVisible.value = false
+
+	}
+	else if (props.deleteMode == DeleteMode.BATCH_DELETE) {
+		console.log(props.ids);
+		await batchDeleteUser({ ids: props.ids })
+		emit('getUserList')
+		deleteDialogVisible.value = false
+	}
 }
 // 关闭弹窗的方法
 const close = () => {
@@ -52,4 +60,16 @@ watch(() => deleteDialogVisible.value,
 		emit('update:dialogVisible', newVal)
 	}
 )
+// 监听父组件传过来的值
+watch(() => props.deleteMode,
+	(newVal) => {
+		deleteMode.value = newVal
+	}
+)
+// 监听组件内的值并向父组件更新
+watch(() => deleteMode.value,
+	(newVal) => {
+		emit('update:deleteMode', newVal)
+	}
+)
 </script>
\ No newline at end of file

src/utils/request.ts

@@ -106,5 +106,11 @@ export interface UserQueryParams {
   nickname?: string
   password?: string
   role?: number
-  status?: boolean
+  status?: any
+  id?: number
+  ids?: any
+  scrapydServerId?: string
+  project?: string
+  spiders?:any
+  times?:any
 }
\ No newline at end of file

src/views/os-log/index.vue

@@ -18,7 +18,7 @@ const textarea = ref('')
 
 const bactToRecord = () => {
 	router.push({
-		path: '/os-taskRecord/list',
+		path: '/osTaskRecord/list',
 	})
 }
 </script>

src/views/os-spiderManager/index.vue

@@ -4,9 +4,9 @@
 		<div>
 			<el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }"
 				:cell-style="{ textAlign: 'center' }" :row-style="{ height: '60px' }">
-				<el-table-column type="selection" width="40" height="40" />
-				<el-table-column property="number" label="序号" />
-				<el-table-column property="spiderName" label="爬虫名称" show-overflow-tooltip />
+				<!-- <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="查看任务">
 					<template #default="scope">
 						<el-button type="primary" plain @click="handleDetails(scope.row)">
@@ -27,51 +27,9 @@
 import { ref, onMounted } from 'vue'
 import Pagination from '@/components/pagination/index.vue'
 import { useRouter } from 'vue-router'
-
+import { getSpiderList } from '@/api/system.ts'
 const router = useRouter()
-const tableData = ref([
-	{
-		number: '1',
-		spiderName: 'sk网爬虫',
-	},
-	{
-		name: '2',
-		address: 'sk网',
-	},
-	{
-		name: '3',
-		address: 'sk网',
-	},
-	{
-		name: '4',
-		address: 'sk网',
-	},
-	{
-		name: '5',
-		address: 'sk网',
-	},
-	{
-		name: '6',
-		address: 'sk网',
-	},
-	{
-		name: '7',
-		address: 'sk网',
-	},
-	{
-		name: '8',
-		address: 'sk网',
-	},
-	{
-		name: '9',
-		address: 'sk网',
-	},
-	{
-		name: '10',
-		address: 'sk网',
-	},
-
-])
+const tableData = ref([])
 const pageObj = ref({
 	total: 10,
 	pageSize: 10,
@@ -86,11 +44,13 @@ const handleDetails = (row: any) => {
 		}
 	})
 }
-const getData = () => {
-	console.log('getData');
+const getData = async () => {
+	const res = await getSpiderList({scrapydServerId:'1',project:'spiders'})
+	tableData.value = res.data
 }
 
 onMounted(() => {
+	getData()
 })
 </script>
 

src/views/os-system/components/enum.ts

+/// @ts-ignore
+export enum AddMode {
+    ADD_MODE = 0,
+    UPDATE_MODE = 1,
+}

src/views/os-system/index.vue

@@ -6,18 +6,17 @@
 					<el-button type="primary" plain @click="openAddUserDialog">创建用户</el-button>
 				</el-form-item>
 				<el-form-item>
-					<el-button type="danger" plain @click="handleDelete">批量删除</el-button>
+					<el-button type="danger" plain @click="handleBatchDelete">批量删除</el-button>
 				</el-form-item>
 			</el-form>
 		</div>
 		<el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }"
-			:cell-style="{ textAlign: 'center' }" :row-style="{ height: '58px' }">
+			:cell-style="{ textAlign: 'center' }" :row-style="{ height: '58px' }" 
+			@selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="40" />
 			<el-table-column property="number" label="序号" width="55" type="index" />
 			<el-table-column property="username" label="用户账号" show-overflow-tooltip />
 			<el-table-column property="nickname" label="用户名称" show-overflow-tooltip />
-			<!-- <el-table-column property="userRemark" label="备注" show-overflow-tooltip /> -->
-			<!-- <el-table-column property="userPassword" label="用户密码" show-overflow-tooltip /> -->
 			<el-table-column property="create_time" label="创建时间" width="280" show-overflow-tooltip />
 			<el-table-column label="操作" width="220">
 				<template #default="scope">
@@ -32,13 +31,16 @@
 		</el-table>
 		<div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
 			<Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
-				@pagination="getData" />
+				@pagination="getUserListData" />
 		</div>
 		<!-- 删除弹窗组件 -->
-		<deleteDialog v-model:dialogVisible="showDeleteDialog" @mode="deleteMode" />
+		<deleteDialog v-model:dialogVisible="showDeleteDialog"  @get-user-list="getUserListData"
+			:ids="userIds" :deleteMode="deleteMode" :id="userId" />
 		<!-- 创建用户弹窗组件 -->
-		<addUserDialog v-model:dialogVisible="dialogVisible" :mode="mode" :nick-name="nickName" :user-name="userName" :id="userId"
-			:user-role="userRole" :user-status="userStatus" :user-password="userPassword" @get-user-list="getUserListData" />
+		 <!-- todo -->
+		<addUserDialog v-model:dialogVisible="dialogVisible" :mode="mode" :nickName="nickName" :userName="userName"
+			:id="userId" :userRole="userRole" :userStatus="userStatus" :userPassword="userPassword"
+			@get-user-list="getUserListData" />
 	</div>
 </template>
 
@@ -47,18 +49,21 @@ import { ref, onMounted } from 'vue'
 import Pagination from '@/components/pagination/index.vue'
 import deleteDialog from '@/components/Delete/index.vue'
 import addUserDialog from './components/addUserDialog.vue'
-import { getUserList, addUser, deleteUser, updateUser } from '@/api/user.ts'
+import { getUserList, addUser, deleteUser, updateUser, batchDeleteUser } from '@/api/user.ts'
+import { DeleteMode } from '@/components/Delete/enum.ts'
+import { AddMode } from './components/enum.ts';
 
-const userId = ref(0)
-const nickName = ref('')
-const userName = ref('')
-const userRole = ref(0)
-const userStatus = ref(true)
-const userPassword = ref('')
+const userId = ref<any>([])
+const userIds = ref<any>()
+const nickName = ref<string>('')
+const userName = ref<string>('')
+const userRole = ref<number>(0)
+const userStatus = ref<boolean>(true)
+const userPassword = ref<string>('')
 const showDeleteDialog = ref(false)
-const deleteMode = ref('2')
-const dialogVisible = ref(false)
-const mode = ref('1')
+const deleteMode = ref<DeleteMode>(DeleteMode.SINGLE_DELETE)
+const dialogVisible = ref<boolean>(false)
+const mode = ref<AddMode>(AddMode.ADD_MODE)
 const tableData = ref()
 const pageObj = ref({
 	total: 12,
@@ -66,40 +71,49 @@ const pageObj = ref({
 	pageNo: 1
 })
 const handleEdit = async (row: any) => {
-	mode.value = '2'
+	mode.value = AddMode.UPDATE_MODE
 	nickName.value = row.nickname
 	userName.value = row.username
 	userRole.value = row.role
 	userStatus.value = row.status
 	userPassword.value = row.password
 	dialogVisible.value = true
+	userId.value = row.id
 	// console.log(row);
 }
 
-const handleDelete = (row: any) => {
+const handleDelete = async (row: any) => {
 	showDeleteDialog.value = true
+	deleteMode.value = DeleteMode.SINGLE_DELETE
+	userId.value = row.id
+	console.log(userId.value);
 }
-
-const getData = (number: number) => {
-	// console.log('getData');
-	console.log(number);
-
+const handleBatchDelete = async () => {
+	deleteMode.value = DeleteMode.BATCH_DELETE
+	showDeleteDialog.value = true
 }
-
-const handleDeleteConfirm = () => {
-
+const handleSelectionChange = (data: any) => {
+	let array = []
+	for (let i = 0; i < data.length; i++) {
+		array.push(data[i].id)
+	}
+	userIds.value = array
+	console.log(userIds.value);
+	
 }
+
 const openAddUserDialog = () => {
-	mode.value = '1'
+	mode.value = AddMode.ADD_MODE
 	dialogVisible.value = true
 }
 const getUserListData = async () => {
 	const userList = await getUserList({
-		page: 1,
+		// page: 1,
 		size: 10
 	})
 	tableData.value = userList.data
-	console.log(tableData.value);
+	pageObj.value.total = tableData.value.length
+	console.log(tableData.value.length);
 
 }
 onMounted(async () => {

src/views/os-taskInformation/components/addTaskDialog.vue

@@ -12,7 +12,7 @@
 		<div class="m-t-4" />
 		<el-form :inline="true">
 			<el-form-item label="所属爬虫:">
-				<el-select v-model="spiderTypeValue" placeholder="请选择爬虫类型" style="width: 183px">
+				<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-select>
 			</el-form-item>

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

@@ -46,10 +46,11 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import deleteDialog from '@/components/Delete/index.vue'
 import addTaskDialog from './addTaskDialog.vue'
+import { getSpiderTaskList } from '@/api/spiderTask'
 defineProps({
 	successTask: {
 		type: String,
@@ -159,6 +160,17 @@ const handleEdit = () => {
 const handleDeleteConfirm = () => {
 
 }
+const getData = async () => {
+  console.log('getData');
+  const res = await getSpiderTaskList({spiders:['api_spider']})
+//   taskList.value = res.data
+  console.log(res);
+  
+}
+
+onMounted(() => {
+  getData()
+})
 </script>
 
 <style lang="scss" scoped>

src/views/os-taskInformation/index.vue

 <template>
   <div>
     <div class="backStyle" v-if="route.query.jump === 'yes'" @click="goToTaskInformation" />
-    <div class="m-t-5" />
+    <div class="m-t-10" />
     <div class="text-left p-4 toolbarStyle">
       <div class="formStyle">
         <el-form inline>
@@ -36,10 +36,10 @@
     </div>
     <div class="cardStyle">
       <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="getData" />
-      </div>
+      </div> -->
     </div>
     <!-- 添加任务对话框组件 -->
     <addTaskDialog v-model:dialogVisible="showDialog" @confirm="handleDeleteConfirm" :mode="editMode" />
@@ -54,10 +54,13 @@ import taskCard from './components/taskCard.vue'
 import addTaskDialog from './components/addTaskDialog.vue'
 import { useRouter } from 'vue-router'
 import { useRoute } from 'vue-router'
+import { getSpiderTaskList } from '@/api/spiderTask'
+
 const route = useRoute()
 const router = useRouter()
 const editMode = ref('1')
 const taskValue = ref('')
+const taskList = ref([])
 const taskOptions = [
   {
     value: 'task1',
@@ -77,9 +80,7 @@ const pageObj = ref({
   pageSize: 10,
   pageNo: 1
 })
-const getData = () => {
-  console.log('getData');
-}
+
 // 控制对话框显示/隐藏的状态变量
 const showDialog = ref(false)
 
@@ -105,8 +106,8 @@ onMounted(() => {
   background-image: url("@/assets/picture/back.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  height: 5vh;
-  width: 5%;
+  height: 7vh;
+  width: 7%;
   display: flex;
   margin-left: 0.8%;
 }

src/views/os-taskRecord/index.vue

@@ -6,38 +6,28 @@
 			<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-date-picker v-model="timeValue" type="datetimerange" start-placeholder="Start date"
 							end-placeholder="End date" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd"
-							time-format="A hh:mm:ss" />
+							time-format="A hh:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"/>
 					</el-form-item>
-					<el-form-item>
+					<!-- <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-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-form-item>
 						<el-space>
-							<el-button type="primary">查询</el-button>
+							<el-button type="primary" @click="searchData">查询</el-button>
+							<el-button type="primary" @click="getData">重置表格</el-button>
+
 						</el-space>
 					</el-form-item>
 				</el-form>
@@ -47,27 +37,36 @@
 		<div>
 			<el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }"
 				:cell-style="{ textAlign: 'center' }">
-				<el-table-column type="selection" width="40" />
-				<el-table-column property="number" label="序号" width="55" />
-				<el-table-column property="taskName" label="任务名称" show-overflow-tooltip />
-				<el-table-column property="scheduleMode" label="调度模式" show-overflow-tooltip />
-				<el-table-column property="scheduleStatus" label="调度状态" show-overflow-tooltip />
-				<el-table-column property="errorMessage" label="错误消息" show-overflow-tooltip />
-				<el-table-column property="runningStatus" label="运行状态" show-overflow-tooltip />
-				<el-table-column property="duration" label="持续时间" show-overflow-tooltip />
-				<el-table-column property="scheduleTime" label="调度时间" width="200" show-overflow-tooltip />
-				<el-table-column label="运行日志" width="120">
+				<el-table-column property="number" label="序号" width="55" type="index" />
+				<el-table-column property="project" label="项目名称" show-overflow-tooltip />
+				<el-table-column property="spider" label="所属爬虫" show-overflow-tooltip />
+				<el-table-column property="schedule_mode" label="调度模式" show-overflow-tooltip />
+				<el-table-column property="run_status" label="调度状态" show-overflow-tooltip>
+					<template #default="scope">
+						{{ '已完成' }}
+					</template>
+				</el-table-column>
+				<el-table-column label="错误消息" show-overflow-tooltip>
+					<!-- 当错误消息为空时默认值为'-' -->
+					<template #default="scope">
+						{{ scope.row.message || '-' }}
+					</template>
+				</el-table-column>
+				<el-table-column property="run_status" label="运行状态" show-overflow-tooltip />
+				<!-- <el-table-column property="duration" label="持续时间" show-overflow-tooltip /> -->
+				<el-table-column property="create_time" label="调度时间" width="200" show-overflow-tooltip />
+				<!-- <el-table-column label="运行日志" width="120">
 					<template #default="scope">
 						<el-button size="small" plain type="primary" @click="handleDetails(scope.row)">
 							日志
 						</el-button>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 			</el-table>
 		</div>
 		<div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
 			<Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
-				@pagination="getData" />
+				@pagination="getData" v-model:pagerCount="pageObj.pagerCount" />
 		</div>
 	</div>
 </template>
@@ -77,6 +76,7 @@ import { ref, onMounted } from 'vue'
 import Pagination from '@/components/pagination/index.vue'
 import { useRoute } from 'vue-router'
 import { useRouter } from 'vue-router'
+import { getSpiderTaskRecord } from '@/api/spiderTask.ts'
 
 const route = useRoute()
 const router = useRouter()
@@ -96,121 +96,12 @@ const taskOptions = [
 		label: '网',
 	},
 ]
-const tableData = ref([
-	{
-		number: '1',
-		taskName: 'dsn爬虫任务',
-		scheduleMode: '自动',
-		scheduleStatus: '自动',
-		errorMessage: '无',
-		runningStatus: '完成',
-		duration: '10s',
-		scheduleTime: '2023-05-13 10:00:00',
-
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	}, {
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	}
-	, {
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	},
-	{
-		name: '1',
-		address: 'sk网',
-		address1: '成功',
-		address2: '100',
-		address3: '0',
-		address4: '无',
-		address5: '10s',
-		address6: '2023-05-13 10:00:00',
-		status: 0
-	}
-])
+const tableData = ref([])
 const pageObj = ref({
 	total: 10,
 	pageSize: 10,
-	pageNo: 1
+	pageNo: 1,
+	pagerCount: 5,
 })
 const handleDetails = (row: any) => {
 	console.log(row);
@@ -235,12 +126,26 @@ const goToStatus = () => {
 
 
 }
-const getData = () => {
-	console.log('getData');
+// 获取任务执行记录列表
+const getData = async () => {
+	const res = await getSpiderTaskRecord({ page: pageObj.value.pageNo, size: pageObj.value.pageSize, status: 'total' })
+	pageObj.value.total = res.data.total
+	tableData.value = res.data.list
 }
 
-onMounted(() => {
+const searchData = async () => {
+	let resTime = []
+	const startTime = timeValue.value[0]
+	const endTime = timeValue.value[1]
+	resTime.push(startTime)
+	resTime.push(endTime)
+	const res = await getSpiderTaskRecord({ page: pageObj.value.pageNo, size: pageObj.value.pageSize, status: 'total' ,times: resTime})
+	pageObj.value.total = res.data.total
+	tableData.value = res.data.list
+}
 
+onMounted(() => {
+	getData()
 })
 </script>
 

tsconfig.node.json

@@ -17,7 +17,7 @@
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
+    "erasableSyntaxOnly": false,
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true
   },