ZaiZai 2 роки тому
батько
коміт
0f5171aa39
4 змінених файлів з 16 додано та 35 видалено
  1. 2 2
      package.json
  2. 1 1
      public/version.json
  3. 5 24
      src/views/file/records.vue
  4. 8 8
      yarn.lock

+ 2 - 2
package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.9",
         "echarts": "^5.4.2",
         "element-plus": "^2.3.8",
-        "hc-vue3-ui": "^1.7.7",
+        "hc-vue3-ui": "^1.7.8",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.2.5",
@@ -48,6 +48,6 @@
         "postcss": "^8.4.27",
         "sass": "^1.64.1",
         "tailwindcss": "3.3.3",
-        "vite": "^4.4.6"
+        "vite": "^4.4.7"
     }
 }

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20230725102302"
+  "value": "20230726095855"
 }

+ 5 - 24
src/views/file/records.vue

@@ -301,13 +301,12 @@ import { nextTick, onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 import HcTree from '~src/components/tree/hc-tree.vue'
 import { delMessage, rowsToId } from '~uti/tools'
-import { arrKeySort, deepClone, downloadBlob, getArrValue, getObjVal } from 'js-fast-way'
 import { getTokenHeader } from '~src/api/request/header'
 import archiveFileApi from '~api/archiveFile/archiveFileAuto.js'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import tasksApi from '~api/tasks/data'
 import ossApi from '~api/oss'
-
+import { arrKeySort, deepClone, downloadBlob, getArrValue, getObjVal } from 'js-fast-way'
 
 //变量
 const useAppState = useAppStore()
@@ -353,11 +352,12 @@ const splitDate = (val)=>{
 }
 //打开文件选择框
 const uploadFileClick = () => {
+    HcUploadFileRef?.value?.cancelUpload()
     HcUploadFileRef?.value.selectFile()
 }
 
 // 文件上传进度
-const HcUploadFileProgress = ({ file, status }) => {
+const HcUploadFileProgress = () => {
     uploadsLoading.value = true
 }
 // 文件上传成功的回调
@@ -381,22 +381,6 @@ const treeNodeLoading = () => {
 }
 
 const treePanelLoading = ref(false)
-const panelTreeLoading = () => {
-    treePanelLoading.value = false
-}
-
-//审批状态
-const approvalStatus = ref([
-    { label: '未上报', value: '1' },
-    { label: '待审批', value: '2' },
-    { label: '已审批', value: '3' },
-])
-
-//认证状态
-const certifiedStatus = ref([
-    { label: '已认证', value: '1' },
-    { label: '未认证', value: '2' },
-])
 
 //搜索表单
 const searchForm = ref({
@@ -406,12 +390,10 @@ const searchForm = ref({
 })
 
 //树相关的变量
-const primaryKeyId = ref('')
-const isBuiltDrawing = ref(0)
 const isStorageNode = ref(0)
 const nodeIds = ref('')
 const treeAutoExpandKeys = ref(getStoreValue('wbsTreeExpandKeys') || [])
-const projectTreeClick = ({ node, data, keys, key }) => {
+const projectTreeClick = ({ data, keys }) => {
     setStoreValue('wbsTreeExpandKeys', keys)
     treeAutoExpandKeys.value = keys || []
     nodeIds.value = data.id || ''
@@ -426,10 +408,9 @@ const projectTreeClick = ({ node, data, keys, key }) => {
     getTableData()
 }
 //树菜单被点击
-const ElTreeMenuClick = async ({ key, node, data, keys }) => {
+const ElTreeMenuClick = async ({ keys }) => {
     setStoreValue('wbsTreeExpandKeys', keys)
     treeAutoExpandKeys.value = keys || []
-
 }
 //回车搜索
 const keyUpEvent = (e) => {

+ 8 - 8
yarn.lock

@@ -1288,10 +1288,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^1.7.7:
-  version "1.7.7"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.7.7.tgz#116064a5150f6b562a41d7da1d62652ad785fb62"
-  integrity sha512-Gd5SREXTnr5PM1PqwNZCNtJSdc5WnWO0DiVPznf1/gb3KRBQ7aFMbNO9G4nuDhD42FM+fqhfk+1mbFeKC/j2fQ==
+hc-vue3-ui@^1.7.8:
+  version "1.7.8"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.7.8.tgz#d96ce863b4f285cba742c5ddb33b0bcbfef209be"
+  integrity sha512-6rmAw1JMwdR1cFysFW4MqQDE/jZuwVolOV2XwIiEd/TRno0/vqxAh/a5HJfgd0O22QruNO6zqWdYRDEArNsWnQ==
   dependencies:
     axios "^1.4.0"
     dayjs "^1.11.9"
@@ -2388,10 +2388,10 @@ utrie@^1.0.2:
   dependencies:
     base64-arraybuffer "^1.0.2"
 
-vite@^4.4.6:
-  version "4.4.6"
-  resolved "http://47.110.251.215:9000/vite/-/vite-4.4.6.tgz"
-  integrity sha512-EY6Mm8vJ++S3D4tNAckaZfw3JwG3wa794Vt70M6cNJ6NxT87yhq7EC8Rcap3ahyHdo8AhCmV9PTk+vG1HiYn1A==
+vite@^4.4.7:
+  version "4.4.7"
+  resolved "http://47.110.251.215:9000/vite/-/vite-4.4.7.tgz#71b8a37abaf8d50561aca084dbb77fa342824154"
+  integrity sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.26"