Home Explore Help
Register Sign In
hrx
/
mky-vent-5
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新

lxh 1 year ago
parent
079db74473
commit
883f46c044
6 changed files with 146 additions and 163 deletions
Split View Show Diff Stats
  1. 0 57
      public/fileEdit.html
  2. 6 2
      src/utils/http/axios/index.ts
  3. 57 42
      src/views/vent/performance/comment/DeviceModal.vue
  4. 49 43
      src/views/vent/performance/comment/NormalTable.vue
  5. 1 1
      src/views/vent/performance/fileDetail/fileDetail.api.ts
  6. 33 18
      src/views/vent/performance/fileDetail/index.vue

+ 0 - 57
public/fileEdit.html
View File 

@@ -1,57 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<head>
 
-    <meta charset="UTF-8">
 
-    <title th:text="文件管理"></title>
 
-</head>
 
-<body>
 
-
 
-<div id="fileEdit"></div>
 
-<!--// 页面引入document的api.js-->
 
-<script type="text/javascript" src="http://47.94.222.6:9050/web-apps/apps/api/documents/api.js"></script>
 
-<script>
 
-
 
-    //office文件在线编辑、预览
 
-    new DocsAPI.DocEditor("fileEdit", // 元素id
 
-        {
 
-            type: "desktop",
 
-            width: "100%",
 
-            height: "1000px",
 
-            document: {
 
-                title: "文档管理",
 
-                url: "http://192.168.187.1:9999/ventanaly-sharefile/fileServer/onlyOffice/read?id=[[${id}]]",//id表示文件id，后端接口用这个id来加载文件
 
-                fileType:"docx",//当文件类型为doc、xls、ppt时，对应用docx、xlsx、pptx否则会保存异常。
 
-                key: "",
 
-                lang: "zh-CN",
 
-                permissions: {
 
-                    "download": true,//是否可下载
 
-                    "edit": true,
 
-                    "fillForms": true,
 
-                    "print": true,//是否可打印
 
-                }
 
-            },
 
-            editorConfig: {
 
-                "lang": "zh-CN",
 
-                mode: "edit",//view：只读且可复制内容，edit：可编辑
 
-                "callbackUrl": "http://192.168.187.1:9999/ventanaly-sharefile/fileServer/onlyOffice/save?id=[[${id}]]",//id表示文件id，后端接口用这个id来加载文件
 
-                "coEditing": {
 
-                    "mode": "fast",
 
-                    "change": true
 
-                },
 
-                "customization": {
 
-                    "toolbarNoTabs": true,
 
-                    "autosave": false,//是否自动保存
 
-                    "forcesave": true,//定义保存按钮是否显示
 
-                    "hideRightMenu": true,
 
-                },
 
-                //用户信息
 
-                "user": {
 
-                    "id": "857857", //用户ID
 
-                    "name": "小陈" //用户名称
 
-                }
 
-            }
 
-        });
 
-
 
-</script>
 
-</body>
 
-</html>

+ 6 - 2
src/utils/http/axios/index.ts
View File 

@@ -49,6 +49,7 @@ const transform: AxiosTransform = {
 
       throw new Error(t('sys.api.apiRequestFailed'));
 
     }
 
     //  这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
 
+
 
     const { code, result, message, success } = data;
 
     // 这里逻辑可以根据项目进行修改
 
     const hasSuccess = data && Reflect.has(data, 'code') && (code === ResultEnum.SUCCESS || code === 200);
 
@@ -58,6 +59,10 @@ const transform: AxiosTransform = {
 
         createMessage.success(message);
 
       }
 
       return result;
 
+    } else if (data) {
 
+      //lxh
 
+      console.log(data, '000000000000000');
 
+      return result;
 
     }
 
 
     // 在此处根据自己项目的实际情况对不同的code执行不同的操作
 
@@ -163,7 +168,7 @@ const transform: AxiosTransform = {
 
 
       // ========================================================================================
 
       // update-begin--author:sunjianlei---date:20220624--for: 添加低代码应用ID
 
-      let routeParams = router.currentRoute.value ? router.currentRoute.value.params : router.currentRoute.params;
 
+      const routeParams = router.currentRoute.value ? router.currentRoute.value.params : router.currentRoute.params;
 
       if (routeParams.appId) {
 
         config.headers[ConfigEnum.X_LOW_APP_ID] = routeParams.appId;
 
         // lowApp自定义筛选条件
 
@@ -174,7 +179,6 @@ const transform: AxiosTransform = {
 
       }
 
       // update-end--author:sunjianlei---date:20220624--for: 添加低代码应用ID
 
       // ========================================================================================
 
-
 
     }
 
     return config;
 
   },

+ 57 - 42
src/views/vent/performance/comment/DeviceModal.vue
View File 

@@ -17,10 +17,27 @@
 
 <script lang="ts" setup>
 
   import { computed, unref, inject, reactive } from 'vue';
 
   import { BasicModal, useModalInner } from '/@/components/Modal';
 
-import { onMounted } from 'vue';
 
+  import { onMounted } from 'vue';
 
+  import { useUserStore } from '/@/store/modules/user';
 
   // import FormModal from './FormModal.vue';
 
   // 声明Emits
 
   // const emit = defineEmits(['saveOrUpdate', 'register']);
 
+
 
+  let props = defineProps({
 
+    fileType: {
 
+      type: String,
 
+      default: '',
 
+    },
 
+    editID: {
 
+      type: Number,
 
+      default: 0,
 
+    },
 
+  });
 
+  const userStore = useUserStore(); //获取用户信息
 
+  let userId = unref(userStore.getUserInfo).id;
 
+  let userName = unref(userStore.getUserInfo).username;
 
+  console.log(userId, '用户id');
 
+  console.log(userName, '用户名');
 
   const isUpdate = inject('isUpdate');
 
   const record = reactive({ strtype: '', strname: '' });
 
 
@@ -29,48 +46,48 @@ import { onMounted } from 'vue';
 
     //重置表单
 
     setModalProps({ confirmLoading: false });
 
     Object.assign(record, data.record);
 
-    
-
 
 
-    new DocsAPI.DocEditor("fileEdit", // 元素id
 
-    {
 
-      type: "desktop",
 
-      width: "100%",
 
-      height: "1000px",
 
-      document: {
 
-        title: "文档管理",
 
-        url: "http://192.168.187.1:9999/ventanaly-sharefile/fileServer/onlyOffice/read?id=[[${id}]]",//id表示文件id，后端接口用这个id来加载文件
 
-        fileType: "docx",//当文件类型为doc、xls、ppt时，对应用docx、xlsx、pptx否则会保存异常。
 
-        key: "",
 
-        lang: "zh-CN",
 
-        permissions: {
 
-          "download": true,//是否可下载
 
-          "edit": true,
 
-          "fillForms": true,
 
-          "print": true,//是否可打印
 
-        }
 
-      },
 
-      editorConfig: {
 
-        "lang": "zh-CN",
 
-        mode: "edit",//view：只读且可复制内容，edit：可编辑
 
-        "callbackUrl": "http://192.168.187.1:9999/ventanaly-sharefile/fileServer/onlyOffice/save?id=[[${id}]]",//id表示文件id，后端接口用这个id来加载文件
 
-        "coEditing": {
 
-          "mode": "fast",
 
-          "change": true
 
+    new DocsAPI.DocEditor(
 
+      'fileEdit', // 元素id
 
+      {
 
+        type: 'desktop',
 
+        width: '100%',
 
+        height: '500px',
 
+        document: {
 
+          title: '文档管理',
 
+          url: 'http://47.94.222.6:9050/ventanaly-sharefile/fileServer/onlyOffice/read?id=' + [[props.editID]], //id表示文件id，后端接口用这个id来加载文件
 
+          fileType: props.fileType == 'doc' ? 'docx' : props.fileType == 'xls' ? 'xlsx' : props.fileType == 'ppt' ? 'pptx' : props.fileType, //当文件类型为doc、xls、ppt时，对应用docx、xlsx、pptx否则会保存异常。
 
+          key: '',
 
+          lang: 'zh-CN',
 
+          permissions: {
 
+            download: true, //是否可下载
 
+            edit: true,
 
+            fillForms: true,
 
+            print: true, //是否可打印
 
+          },
 
         },
 
-        "customization": {
 
-          "toolbarNoTabs": true,
 
-          "autosave": false,//是否自动保存
 
-          "forcesave": true,//定义保存按钮是否显示
 
-          "hideRightMenu": true,
 
+        editorConfig: {
 
+          lang: 'zh-CN',
 
+          mode: 'edit', //view：只读且可复制内容，edit：可编辑
 
+          callbackUrl: 'http://47.94.222.6:9050/ventanaly-sharefile/fileServer/onlyOffice/read?id=' + [[props.editID]], //id表示文件id，后端接口用这个id来加载文件
 
+          coEditing: {
 
+            mode: 'fast',
 
+            change: true,
 
+          },
 
+          customization: {
 
+            toolbarNoTabs: true,
 
+            autosave: false, //是否自动保存
 
+            forcesave: true, //定义保存按钮是否显示
 
+            hideRightMenu: true,
 
+          },
 
+          //用户信息
 
+          user: {
 
+            id: userId, //用户ID
 
+            name: userName, //用户名称
 
+          },
 
         },
 
-        //用户信息
 
-        "user": {
 
-          "id": "857857", //用户ID
 
-          "name": "小陈" //用户名称
 
-        }
 
       }
 
-    });
 
+    );
 
   });
 
 
   //设置标题
 
@@ -92,9 +109,7 @@ import { onMounted } from 'vue';
 
     // !unref(isUpdate) ? `新增（${record.strname || record.systemname}）` : `编辑（${record.strname || record.systemname}）`
 
   );
 
 
-  onMounted(() => {
 
-    
-  })
 
+  onMounted(() => {});
 
 </script>
 
 
 <style scoped lang="less">

+ 49 - 43
src/views/vent/performance/comment/NormalTable.vue
View File 

@@ -1,9 +1,6 @@
 
 <template>
 
-  <div style="height: 100%">
 
+  <div>
 
     <BasicTable @register="registerTable">
 
-      <!-- <template #tableTitle>
 
-        <a-button preIcon="ant-design:plus-outlined" type="primary" @click="handleAdd">新增</a-button>
 
-      </template> -->
 
       <template #action="{ record }">
 
         <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" />
 
       </template>
 
@@ -11,7 +8,7 @@
 
         <slot name="filterCell" v-bind="{ column, record }"></slot>
 
       </template>
 
     </BasicTable>
 
-    <DeviceModal @register="registerModal" @saveOrUpdate="saveOrUpdateHandler" :deviceType="deviceType" />
 
+    <DeviceModal :editID="editID" :fileType="fileType" @register="registerModal" />
 
   </div>
 
 </template>
 
 
@@ -46,15 +43,15 @@
 
       // required: true,
 
       default: () => [],
 
     },
 
-    searchFormSchema: {
 
-      type: Array,
 
-      required: true,
 
-      default: () => [],
 
-    },
 
-    formSchema: {
 
-      type: Array,
 
-      required: true,
 
-    },
 
+    // searchFormSchema: {
 
+    //   type: Array,
 
+    //   required: true,
 
+    //   default: () => [],
 
+    // },
 
+    // formSchema: {
 
+    //   type: Array,
 
+    //   required: true,
 
+    // },
 
     list: {
 
       type: Function,
 
       required: true,
 
@@ -69,10 +66,10 @@
 
       type: Function,
 
       required: true,
 
     },
 
-    saveOrUpdate: {
 
-      type: Function,
 
-      required: true,
 
-    },
 
+    // saveOrUpdate: {
 
+    //   type: Function,
 
+    //   required: true,
 
+    // },
 
     pointList: {
 
       type: Function,
 
       // required: true,
 
@@ -83,18 +80,20 @@
 
     title: {
 
       type: String,
 
     },
 
-    deviceType: {
 
-      type: String,
 
-    },
 
+    // deviceType: {
 
+    //   type: String,
 
+    // },
 
   });
 
+  let fileType = ref(''); //文件类型
 
+  let editID = ref(0); //文件ID
 
 
   const isUpdate = ref(false);
 
   const record = reactive({});
 
 
-  provide('formSchema', props.formSchema);
 
+  // provide('formSchema', props.formSchema);
 
   provide('isUpdate', isUpdate);
 
   provide('formData', record);
 
-  provide('deviceType', props.deviceType);
 
+  // provide('deviceType', props.deviceType);
 
   // const glob = useGlobSetting();
 
   const [registerModal, { openModal, closeModal }] = useModal();
 
 
@@ -129,7 +128,7 @@
 
         width: 300,
 
       },
 
       useSearchForm: false, //不使用查询条件
 
-      pagination: false, //不使用分页组件
 
+      // pagination: false, //不使用分页组件
 
       beforeFetch: (params) => {
 
         params.parentId = props.nodeParam.id ? props.nodeParam.id : '';
 
         params.selectFlag = props.nodeParam.id ? false : true;
 
@@ -143,26 +142,26 @@
 
   //注册table数据
 
   const [registerTable, { reload }, { selectedRowKeys }] = tableContext;
 
 
-  const saveOrUpdateHandler = async (params) => {
 
-    try {
 
-      await props.saveOrUpdate(params, isUpdate.value);
 
-      closeModal();
 
-      await doRequest(props.list, { confirm: false });
 
-    } catch (error) {
 
-      message.error('保存失败，请联系管理员');
 
-    }
 
-  };
 
+  // const saveOrUpdateHandler = async (params) => {
 
+  //   try {
 
+  //     await props.saveOrUpdate(params, isUpdate.value);
 
+  //     closeModal();
 
+  //     await doRequest(props.list, { confirm: false });
 
+  //   } catch (error) {
 
+  //     message.error('保存失败，请联系管理员');
 
+  //   }
 
+  // };
 
 
-  /**
 
-   * 新增事件
 
-   */
 
-  function handleAdd() {
 
-    for (let key in record) {
 
-      delete record[key];
 
-    }
 
-    isUpdate.value = false;
 
-    openModal(true);
 
-  }
 
+  // /**
 
+  //  * 新增事件
 
+  //  */
 
+  // function handleAdd() {
 
+  //   for (let key in record) {
 
+  //     delete record[key];
 
+  //   }
 
+  //   isUpdate.value = false;
 
+  //   openModal(true);
 
+  // }
 
 
   /**
 
    * 编辑事件
 
@@ -170,6 +169,12 @@
 
   function handleEdit(data) {
 
     isUpdate.value = true;
 
     Object.assign(record, toRaw(data));
 
+    console.log(record, '编辑');
 
+    let index = record.fileSuffix.indexOf('.');
 
+    fileType.value = record.fileSuffix.substring(index + 1);
 
+    editID.value = record.id;
 
+    console.log(fileType, '文件格式');
 
+    console.log(editID.value, '编辑文件ID');
 
     openModal(true, {
 
       record,
 
     });
 
@@ -186,6 +191,7 @@
 
   function handleDownLoad(record) {
 
     console.log(record, '下载');
 
     props.downLoad({ id: record.id }).then((res) => {
 
+      console.log('11111');
 
       console.log(res, '文件下载成功');
 
       let filename = `${record.fileName}`;
 
       downFilePublic(res, filename);

+ 1 - 1
src/views/vent/performance/fileDetail/fileDetail.api.ts
View File 

@@ -66,7 +66,7 @@ export const delMenu = (params) => defHttp.delete({ url: Api.delMenu + params.id
 
  * 下载文件接口
 
  * @param params
 
  */
 
-export const downLoad = (params) => defHttp.post({ url: Api.downLoad, params });
 
+export const downLoad = (params) => defHttp.post({ url: Api.downLoad, params, responseType: 'blob' });
 
 
 // /**
 
 //  * 设备类型查询接口

+ 33 - 18
src/views/vent/performance/fileDetail/index.vue
View File 

@@ -31,7 +31,6 @@
 
         <div class="search">
 
           <a-input v-model:value="fileName" placeholder="请输入文件名称" />
 
           <a-button type="primary" preIcon="ant-design:search-outlined" @click="onSearch">查询</a-button>
 
-          <!-- <a-button type="primary" style="float: right; right: 15px" preIcon="ant-design:cloud-upload-outlined">文件上传</a-button> -->
 
           <a-upload :before-upload="beforeUpload" :remove="handleRemove" :multiple="false" :file-list="fileList">
 
             <a-button type="primary" preIcon="ant-design:cloud-upload-outlined">文件上传</a-button>
 
           </a-upload>
 
@@ -44,12 +43,10 @@
 
             :nodeParam="nodeParam"
 
             :columns="columns"
 
             :list="getTree"
 
-            :formSchema="formSchema"
 
             :deleteById="deleteById"
 
             :downLoad="downLoad"
 
             designScope="file-detail"
 
             title="文件详情"
 
-            :showTab="false"
 
           />
 
           <div class="bd-b"></div>
 
         </div>
 
@@ -58,16 +55,18 @@
 
   </div>
 
 </template>
 
 <script lang="ts" setup name="system-user">
 
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   import fileSystem from './commen/fileSystem.vue';
 
   import icon from './commen/Icon/index.vue';
 
   import treeIcon from './commen/Icon/treeIcon.vue';
 
-  import { ref, onMounted, reactive, provide, nextTick } from 'vue';
 
+  import { ref, onMounted, reactive, nextTick } from 'vue';
 
   import NormalTable from '../comment/NormalTable.vue';
 
-  import { columns, formSchema } from './fileDetail.data';
 
+  import { columns } from './fileDetail.data';
 
   import { getTree, createFile, editMenu, delMenu, uploadApi, downLoad, deleteById } from './fileDetail.api';
 
   components: {
 
     fileSystem;
 
   }
 
+  const { createMessage } = useMessage();
 
   let fileName = ref('');
 
   let fileList = reactive<any[]>([]); //上传文件列表
 
   // let uploadParam = reactive({}); //上传文件参数
 
@@ -87,10 +86,9 @@
 
 
   //递归遍历左侧菜单数据
 
   let list2tree = (list) => {
 
-    let flag = false;
 
     list.forEach((child) => {
 
       const pid = child.parentId;
 
-      if (pid && pid !== 'root') {
 
+      if (pid) {
 
         list.forEach((parent) => {
 
           if (parent.id === pid) {
 
             parent.children = parent.children || [];
 
@@ -100,20 +98,32 @@
 
             parent.children.push({ id: child.id, isFolder: true, title: child.fileName, pid: child.parentId });
 
           }
 
         });
 
-      } else if (pid == 'root') {
 
-        flag = true;
 
-        child.isFolder = true;
 
-        child.title = child.fileName;
 
-        child.pid = child.parentId;
 
       }
 
     });
 
-
 
-    return flag ? list : list.filter((n) => !n.parentId);
 
+    console.log(list, '999999999');
 
+    return list.filter((n) => n.parentId == 'root');
 
+  };
 
+  let list2trees = () => {
 
+    let arr = [
 
+      { id: 0, name: 1, parentId: 'root' },
 
+      { id: 1, name: 1, parentId: 0 },
 
+      { id: 2, name: 1, parentId: 0 },
 
+      { id: 3, name: 1, parentId: 2 },
 
+      { id: 4, name: 1, parentId: 2 },
 
+      { id: 5, name: 1, parentId: 3 },
 
+      { id: 6, name: 1, parentId: 3 },
 
+      { id: 7, name: 1, parentId: 5 },
 
+      { id: 8, name: 1, parentId: 5 },
 
+      { id: 9, name: 1, parentId: 7 },
 
+      { id: 10, name: 1, parentId: 7 },
 
+    ];
 
   };
 
   //获取左侧菜单树数据
 
   let getTreeList = async () => {
 
+    listArr.length = 0;
 
     let data = await getTree({ parentId: '' });
 
     let list = list2tree(data.records);
 
+    console.log(list, 'list');
 
     listArr.push(...list);
 
     console.log(listArr, '树节点数据');
 
   };
 
@@ -154,10 +164,14 @@
 
   // 删除
 
   const onDeltet = (node) => {
 
     console.log(node, '删除菜单');
 
-    delMenu({ id: node.id }).then((res) => {
 
-      console.log(res, '删除文件');
 
-      getTreeList();
 
-    });
 
+    if (node.pid == 'root') {
 
+      createMessage.warning('根节点不能被删除!');
 
+    } else {
 
+      delMenu({ id: node.id }).then((res) => {
 
+        console.log(res, '删除文件');
 
+        getTreeList();
 
+      });
 
+    }
 
   };
 
   //查询列表
 
   let onSearch = () => {
 
@@ -194,6 +208,7 @@
 
 
   onMounted(() => {
 
     getTreeList();
 
+    list2trees();
 
   });
 
 </script>