ZaiZai vor 1 Jahr
Ursprung
Commit
f693a88256
4 geänderte Dateien mit 10 neuen und 11 gelöschten Zeilen
  1. 1 1
      package.json
  2. 0 1
      src/api/modules/project/project.js
  3. 5 5
      src/views/project/admin/list.vue
  4. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -19,7 +19,7 @@
         "dayjs": "^1.11.11",
         "echarts": "^5.5.0",
         "element-plus": "2.7.2",
-        "hc-vue3-ui": "^3.8.9",
+        "hc-vue3-ui": "^3.9.0",
         "js-base64": "^3.7.7",
         "js-fast-way": "0.4.9",
         "js-md5": "^0.8.3",

+ 0 - 1
src/api/modules/project/project.js

@@ -64,7 +64,6 @@ export default {
             url: '/api/blade-attach/project/import-temp',
             method: 'post',
             params: {},
-            responseType: 'blob',
         }, false)
     },
     //导出

+ 5 - 5
src/views/project/admin/list.vue

@@ -88,7 +88,7 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import HcTableList from '../modules/project-list.vue'
-import { arrToId, getArrValue, newDownBlob } from 'js-fast-way'
+import { arrToId, getArrValue, isNullES, newWindow } from 'js-fast-way'
 import { getDictionaryData } from '~src/utils/tools'
 import mainApi from '~api/project/project'
 import { useClick } from 'hc-vue3-ui'
@@ -245,13 +245,13 @@ const downloadTemplateLoading = ref(false)
 const downloadTemplate = async () => {
     await useClick() //这里要使用 await 来等待
     downloadTemplateLoading.value = true
-    const { error, val } = await mainApi.exportTemplate()
+    const { error, data, msg } = await mainApi.exportTemplate()
     downloadTemplateLoading.value = false
-    if (error) {
-        window.$message?.error('数据异常')
+    if (error && isNullES(data)) {
+        window.$message?.error(msg ?? '数据异常')
         return
     }
-    await newDownBlob(val)
+    newWindow(data)
 }
 
 //上传完成

+ 4 - 4
yarn.lock

@@ -2089,10 +2089,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^3.8.9:
-  version "3.8.9"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.8.9.tgz#14f0966a7a482f8d26325c8754d18d215522ae07"
-  integrity sha512-OX4BnxfMRtaw/V9psWQw7gZVUorUhPe/h32jTbwBJeIvI2eHUsJE5Pw2NmDZNvVU8UrAsbUPn14/7LlDzbqf2w==
+hc-vue3-ui@^3.9.0:
+  version "3.9.0"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.9.0.tgz#81a10f666e7738770213c803767ad3fcba255d5d"
+  integrity sha512-eEKD78YudFCsbyeDDJzXAJ4KRErEWZGge6+S8nm0ofwnpk3SCpw4k1HTbiV4qMVw/qYPzs/Q9AUZ1KVC496LbQ==
   dependencies:
     axios "^1.6.8"
     dayjs "^1.11.11"