项目管理新增第二步bug

（发现梳理新增组件变成页面组件）

src/api/discover/index.js

+import request from '@/utils/request'
+
+/**
+ * 发现梳理列表
+ * @param {*} query 
+ * @returns 
+ */
+export function queryDiscoverList(data) {
+  return request({
+    url: '/core/tdatadiscovery/query',
+    method: 'post',
+    data: data
+  })
+}
+
+export function querybyprojectid(data) {
+  return request({
+    url: '/core/searchregex/querybyprojectid',
+    method: 'post',
+    data: data
+  })
+}
+
+export function querydatasystem(data) {
+  return request({
+    url: '/core/searchsensitivedata/querydatasystem',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+
+// export function checkProjectNum(data) {
+//   return request({
+//     url: '/core/tdataproject/checkProjectNum',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function getdatascopeprojectlist(data) {
+//   return request({
+//     url: '/core/datascopeproject/getdatascopeprojectlist',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function checkDatasystemName(data) {
+//   return request({
+//     url: '/core/tdataproject/checkDatasystemName',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function checkDatasystem(data) {
+//   return request({
+//     url: '/core/tdataproject/checkDatasystem',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+
+// export function queryByEditSort(data) {
+//   return request({
+//     url: '/core/tdatasource/queryByEditSort',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function selectProDataSource(data) {
+//   return request({
+//     url: '/core/tdatasource/selectProDataSource',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function queryShemas(data) {
+//   return request({
+//     url: '/core/searchsensitivedata/queryShemas',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function getAllDataAreaAndRule(data) {
+//   return request({
+//     url: '/core/tdataarea/getAllDataAreaAndRule',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function addDataProject(data) {
+//   return request({
+//     url: '/core/tdataproject/addDataProject',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function deleteDataProject(data) {
+//   return request({
+//     url: '/core/tdataproject/deleteDataProject',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function getDataProjectDetail(data) {
+//   return request({
+//     url: '/core/tdataproject/getDataProjectDetail',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function updateDataProject(data) {
+//   return request({
+//     url: '/core/tdataproject/updateDataProject',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function showProxyInfo(data) {
+//   return request({
+//     url: '/core/encryptionconfig/showProxyInfo',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function saveProxyJarInfo(data) {
+//   return request({
+//     url: '/core/encryptionconfig/saveProxyJarInfo',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function getProjectTree(data) {
+//   return request({
+//     url: '/core/encryptionconfig/getProjectTree',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+
+// export function getEncryptExcel(data) {
+//   return request({
+//       url: '/core/encryptionconfig/getEncryptExcel',
+//       method: 'post',
+//       data: data,
+//       responseType: 'blob' //
+//     })
+// }
+// export function checkEncryptExcel(data) {
+//   return request({
+//     url: '/core/encryptionconfig/checkEncryptExcel',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// export function exportToExcel(data) {
+//   return request({
+//     url: '/core/encryptionconfig/exportToExcel',
+//     method: 'post',
+//     data: data,
+//     responseType: 'blob' //
+//   })
+// }
+
+// export function tdatasourceQuery(data) {
+//   return request({
+//     url: '/core/tdatasource/query',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function queryShemasmodifysubsettask(data) {
+//   return request({
+//     url: '/core/modifysubsettask/queryShemas',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// export function rowsensitivelevelType(type,data) {
+//   return request({
+//     url: '/core/rowsensitivelevel/' + type,
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+
+
+

src/views/discover/Discover/QueryForm.vue

@@ -34,7 +34,7 @@ function onSearch() {
 
 // 重置
 function onReset(formRef: FormInstance) {
-  queryForm.value.title = ''
+  queryForm.value.taskname = ''
 
   emit('reset', formRef)
 }
@@ -48,9 +48,9 @@ function onReset(formRef: FormInstance) {
     :model="queryForm"
     @search="onSearch"
     @reset="onReset">
-    <el-form-item label="发现任务名称" prop="title">
+    <el-form-item label="发现任务名称" prop="taskname">
       <el-input
-        v-model="queryForm.title"
+        v-model="queryForm.taskname"
         placeholder="请输入发现任务名称"
         clearable
       />

src/views/discover/Discover/index.vue

 <script setup lang="ts" name="projectManageIndex">
 import { ref } from 'vue'
 import list from './list.vue'
+import addEditDiscovery from './addEditDiscovery.vue'
 import discoverProcess from './discoverProcess.vue'
 import discoverResult from './discoverResult.vue'
 import discoverHistory from './discoverHistory.vue'
 
 const widget = {
   list: list,
+  addEditDiscovery: addEditDiscovery,
   discoverProcess: discoverProcess,
   discoverResult: discoverResult,
   discoverHistory: discoverHistory

src/views/discover/Discover/list.vue

 <script setup name="ProjectManageList">
-import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
+import { getCurrentInstance, reactive, ref, toRefs,onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 import { useRouter } from 'vue-router'
@@ -8,9 +8,16 @@ import usePermissionStore from '@/store/modules/permission'
 import { changeRoute } from '@/utils/switchRoute'
 
 import QueryForm from './QueryForm.vue'
-import AddDiscoveryDialog from './modules/AddDiscoveryDialog.vue' // 引入新增发现任务弹窗
+// import AddDiscoveryDialog from './modules/AddDiscoveryDialog.vue' // 引入新增发现任务弹窗
 import SmartDiscoveryDialog from './modules/SmartDiscoveryDialog.vue'
 
+
+import { 
+  queryDiscoverList
+
+} from '@/api/discover/index'
+
+
 const appStore = useAppStore()
 const permissionStore = usePermissionStore()
 const router = useRouter()
@@ -20,6 +27,10 @@ const { proxy } = getCurrentInstance()
 // 新增发现任务弹窗引用
 const addDiscoveryDialogRef = ref()
 
+onMounted(()=>{
+  handleQuery()
+})
+
 function onReset(formQuery) {
   console.log('onReset')
   formQuery.resetFields()
@@ -38,48 +49,73 @@ function handleQuery() {
 }
 // 表格数据
 const tableData = ref([
-  {
-    id: 1,
-    taskName: '22',
-    result: '0/225',
-    dbType: 'MYSQL',
-    operator: 'admin',
-    createTime: '2025-08-21 16:55:30',
-    updateTime: '2025-08-21 16:55:30',
-    remark: '',
-    projectid: "ec132fb8-04f0-4c0f-8460-c2a0ac4015d5",
-    resultid: "R_1755845361051",
-    datasystemid: "ff80818198986db40198c5933e5902e7",
-  },
-  {
-    id: 2,
-    taskName: '小王',
-    result: '2/225',
-    dbType: 'MYSQL',
-    operator: 'admin',
-    createTime: '2025-08-21 16:55:30',
-    updateTime: '2025-08-21 16:55:30',
-    remark: ''
-  }
+  // {
+  //   id: 1,
+  //   taskName: '22',
+  //   result: '0/225',
+  //   dbType: 'MYSQL',
+  //   operator: 'admin',
+  //   createTime: '2025-08-21 16:55:30',
+  //   updateTime: '2025-08-21 16:55:30',
+  //   remark: '',
+  //   projectid: "ec132fb8-04f0-4c0f-8460-c2a0ac4015d5",
+  //   resultid: "R_1755845361051",
+  //   datasystemid: "ff80818198986db40198c5933e5902e7",
+  // },
+  // {
+  //   id: 2,
+  //   taskName: '小王',
+  //   result: '2/225',
+  //   dbType: 'MYSQL',
+  //   operator: 'admin',
+  //   createTime: '2025-08-21 16:55:30',
+  //   updateTime: '2025-08-21 16:55:30',
+  //   remark: ''
+  // }
 ])
 const data = reactive({
   queryParams: {
-    pageNum: 1,
-    pageSize: 8
+    pageno: 1,
+    pagesize: 10,
+    project: sessionStorage.getItem('projectName') || '',
+    projectid: sessionStorage.getItem('projectId') || ''
   }
 })
 
 // 表格数据
 const { queryParams } = toRefs(data)
-const total = ref(3)
+const total = ref(0)
 const loading = ref(false)
 
 // 查询列表
 function getList() {
   loading.value = true
-  setTimeout(() => {
+  queryDiscoverList(queryParams.value).then(res=>{
+    console.log(res)
+    if(res.flag){
+      tableData.value = res.data.list.map(item => ({
+        ...item,
+          id: item.id,
+          taskName: item.tname,
+          result: item.countResult,
+          dbType: item.dbtype,
+          operator: item.username,
+          createTime: item.createtime,
+          updateTime: item.updatetime,
+          remark: item.note
+      }))
+      loading.value = false
+    }else{
+      tableData.value = []
       loading.value = false
-  }, 3000)
+      ElMessage.error(res.msg)
+    }
+  }).catch((err) => {
+    tableData.value = []
+    loading.value = false
+    console.log(err)
+    ElMessage.error(res.msg)
+  })
 }
 
 function pageProjectManage() {
@@ -95,7 +131,8 @@ function pageProjectManage() {
  */
 function handleAdd(){
 console.log('新增发现任务')
-  addDiscoveryDialogRef.value.openDialog()
+  // addDiscoveryDialogRef.value.openDialog()
+  emit('page', 'addEditDiscovery', { listItem: null, addEditType: 'add'})
 }
 // 操作处理函数
 const handleEdit = (row) => {
@@ -381,7 +418,7 @@ const handleAddEditConfirm = (submitData, isEditMode) =>{
     </div>
     
     <!-- 新增/编辑发现任务弹窗 -->
-    <AddDiscoveryDialog ref="addDiscoveryDialogRef" @confirm="handleAddEditConfirm" />
+    <!-- <AddDiscoveryDialog ref="addDiscoveryDialogRef" @confirm="handleAddEditConfirm" /> -->
     <SmartDiscoveryDialog
       v-model="smartDiscoveryDialogVisible"
       ref="smartDiscoveryDialogRef"

src/views/project/Project/list.vue

@@ -208,6 +208,7 @@ const handleEnterProject = (project) => {
   console.log('进入项目:', project)
   changeRoute()
   sessionStorage.setItem('projectId',project.id)
+  sessionStorage.setItem('projectName',project.project)
   router.push({ path:'/indexManage/ItemManage',query: { projectId: project.id } })