duy 2 месяцев назад
Родитель
Сommit
6000157622

+ 2 - 2
package.json

@@ -12,7 +12,8 @@
     "dependencies": {
         "@electron-toolkit/preload": "^3.0.1",
         "@electron-toolkit/utils": "^3.0.0",
-        "@electron/remote": "^2.1.2"
+        "@electron/remote": "^2.1.2",
+        "hc-vue3-ui": "^4.5.8"
     },
     "devDependencies": {
         "@electron-toolkit/eslint-config": "^1.0.1",
@@ -37,7 +38,6 @@
         "eslint": "^8.57.0",
         "eslint-plugin-vue": "^9.22.0",
         "fs-extra": "^11.2.0",
-        "hc-vue3-ui": "^4.5.7",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.6",
         "js-md5": "^0.8.3",

+ 9 - 7
src/renderer/src/api/modules/project/project.js

@@ -59,13 +59,7 @@ export default {
         }, false)
     },
     //下载模板
-    async exportTemplate() {
-        return HcApi({
-            url: '/api/blade-attach/project/import-temp',
-            method: 'post',
-            params: {},
-        }, false)
-    },
+
     //导出
     async exportWorkfocus(ids) {
         return HcApi({
@@ -92,6 +86,14 @@ export default {
             responseType: 'blob',
         }, false)
     },
+    async exportTemplate(form) {
+        return HcApi({
+            url: '/api/blade-attach/project/import-temp',
+            method: 'get',
+            params: form,
+            responseType: 'blob',
+        }, false)
+    },
     //获取年份
     async getAllYear() {
         return HcApi({

+ 14 - 8
src/renderer/src/views/project/admin/list.vue

@@ -256,11 +256,10 @@ const saveReportsClick = async () => {
     const isForm = await formValidate(reportsFormRef.value)
     if (!isForm) return false
     reportsLoding.value = true
-    const { error, val, msg } = await mainApi.buildReport(reportsForm.value)
-   
+    const { error, val } = await mainApi.buildReport(reportsForm.value)
+    if (error) {
         reportsLoding.value = false
         window.$message?.error('数据异常')
-       
         return
     }
     await newDownBlob(val)
@@ -296,13 +295,20 @@ const downloadTemplateLoading = ref(false)
 const downloadTemplate = async () => {
     await useClick() //这里要使用 await 来等待
     downloadTemplateLoading.value = true
-    const { error, data, msg } = await mainApi.exportTemplate()
-    downloadTemplateLoading.value = false
-    if (error && isNullES(data)) {
-        window.$message?.error(msg ?? '数据异常')
+    // const { error, data, msg } = await mainApi.exportTemplate()
+    // downloadTemplateLoading.value = false
+    // if (error && isNullES(data)) {
+    //     window.$message?.error(msg ?? '数据异常')
+    //     return
+    // }
+    // await window.electron.ipcRenderer.invoke('download-file', data)
+    const { error, val } = await mainApi.exportTemplate()
+    if (error) {
+        downloadTemplateLoading.value = false
+        window.$message?.error('数据异常')
         return
     }
-    await window.electron.ipcRenderer.invoke('download-file', data)
+    await newDownBlob(val)
     downloadTemplateLoading.value = false
 }
 

+ 7 - 7
yarn.lock

@@ -3042,10 +3042,10 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^4.5.7:
-  version "4.5.7"
-  resolved "http://219.151.181.73:9000/hc-vue3-ui/-/hc-vue3-ui-4.5.7.tgz#c5753882a3f3b367aac597c70c2c5f215a0ef982"
-  integrity sha512-jQvE7mnBvDphI6H9E3cAyrsVBh1m5rLYnPOyzDN+F6wNR7dIiO+AZ6FMGB7xWETYgFu5UWM9G9CtY7pBC8aA6A==
+hc-vue3-ui@^4.5.8:
+  version "4.5.8"
+  resolved "http://219.151.181.73:9000/hc-vue3-ui/-/hc-vue3-ui-4.5.8.tgz#4c6bb2078b4b55ac08de3be815ff2df93a626a35"
+  integrity sha512-ogK9G1HH5PT+QDwuJzs4gbWH6e0PbKGxQVgjftKlmY/HK+6uPosX5iQ5lQxQUiXT0LSVmtnuJ9tbbOmCAH8Trg==
   dependencies:
     axios "^1.7.7"
     dayjs "^1.11.13"
@@ -4134,9 +4134,9 @@ smart-buffer@^4.0.2:
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
 sortablejs@^1.15.3:
-  version "1.15.3"
-  resolved "http://219.151.181.73:9000/sortablejs/-/sortablejs-1.15.3.tgz#033668db5ebfb11167d1249ab88e748f27959e29"
-  integrity sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==
+  version "1.15.6"
+  resolved "http://219.151.181.73:9000/sortablejs/-/sortablejs-1.15.6.tgz#ff93699493f5b8ab8d828f933227b4988df1d393"
+  integrity sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==
 
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
   version "1.0.2"