From 87053bc89835da860e8a93a14954043e61a4a551 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 23 Mar 2023 11:37:52 +0800
Subject: [PATCH] 设备状态模版下载更新

---
 public/index.html                   | 10 +---------
 src/api/apis/apis.js                | 10 +++++++++-
 src/api/urls/apis.js                |  4 +++-
 src/views/standard/device/index.vue | 25 +++++++++++--------------
 4 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/public/index.html b/public/index.html
index 069f526..de842a2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,21 +8,13 @@
   <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
   <meta http-equiv="Pragma" content="no-cache" />
   <meta http-equiv="Expires" content="0" />
-  <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
+  <link rel="icon" href="<%= BASE_URL %>331icon.ico">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
 </head>
 
 <body>
-  <script>
-    var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
-    link.type = 'image/x-icon';
-    link.rel = 'shortcut icon';
-    var csCode = localStorage.getItem("csCode") || ""
-    link.href = csCode ? "./331icon.ico" : "./favicon.ico";
-    document.getElementsByTagName('head')[0].appendChild(link);
-  </script>
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>
diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index eaba8fb..8bcc268 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -606,13 +606,21 @@ export default {
       data,
     });
   },
-  //  导入基站模板下载地址
+  //  导入基站模板下载老地址
   stationTemplateUrl() {
     return service({
       url: setUpUrls.stationTemplateUrl,
       method: "POST",
     });
   },
+  //  导入基站模板下载新地址
+  stationTemplate() {
+    return service({
+      url: setUpUrls.stationTemplate,
+      method: "POST",
+      responseType: 'arraybuffer',
+    });
+  },
   //  查询下载配置列表
   appConfigList(data) {
     return service({
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 53fcd1a..97583b7 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -150,8 +150,10 @@ export default {
   updateDevice: "/api_html/school/manager/updateDevice",
   //   新增基站
   addStation: "/api_html/school/manager/addStation",
-  //   导入基站模板下载地址
+  //   导入基站模板下载老地址
   stationTemplateUrl: "/api_html/school/manager/stationTemplateUrl",
+  //   导入基站模板下载新地址
+  stationTemplate: "/api_html/school/manager/stationTemplate",
   //   查询下载配置列表
   appConfigList: "/api_html/school/manager/appConfigList",
   //   查询最新的授课端应用版本
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 4573262..543ebb2 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -15,11 +15,7 @@
             @click="diaUp = true"
           ></el-button>
         </el-tooltip>
-        <el-tooltip
-          effect="dark"
-          content="添加基站"
-          placement="bottom"
-        >
+        <el-tooltip effect="dark" content="添加基站" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-receiving"
@@ -580,7 +576,9 @@ export default {
   },
   created() {
     this.code = localStorage.getItem("csCode") || "";
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     if (this.role == "ROLE_JITUAN") {
       (this.props.lazy = true),
         (this.props.lazyLoad = function (node, resolve) {
@@ -799,17 +797,16 @@ export default {
       }
     },
     async downExcel() {
-      let { data, status, info } = await this.$request.stationTemplateUrl({
+      let data = await this.$request.stationTemplate({
         id: this.id,
       });
-      if (status == 0) {
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`基站模版.xlsx`, blob);
       } else {
-        this.$message.error(info);
+        this.$message.error("下载失败");
       }
     },
 
--
libgit2 0.21.4

