Merge branch 'master' of https://code.palacesun.com/wuchao/nse-ui

src/router/index.js

@@ -93,12 +93,12 @@ export const constantRoutes = [
     component: () => import('@/views/ruleConfig/Dictionary/index'),
     hidden: true
   },
-  {
-    // 项目管理
-    path: '/projectManage',
-    component: () => import('@/views/projectManage/index'),
-    hidden: true
-  },
+  // {
+  //   // 项目管理
+  //   path: '/projectManage',
+  //   component: () => import('@/views/projectManage/index'),
+  //   hidden: true
+  // },
   // {
   //   // 项目首页
   //   path: '/projectHome',

src/views/discover/Discover/discoverProcess.vue

@@ -17,7 +17,7 @@ const emit = defineEmits(['page'])
 const { proxy } = getCurrentInstance()
 
 const props = defineProps({
-  discoverProcessData: {
+  listItem: {
     type: Object,
     default: () => ({})
   }

src/views/discover/Discover/discoverResult.vue

@@ -17,7 +17,7 @@ const emit = defineEmits(['page'])
 const { proxy } = getCurrentInstance()
 
 const props = defineProps({
-  discoverProcessData: {
+  listItem: {
     type: Object,
     default: () => ({})
   }

src/views/discover/Discover/index.vue

@@ -3,11 +3,13 @@ import { ref } from 'vue'
 import list from './list.vue'
 import discoverProcess from './discoverProcess.vue'
 import discoverResult from './discoverResult.vue'
+import discoverHistory from './discoverHistory.vue'
 
 const widget = {
   list: list,
   discoverProcess: discoverProcess,
-  discoverResult: discoverResult
+  discoverResult: discoverResult,
+  discoverHistory: discoverHistory
 }
 
 const page = ref('list')

src/views/discover/Discover/list.vue

@@ -107,7 +107,7 @@ const handleEdit = (row) => {
 const handleDiscover = (row) => {
   console.log('发现:', row)
   ElMessage.success(`开始发现任务: ${row.taskName}`)
-    emit('page', 'discoverProcess', { discoverProcessData: row})
+    emit('page', 'discoverProcess', { listItem: row})
   // router.push({
   //   path: '/user/discoverProcess',
   //   query: {
@@ -124,7 +124,7 @@ const handleDiscover = (row) => {
 const handleMonitor = (row) => {
   console.log('监控:', row)
   ElMessage.warning(`监控任务: ${row.taskName}`)
-    emit('page', 'discoverProcess', { discoverProcessData: row})
+    emit('page', 'discoverProcess', { listItem: row})
 }
 const smartDiscoveryDialogRef = ref()
 const smartData = ref(null)
@@ -137,6 +137,8 @@ const handleMoreCommand = (command, row) => {
       break
     case 'viewHistory':
       ElMessage.info(`查看历史: ${row.taskName}`)
+      emit('page','discoverHistory',{listItem:row})
+      
       break
     case 'viewResult':
       ElMessage.info(`查看结果: ${row.taskName}`)
@@ -168,7 +170,7 @@ const handleSmartDiscover = (row) => {
 }
 const disCoverSmart = (val) => {
   console.log(val) 
-   emit('page', 'discoverProcess', { discoverProcessData: smartData.value})
+   emit('page', 'discoverProcess', { listItem: smartData.value})
 }
 
 const handleAddEditConfirm = (submitData, isEditMode) =>{

src/views/login.vue

@@ -145,7 +145,7 @@ function handleLogin() {
             appStore.setallNav(menus)
             console.log('appStore.nav',appStore.allnavList)
             // console.log('menus',filterMenus)
-
+            appStore.setNavStatus({type: appStore.navStatus.type || 'manage'})
             // permissionStore.allsidebarRouters(menus)
 
             permissionStore.setSidebarRouters(filterMenus)