页面修改

src/components/tradePavilion/brandManagement.vue

@@ -4,7 +4,8 @@
       <span>品牌列表</span>
       <div style="display: flex; flex-direction: row; align-items: center" v-if="!readonly">
         <el-button type="primary" class="el-button--small" @click="addTopic">新增</el-button>
-        <el-button class="el-button--small" @click="dialogVisible = true" style="float: right" type="primary">批量导出
+        <el-button class="el-button--small" @click="dialogVisible = true,checkAll=false" style="float: right"
+          type="primary">批量导出
         </el-button>
       </div>
     </div>
@@ -195,8 +196,10 @@
         <div style="text-align: right; margin-top: 20px">
           <el-button size="small" type="primary" @click="downloadBrandFile">导出</el-button>
         </div>
+
       </div>
     </el-dialog>
+    <a id="downloadLink" href="" download="品牌信息.xls" style="display:none">下载 Excel 文件</a>
   </div>
 </template>
 <script>
@@ -305,7 +308,7 @@
           msg.Id = 0;
         }
         this.downLoadLoading = true;
-        this.loadingText = "正在下载品牌文件,请勿关闭或刷新页面...";
+        this.loadingText = "正在生成品牌文件,请勿关闭或刷新页面...";
         var that = this;
         this.download_timer = setInterval(function () {
           that.checkFile(msg)
@@ -333,8 +336,17 @@
                 fileUrl: fileUrl,
                 filepath: filepath,
               };
-              that.GetLocalFile(
-                "/api/Trade/GetFile", params, "品牌信息.xls", null,
+
+              // that.downLoadLoading = false;
+              // that.loadingText = "";
+              // that.dialogVisible = false;
+              // var newUrl = that.domainManager().DomainUrl + fileUrl;
+              // var linkObj = document.getElementById("downloadLink");
+              // linkObj.href = newUrl;
+              // linkObj.setAttribute("download", "品牌信息.xls");
+              // linkObj.click();
+
+              that.GetLocalFile("/api/Trade/GetFile", params, "品牌信息.xls", null,
                 () => {
                   that.downLoadLoading = false;
                   that.loadingText = "";

src/main.js

@@ -27,7 +27,9 @@ Vue.commonUtils = Vue.prototype.$commonUtils = commonUtils
 
 Vue.config.productionTip = false
 Vue.http = Vue.prototype.$http = axios
-axios.defaults.timeout = 60000;
+//axios.defaults.timeout = 60000;
+axios.defaults.timeout=300000;//5分钟 
+
 Vue.prototype.$echarts = echarts
 
 Vue.use(ajaxPlug)