duy 2 долоо хоног өмнө
parent
commit
5f737aba9e

+ 3 - 3
src/api/modules/archiveFile/scanning.js

@@ -55,15 +55,15 @@ export default {
         return HcApi({
             url: '/api/blade-archive/scanFile/addScanFolder',
             method: 'post',
-            data: form,
+            params: form,
         }, msg)
     },
      //删除节点
     async deleteScanFolder(form, msg = true) {
         return HcApi({
             url: '/api/blade-archive/scanFile/deleteScanFolder',
-            method: 'post',
-            data: form,
+            method: 'get',
+            params: form,
         }, msg)
     },
 }

+ 17 - 11
src/views/file/MenuItem.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- 如果有子节点,渲染为子菜单 -->
+    <!-- 子菜单 -->
     <ElSubMenu 
         v-if="menuItemData.hasChildren && menuItemData.childs && menuItemData.childs.length"
         :index="menuItemData.id.toString()"
@@ -20,11 +20,11 @@
         </template>
         <!-- 递归渲染子节点 -->
         <template v-for="child in menuItemData.childs" :key="child.id">
-            <menu-item :menu-item-data="child" />
+            <menu-item :menu-item-data="child" @menu-tap="(item, data) => emit('menu-tap', item, data)" />
         </template>
     </ElSubMenu>
-  
-    <!-- 如果没有子节点,渲染为菜单项 -->
+
+    <!-- 菜单项 -->
     <ElMenuItem 
         v-else
         :index="menuItemData.id.toString()"
@@ -33,15 +33,18 @@
         <span>{{ menuItemData.folderName }}</span>
         <HcIcon 
             name="apps" 
-            ui="text-2xl"
+            ui="text-xl"
             class="menu-action-icon"
             @click.stop="handleIconClick($event, menuItemData)"
         />
     </ElMenuItem>
 
-    
-    <!-- 右键菜单 -->
-    <hc-context-menu ref="contextMenuRef" :datas="menuData" @item-click="handleMenuSelect" />
+    <!-- 每个 menu-item 独立拥有自己的右键菜单 -->
+    <hc-context-menu 
+        ref="contextMenuRef" 
+        :datas="menuData" 
+        @item-click="handleMenuSelect" 
+    />
 </template>
 
 <script setup>
@@ -68,7 +71,8 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['menuTap']) ;const selectedKeyPath = ref(props.selectedKeyPath || []) // 传入的选中路径
+const emit = defineEmits(['menu-tap']) 
+const selectedKeyPath = ref(props.selectedKeyPath || []) // 传入的选中路径
 watch(() => props.selectedKeyPath, (newVal) => {
     selectedKeyPath.value = newVal || []
 }, { immediate: true })
@@ -88,6 +92,7 @@ const curItem = ref(null)
 // 处理图标点击显示右键菜单(传递当前menuItemData)
 const handleIconClick = (event, data) => {
 
+
     curItem.value = data
 
     event.preventDefault()
@@ -95,9 +100,10 @@ const handleIconClick = (event, data) => {
 }
 // 菜单被点击时输出当前menuItemData
 const handleMenuSelect = (item) => {
+
  
 
-    emit('menuTap', item, curItem.value )
+    emit('menu-tap', item, curItem.value )
 }
 </script>
 
@@ -117,7 +123,7 @@ const handleMenuSelect = (item) => {
     cursor: pointer;
     transition: opacity 0.3s ease;
     position: absolute;
-    right: 16px;
+    right: 42px;
 }
 
 .el-sub-menu__title:hover .menu-action-icon,

+ 24 - 33
src/views/file/scan.vue

@@ -650,9 +650,13 @@ const addClick = ()=>{
 }
 const curItem = ref(null)
 const menuClick = (item, cur)=>{
-
+  console.log(item, 'item111111')
     curItem.value = cur
     const { key } = item
+  
+    
+    console.log(key === 'del-node', key === 'del-node')
+    
     if (key === 'add-node') {
         addModal.value = true
     } else if (key === 'del-node') {
@@ -702,16 +706,18 @@ const addRules = ref({
 
 //删除节点
 const delModalClick = () => {
+    console.log('删除节点')
+    
     HcDelMsg(async (resolve) => {
-        await removeContractTreeNode(false)
+        await removeContractTreeNode()
         resolve() //关闭弹窗的回调
     })
 }
 
 const removeContractTreeNode = async () => {
-       const { error, code, msg } = await scanApi.removeArchiveFile({
-        ids: curItem.value.id,
-    }, false)
+       const { error, code, msg } = await scanApi.deleteScanFolder({
+        id: curItem.value.id,
+    })
     //判断状态
   
     if (!error && code === 200) {
@@ -765,34 +771,19 @@ const uploadFileClick = () => {
 const uploadsChange = (fileId, item)=>{
        if (getObjVal(item)) {
         let newArr = tableUploadData.value
-        const sheet = sheetType.value, source = sheetSourceType.value
-        let name = item['originalName'] || ''
-        let fileName = name.substring(0, name.lastIndexOf('.'))
-        newArr.push({
-            fileUploadId: fileId,
-            projectId: projectId.value,
-            contractId: contractId.value,
-            nodeId: nodeIds.value,
-            fileNumber: '',
-            fileName: fileName,
-            ossFileName: item?.name || '',
-            fileTime: null,
-            fileUrl: item?.link || '',
-            sheetType: sheet.length > 0 ? sheet[0]['dictKey'] || '' : '',
-            sheetSource: source.length > 0 ? source[0]['dictKey'] || '' : '',
-            drawingNo: '',
-            citeChangeNumber: '',
-            isApproval: 1,
-            isNeedCertification: 1,
-            dutyUser: dutyUser.value,
-            pdfFileUrl: item?.pdfUrl || '',
-            filePage: item?.page || '',
-            isElement: 0,
-            isUpdateUrl: 0,
-            fileSize: item?.fileSize,
-        })
-        //tableUploadData.value = newArr
-        tableUploadData.value = arrKeySort(newArr, 'fileUploadId')
+        console.log(newArr, 'newArr')
+        const newObj = {
+            fileName: item['originalName'] || '',
+            fileSize:item['fileSize'] || '',
+            fileDate:item['fileDate'] || '',
+            ossUrl:item['link'],
+
+        }
+
+       console.log(fileId, 'fileId')
+       console.log(item, 'item')
+       
+       
     } else {
         console.log(item)
     }