Merge branch 'qhse_file' of shuzhihua/pms-iot-vue into master

src/api/pms/qhse/index.ts

@@ -705,6 +705,11 @@ export const DataLibraryApi = {
     return await request.download({ url: `/rq/qhse-info/export-excel`, params })
   },
 
+  // 获得资料库目录分页
+  getFileTreeList: async () => {
+    return await request.get({ url: `/rq/qhse-file-tree/simple-list` })
+  },
+
   // 新增目录
   createFileTree: async (data) => {
     return await request.post({ url: `/rq/qhse-file-tree/create`, data })
@@ -717,5 +722,9 @@ export const DataLibraryApi = {
   // 删除目录
   deleteFileTree: async (id: number) => {
     return await request.delete({ url: `/rq/qhse-file-tree/delete?id=` + id })
+  },
+
+  getParentIds: async (params: any) => {
+    return await request.get({ url: `/rq/qhse-file-tree/ids/` + params })
   }
 }

src/views/pms/qhse/data/PmsTree.vue

@@ -2,8 +2,7 @@
 import { ElTree } from 'element-plus'
 import { CaretLeft, CaretRight, Search } from '@element-plus/icons-vue'
 import type { IotTreeVO } from '@/api/system/tree'
-import { IotTreeApi } from '@/api/system/tree'
-// import { DataLibraryApi } from '@/api/pms/qhse/index'
+import { DataLibraryApi } from '@/api/pms/qhse/index'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { CommonStatusEnum } from '@/utils/constants'
 
@@ -94,7 +93,9 @@ const handleMenuClick = async (action) => {
       // 删除的二次确认
       await message.delConfirm()
       // 假设存在删除接口
-      await IotTreeApi.deleteIotTree(nodeInfo.value.id)
+
+      await DataLibraryApi.deleteFileTree(nodeInfo.value.id)
+
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getTreeInfo()
@@ -119,9 +120,10 @@ const submitForm = async () => {
     formData.value.type = 'file'
     if (formType.value === 'create') {
       formData.value.parentId = parentId.value
-      await IotTreeApi.createIotTree(formData.value)
+
+      await DataLibraryApi.createFileTree(formData.value)
     } else {
-      await IotTreeApi.updateIotTree(formData.value)
+      await DataLibraryApi.updateFileTree(formData.value)
     }
     message.success(t(formType.value === 'create' ? '添加成功' : '修改成功'))
     dialogVisible.value = false
@@ -229,8 +231,7 @@ const locateNode = (targetId: number | string) => {
 }
 
 const getTreeInfo = async () => {
-  // const res = await DataLibraryApi.getFileTree()
-  const res = await IotTreeApi.getSimpleTreeList()
+  const res = await DataLibraryApi.getFileTreeList()
   treeList.value = filterDeviceNodes(handleTree(res) as TreeNode[])
   expandedKeys.value = treeList.value.map((node) => node.id)
 
@@ -327,11 +328,17 @@ onBeforeUnmount(() => {
                 class="custom-menu"
                 :style="{ left: menuX + 'px', top: menuY + 'px' }">
                 <ul>
-                  <li @click="handleMenuClick('add')">新建目录</li>
+                  <li @click="handleMenuClick('add')" class="flex items-center gap-1">
+                    <Icon icon="ep:plus" /> 新建目录</li
+                  >
 
-                  <li @click="handleMenuClick('edit')">编辑</li>
+                  <li @click="handleMenuClick('edit')" class="flex items-center gap-1">
+                    <Icon icon="ep:edit" />编辑目录</li
+                  >
 
-                  <li @click="handleMenuClick('delete')">删除目录</li>
+                  <li @click="handleMenuClick('delete')" class="flex items-center gap-1"
+                    ><Icon icon="ep:delete" />删除目录</li
+                  >
                 </ul>
               </div>
             </el-scrollbar>

src/views/pms/qhse/data/index.vue

@@ -47,7 +47,11 @@
           <el-button @click="resetQuery">
             <Icon icon="ep:refresh" class="mr-5px" />{{ t('file.reset') }}
           </el-button>
-          <el-button type="primary" :loading="uploadLoading" @click="openForm('create')">
+          <el-button
+            type="primary"
+            :loading="uploadLoading"
+            v-hasPermi="['rq:qhse-info:create']"
+            @click="openForm('create')">
             <Icon icon="ep:plus" class="mr-5px" />{{ t('file.upload') }}
           </el-button>
         </div>
@@ -163,9 +167,9 @@
               <el-button
                 type="primary"
                 v-if="scope.row.fileType !== 'content'"
+                v-hasPermi="['rq:qhse-info:download']"
                 link
-                @click="handleDownload(scope.row.filePath)"
-                v-hasPermi="['rq:iot-info:download']">
+                @click="handleDownload(scope.row.filePath)">
                 <Icon icon="ep:download" />{{ t('file.dow') }}
               </el-button>
               <el-button
@@ -173,7 +177,7 @@
                 v-if="scope.row.fileType !== 'content'"
                 link
                 @click="deleteInfo(scope.row.id)"
-                v-hasPermi="['rq:iot-info:download']">
+                v-hasPermi="['rq:qhse-info:delete']">
                 <Icon icon="ep:delete" />{{ t('file.delete') }}
               </el-button>
             </div>
@@ -201,7 +205,7 @@ import { Base64 } from 'js-base64'
 import PmsTree from './PmsTree.vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { IotInfoClassifyApi } from '@/api/pms/info'
-import { IotTreeApi } from '@/api/system/tree'
+// import { IotTreeApi } from '@/api/system/tree'
 defineOptions({ name: 'IotTree' })
 
 type TreeKey = number | string
@@ -399,7 +403,7 @@ const inContent = async (row: FileRow) => {
 // 文件树节点点击事件
 const handleFileNodeClick = async (row: FileRow) => {
   queryParams.filename = ''
-  const parentItems = await IotTreeApi.getParentIds(row.id)
+  const parentItems = await DataLibraryApi.DataLibraryApi.getParentIds(row.id)
   breadcrumbs.value = []
   parentItems.forEach((item) => {
     breadcrumbs.value.push({ id: item.id, name: item.name, type: 'root' })