Merge remote-tracking branch 'origin/master'

src/views/basic/product/udiinfoExport.vue

@@ -22,7 +22,8 @@
       <el-divider style="margin: 15px"></el-divider>
 
 
-        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
+                highlight-current-row>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
         <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
@@ -157,13 +158,10 @@ export default {
       this.udiImportDetailVisible = true;
     },
     downloadExcel(row) {
-
-            axios.get("./config.json").then(res => {
-                let baseUrl = res.data.BASE_URL;
-                let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
+      let url = process.env.VUE_APP_BASE_API + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
       let a = document.createElement("a");
       var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
-                fetch(href)
+      fetch(url)
         .then((res) => res.blob())
         .then((blob) => {
           a.href = URL.createObjectURL(blob);
@@ -173,10 +171,6 @@ export default {
           a.click();
           this.getList();
         });
-
-            });
-
-
     },
 
     cancelDialog(val) {