From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platform/src/components/common/ImportWindow.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/platform/src/components/common/ImportWindow.vue b/platform/src/components/common/ImportWindow.vue
index 45f714e..8e05ddb 100644
--- a/platform/src/components/common/ImportWindow.vue
+++ b/platform/src/components/common/ImportWindow.vue
@@ -102,7 +102,7 @@
*/
confirm () {
if (this.form.file == null) {
- this.$message.warning('璇烽�夋嫨鏂囦欢')
+ this.$tip.warning('璇烽�夋嫨鏂囦欢')
return
}
this.isWorking = true
@@ -114,12 +114,12 @@
}
})
.then(() => {
- this.$message.success('瀵煎叆鎴愬姛')
+ this.$tip.success('瀵煎叆鎴愬姛')
this.visible = false
this.$emit('success')
})
.catch(e => {
- this.$message.error(e)
+ this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
@@ -137,11 +137,10 @@
downloadTemplate () {
const link = document.createElement('a')
link.setAttribute('download', this.templateName) //涓嬭浇鐨勬枃浠跺悕
- // console.log(`window.location.origin`, window.location.origin);
- // console.log(`process.env.VUE_APP_CONTEXT_PATH`, process.env.VUE_APP_CONTEXT_PATH);
- // console.log(`this.templatePath`, this.templatePath);
+ console.log(`${window.location.origin}${process.env.VUE_APP_CONTEXT_PATH}${this.templatePath}`);
link.href = `${window.location.origin}${process.env.VUE_APP_CONTEXT_PATH}${this.templatePath}` //鏂囦欢url
link.click()
+ // this.$emit('download')
},
/**
* 鏂囦欢涓婁紶鍓嶅瓨鍌ㄤ笂浼犵殑鏂囦欢
--
Gitblit v1.9.3