菜单，上传文件添加提示-提交

src/views/vent/performance/fileDetail/commen/fileSystem.vue

@@ -57,19 +57,21 @@
   }
   // 删除
   const onDeltet = (node) => {
+    console.log(node,'shanchu')
     const pid = node.pid;
-    if (pid) {
+    if (pid && !node.children) {
       const parent = findParent(pid, props.list);
       parent.splice(
         parent.findIndex((item) => item.id == node.id),
         1
       );
-    } else {
-      props.list.splice(
-        props.list.findIndex((item) => item.id == node.id),
-        1
-      );
-    }
+    } 
+    // else {
+    //   props.list.splice(
+    //     props.list.findIndex((item) => item.id == node.id),
+    //     1
+    //   );
+    // }
 
     emit('deleteNode', {
       ...node,

src/views/vent/performance/fileDetail/index.vue

@@ -30,8 +30,9 @@
         </div>
         <div class="list">
           <!-- <div class="bd-t"></div> -->
-          <NormalTable v-if="alive" :selfParam="selfParam" :searchParam="fileName" :nodeParam="nodeParam" :columns="columns" :list="getTree"
-            :deleteById="deleteById" :downLoad="downLoad" designScope="file-detail" title="文件详情" />
+          <NormalTable v-if="alive" :selfParam="selfParam" :searchParam="fileName" :nodeParam="nodeParam"
+            :columns="columns" :list="getTree" :deleteById="deleteById" :downLoad="downLoad" designScope="file-detail"
+            title="文件详情" />
           <!-- <div class="bd-b"></div> -->
         </div>
       </div>
@@ -65,16 +66,16 @@ import fileSystem from './commen/fileSystem.vue';
 import icon from './commen/Icon/index.vue';
 import { SvgIcon } from '/@/components/Icon';
 import treeIcon from './commen/Icon/treeIcon.vue';
-import { ref, onMounted, reactive, nextTick,watch } from 'vue';
+import { ref, onMounted, reactive, nextTick, watch } from 'vue';
 import NormalTable from '../comment/NormalTable.vue';
 import { columns } from './fileDetail.data';
 import { getTree, createFile, editMenu, delMenu, uploadApi, downLoad, deleteById } from './fileDetail.api';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
-let selfParam=reactive({//各矿参数
-  sysOrgCode:'',
-  bpmStatus:null,
-  flag:false
+let selfParam = reactive({//各矿参数
+  sysOrgCode: '',
+  bpmStatus: null,
+  flag: false
 })
 let router = useRouter(); //路由
 const { createMessage } = useMessage();
@@ -157,8 +158,8 @@ let list2trees = (data) => {
 let getTreeList = async () => {
   listArr.length = 0;
   let data = await getTree({ parentId: '' });
-  let list = list2trees(data.records);
-  console.log(list, 'list');
+  let datas = data.records.filter(v => v.fileType == null)
+  let list = list2trees(datas);
   listArr.push(...list);
   console.log(listArr, '树节点数据');
   selected.id = listArr[0].id
@@ -187,7 +188,6 @@ const onClick = (node) => {
 // };
 //添加文件
 let onAddNode = async (node) => {
-  console.log('新增111', node);
   let data = await createFile({ fileName: node.newName, type: 'FOL', parentId: node.id });
   console.log(data, '新增文件返回');
   getTreeList();
@@ -209,6 +209,8 @@ const onDeltet = (node) => {
   console.log(node, '删除菜单');
   if (node.pid == 'root') {
     createMessage.warning('根节点不能被删除!');
+  }else if(node.children){
+    createMessage.warning('该节点无法被删除,请先删除该节点下的子节点!');
   } else {
     delMenu({ id: node.id }).then((res) => {
       console.log(res, '删除文件');
@@ -228,13 +230,19 @@ let onSearch = () => {
 let beforeUpload = (file) => {
   console.log(file, '选中文件');
   fileList.length = 0;
-  fileList.push(file)
-  const formData = new FormData();
-  formData.append('file', file);
-  formData.append('parentId', selected.id);
-  formData.append('isApprove', formState.isApprove);
-  formData.append('fileType', formState.fileType);
-  startUpload.value = formData
+  let index = file.name.indexOf('.')
+  let name = file.name.substring(index + 1)
+  if (name == 'png' || name=='jpg' || name=='gif' || name=='psd' || name=='webp') {
+    createMessage.warning('禁止上传图片类型的文件!');
+  } else {
+    const formData = new FormData();
+    formData.append('file', file);
+    formData.append('parentId', selected.id);
+    formData.append('isApprove', formState.isApprove);
+    formData.append('fileType', formState.fileType);
+    startUpload.value = formData
+    fileList.push(file)
+  }
 };
 // 文件移除
 let handleRemove = (file) => {
@@ -243,12 +251,12 @@ let handleRemove = (file) => {
   newFileList.splice(index, 1);
   fileList = newFileList;
 };
-watch(()=>router.currentRoute.value,(val)=>{
-  console.log('各矿传参',val)
-  selfParam.bpmStatus=val.query.bpmStatus
-  selfParam.sysOrgCode=val.query.sysOrgCode
-  selfParam.flag=val.query.flag
-},{immediate:true})
+watch(() => router.currentRoute.value, (val) => {
+  console.log('各矿传参', val)
+  selfParam.bpmStatus = val.query.bpmStatus
+  selfParam.sysOrgCode = val.query.sysOrgCode
+  selfParam.flag = val.query.flag
+}, { immediate: true })
 onMounted(() => {
   getTreeList();
 });
@@ -386,7 +394,8 @@ onMounted(() => {
 ::v-deep .zxm-upload-list-item-name:hover {
   color: #000;
 }
-::v-deep .zxm-form-item-control-input{
+
+::v-deep .zxm-form-item-control-input {
   width: 90%;
 }
 </style>

src/views/vent/performance/fileIndex/index.vue

@@ -68,7 +68,7 @@ let getToggle = (ind,item) => {
  
   console.log(homeParam,'home0000000000')
    router.push({
-    path:'/fileManager/fileDetail',
+    path:'/fileManager/fileDetail/home',
     query:{sysOrgCode:homeParam.sysOrgCode,bpmStatus:homeParam.bpmStatus,flag:homeParam.flag}
   });
 };