diff --git a/src/components/upload.vue b/src/components/upload.vue index 8a7c0c4..3c5f1d4 100644 --- a/src/components/upload.vue +++ b/src/components/upload.vue @@ -78,7 +78,7 @@ export default { upSuccess(res) { if (res && res.status == 0 ) { this.$message.success("上传成功"); - this.$emit("upSuccess"); + this.$emit("upSuccess",res); } else { this.$message.error(res.info); } diff --git a/src/utils/index.js b/src/utils/index.js index 482bd76..aef5fe3 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,5 +1,6 @@ // import CryptoJS from "crypto-js" import { JSEncrypt } from "jsencrypt"; +import service from "@/api/axios"; const encryptKey = "WfJTKO9S4eLkrPz2JKrAnzdb"; const encryptIV = "D076D35C"; diff --git a/src/views/device/index.vue b/src/views/device/index.vue index 2961eca..3ac0235 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -493,7 +493,7 @@ import pieChart from "@/components/charts/pieChart"; import scatterChart from "@/components/charts/scatterChart"; import _ from "lodash"; -import { downloadFile, formatClass, formatGradeNameClass } from "@/utils"; +import { downloadFile, getBlob, formatGradeNameClass } from "@/utils"; import api from "@/api/apis/apis"; import BusEvent from "@/utils/busEvent"; export default { @@ -642,8 +642,15 @@ export default { }); }, methods: { - upSuccess() { + upSuccess(res) { //导入成功 + this.$message.closeAll(); + this.$message({ + showClose: true, + message: `成功(${res.data.success}) 失败(${res.data.error})`, + type: "success", + duration:5000 + }); this.diaUp = false; this.page = 1; this._QueryData(); @@ -788,11 +795,9 @@ export default { id: this.id, }); if (status == 0) { - const a = document.createElement("a"); - a.href = data.downloadUrl; - document.body.appendChild(a); - a.click(); - a.remove(); + getBlob(data.downloadUrl).then((res) => { + downloadFile("基站模版", res); + }); } else { this.$message.error(info); } diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue index feafb8e..08c5908 100644 --- a/src/views/setUp/student.vue +++ b/src/views/setUp/student.vue @@ -229,7 +229,7 @@