feat:dsn页面定时刷新

src/router/index.ts

@@ -40,12 +40,12 @@ export const constantRoutes: Array<RouteRecordRaw> = [
   {
     path: '',
     component: Layout,
-    redirect: '/dashboard',
+    redirect: '/osStatus/list',
     hidden: true,
     children: [{
-      path: '/dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/home/home.vue'),
+      path: '/osStatus/list',
+      name: 'statusMonitor',
+      component: () => import('@/views/os-status/index.vue'),
       meta: { title: '控制台', icon: 'Monitor' }
     }]
   } as unknown as RouteRecordRaw,
@@ -198,14 +198,13 @@ export const constantRoutes: Array<RouteRecordRaw> = [
 
   {
     path: "/osStatus",
-    // redirect: "list",
     component: Layout,
     children: [
       {
         path: "list",
         name: "statusMonitor",
         component: () => import("@/views/os-status/index.vue"),
-        meta: { title: "状态监控", icon: "Key" }
+        meta: { title: "状态监控", icon: "Monitor" }
       },
     ]
   } as unknown as RouteRecordRaw,
@@ -219,7 +218,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
         path: "list",
         name: "taskInformation",
         component: () => import("@/views/os-taskInformation/index.vue"),
-        meta: { title: "任务信息", icon: "Key" }
+        meta: { title: "任务信息", icon: "List" }
       },
     ]
   } as unknown as RouteRecordRaw,
@@ -232,7 +231,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
         path: "list",
         name: "taskRecord",
         component: () => import("@/views/os-taskRecord/index.vue"),
-        meta: { title: "任务执行记录", icon: "Key" }
+        meta: { title: "任务执行记录", icon: "Notebook" }
       },
     ]
   } as unknown as RouteRecordRaw,
@@ -245,7 +244,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
         path: "list",
         name: "dataDisplay",
         component: () => import("@/views/os-dataDisplay/index.vue"),
-        meta: { title: "数据展示", icon: "Key" }
+        meta: { title: "数据展示", icon: "DataAnalysis" }
       },
     ]
   } as unknown as RouteRecordRaw,
@@ -271,7 +270,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
         path: "list",
         name: "osSystem",
         component: () => import("@/views/os-system/index.vue"),
-        meta: { title: "系统管理", icon: "Key" }
+        meta: { title: "系统管理", icon: "Setting" }
       },
     ]
   } as unknown as RouteRecordRaw,

src/utils/request.ts

@@ -123,4 +123,8 @@ export interface UserQueryParams {
   sat_name?: string
   ntc_id?: string
   filters?: any
+  norad_cat_id?: string
+  object_name?: string
+
+
 }
\ No newline at end of file

src/views/login/index.vue

@@ -42,6 +42,7 @@ const redirect = ref<string | undefined>(undefined)
 
 // 监听路由变化
 if (route.query?.redirect) {
+  console.log(route.query.redirect);
   redirect.value = route.query.redirect as string
 }
 
@@ -60,7 +61,7 @@ const handleLogin = () => {
       loading.value = true
       try {
         await userStore.login(loginForm)
-        router.push({ path: redirect.value || '/' })
+        router.push({ path: '/' })
       } catch (error: any) {
         console.error('登录失败:', error)
       } finally {

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

@@ -7,7 +7,7 @@
 				</el-form-item>
 				<el-form-item>
 					<div>
-						<el-input placeholder="请输入" v-model="searchTargetName" style="width: 190px" />
+						<el-input placeholder="请输入" v-model="searchTargetName" style="width: 180px" />
 					</div>
 				</el-form-item>
 				<el-form-item>
@@ -22,11 +22,12 @@
 					<el-text class="mx-1">SNS Notice ID:</el-text>
 				</el-form-item>
 				<el-form-item>
-					<el-input placeholder="请输入" v-model="searchTargetId" style="width: 180.5px" />
+					<el-input placeholder="请输入" v-model="searchTargetId" style="width: 170.5px" />
 				</el-form-item>
 				<el-form-item>
 					<el-space>
 						<el-button type="primary" @click="handleSearch">查询</el-button>
+						<el-button type="primary" @click="getData">重置表格</el-button>
 					</el-space>
 				</el-form-item>
 			</el-form>
@@ -251,7 +252,7 @@
 					<!-- <el-row :gutter="20">
 						<el-col :span="24">
 							<el-form-item label="最新相关 BR IFIC 发布日期:" label-position="top">
-								<el-input v-model="BFIFICdate" />
+								<el-input v-model="BRIFICdate" />
 							</el-form-item>
 						</el-col>
 					</el-row> -->
@@ -358,6 +359,8 @@ const handleDetails = async (id: any) => {
 const getData = async () => {
 	const res = await getItuList({ page: pageObj.value.pageNo, size: pageObj.value.pageSize })
 	console.log(res);
+	searchTargetName.value = ''
+	searchTargetId.value = ''
 	pageObj.value.total = res.data.total
 	tableData.value = res.data.list
 }
@@ -369,7 +372,9 @@ const handleExportConfirm = () => {
 }
 const handleSearch = async () => {
 	const res = await getItuList({ sat_name: searchTargetName.value, ntc_id: searchTargetId.value, times: searchTimeValue.value , page: pageObj.value.pageNo, size: pageObj.value.pageSize })
-	tableData.value = res.data
+	// console.log(res);
+	pageObj.value.total = res.data.total
+	tableData.value = res.data.list
 }
 onMounted(() => {
 	getData()

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

@@ -7,7 +7,7 @@
 				</el-form-item>
 				<el-form-item>
 					<div>
-						<el-input placeholder="请输入" style="width: 190px" />
+						<el-input placeholder="请输入" style="width: 180px" v-model="searchTargetName" />
 					</div>
 				</el-form-item>
 				<el-form-item>
@@ -22,7 +22,7 @@
 					<el-text class="mx-1">NORAD CAT ID:</el-text>
 				</el-form-item>
 				<el-form-item>
-					<el-input placeholder="请输入" style="width: 180.5px" />
+					<el-input placeholder="请输入" style="width: 170.5px" v-model="noradCatId" />
 				</el-form-item>
 				<!-- <el-form-item>
 					<el-space>
@@ -32,6 +32,7 @@
 				<el-form-item>
 					<el-space>
 						<el-button type="primary" @click="handleSearch">查询</el-button>
+						<el-button type="primary" @click="getData">重置表格</el-button>
 					</el-space>
 				</el-form-item>
 			</el-form>
@@ -175,6 +176,8 @@ import Pagination from '@/components/pagination/index.vue'
 import exportDialog from '@/components/Export/index.vue'
 import { getStList, getStDetail, deleteStData } from '@/api/spiderData'
 
+const searchTargetName = ref('')
+const noradCatId = ref('')
 const showDeleteDialog = ref(false)
 const timeValue = ref('')
 const detailVisibleValue = ref(false)
@@ -234,7 +237,9 @@ const getData = async () => {
 	const res = await getStList({ page: pageObj.value.pageNo, size: pageObj.value.pageSize })
 	pageObj.value.total = res.data.total
 	tableData.value = res.data.list
-	// console.log(res);
+	noradCatId.value = ''
+	searchTargetName.value = ''
+	timeValue.value = ''
 }
 const handleClose = () => {
 	detailVisibleValue.value = false
@@ -246,10 +251,10 @@ const handleExport = () => {
 	showDeleteDialog.value = true
 }
 const handleSearch = async () => {
-	console.log(timeValue.value);
+	const res = await getStList({ norad_cat_id: noradCatId.value, object_name: searchTargetName.value, times:timeValue.value })
+	tableData.value = res.data.list
+	pageObj.value.total = res.data.total
 
-	//const res =  await getStlist({sat_name: targetName.value,ntc_id: snsId.value,times: timeValue.value})
-	// tableData.value = res.data
 }
 onMounted(() => {
 	getData()
@@ -338,6 +343,4 @@ onMounted(() => {
 .el-button:focus {
 	outline: none;
 }
-
-
 </style>
\ No newline at end of file

src/views/os-dataDisplay/index.vue

@@ -4,7 +4,7 @@
 		<div class="text-left p-4 ">
 			<div class="custom-style flex gap-4">
 				<el-segmented v-model="mode" :options="sizeOptions" style="margin-bottom: 1rem" size="default" />
-				<el-button type="primary" @click="handleExport" class="m-r-10">导出</el-button>
+				<el-button type="primary" @click="handleExport">导出</el-button>
 			</div>
 		</div>
 		<!-- 综合数据页面组件 -->
@@ -34,6 +34,7 @@ import stDataTab from './components/stDataTab.vue'
 import dsnDataTab from './components/dsnData/dsnTab.vue'
 import exportDialog from '@/components/Export/index.vue'
 
+// const 
 const mode = ref('DSN数据')
 const showDeleteDialog = ref(false)
 const sizeOptions = ['DSN数据', 'ITU数据', 'ST数据']

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

@@ -107,7 +107,6 @@ const goToSTTaskRecordPage = () => {
 }
 const getData = async () => {
 	const res = await getAllSpiderTaskStatistics({})
-	console.log(res);
 	dsnTotalTaskNumber.value = res.data.dsn_now.totalCount
 	dsnTaskSuccessNumber.value = res.data.dsn_now.successCount
 	dsnTaskFailNumber.value = res.data.dsn_now.failCount

src/views/os-system/index.vue

@@ -48,10 +48,10 @@ 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, batchDeleteUser } from '@/api/user.ts'
+import { getUserList } from '@/api/user.ts'
 import { DeleteMode } from '@/components/Delete/enum.ts'
 import { AddMode } from './components/enum.ts';
-
+import { ElMessage } from 'element-plus'
 const userId = ref<any>([])
 const userIds = ref<any>()
 const nickName = ref<string>('')
@@ -78,7 +78,6 @@ const handleEdit = async (row: any) => {
 	userPassword.value = row.password
 	dialogVisible.value = true
 	userId.value = row.id
-	// console.log(row);
 }
 
 const handleDelete = async (row: any) => {
@@ -88,8 +87,16 @@ const handleDelete = async (row: any) => {
 	console.log(userId.value);
 }
 const handleBatchDelete = async () => {
+	if(userIds.value == undefined){
+		ElMessage({
+			message: '请先选择要删除的用户',
+			type: 'warning'
+		})
+		return
+	}else{
 		deleteMode.value = DeleteMode.BATCH_DELETE
 		showDeleteDialog.value = true
+	}
 }
 const handleSelectionChange = (data: any) => {
 	let array = []
@@ -97,8 +104,6 @@ const handleSelectionChange = (data: any) => {
 		array.push(data[i].id)
 	}
 	userIds.value = array
-	console.log(userIds.value);
-	
 }
 
 const openAddUserDialog = () => {