Browse Source

修改下载

a1140836302 2 years ago
parent
commit
48fcd877ee

+ 26 - 0
src/api/log.js

@@ -72,3 +72,29 @@ export function deleteExportData(id) {
     data
   })
 }
+//导出结果
+export function RecordFile(Fileurl,fileName){
+  return request({
+    url: Fileurl,
+    method: 'get',
+    responseType: 'blob',
+  }).then(data=>{
+    console.log("RecordFile then", data)
+    if (!data) return alert('文件下载失败');
+    // let fileName = '统计表计';
+    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+        // window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx');
+        window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName);
+    } else {
+        let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }));
+        let link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.setAttribute('download', fileName);
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link); //下载完成移除元素
+        window.URL.revokeObjectURL(url); //释放掉blob对象
+    }
+  })
+}

+ 6 - 4
src/views/manage-log/data-export.vue

@@ -54,7 +54,7 @@
                         <template slot-scope="scope">
                             <span v-if="scope.row.exportStatus === 0">
                                 <el-button type="primary" class="handle" size="small"
-                                @click="handleDownFile(scope.row.exportFilePath)">下载</el-button>
+                                @click="handleDownFile(scope.row.exportFilePath,scope.row.exportName)">下载</el-button>
                             </span>
                             <span v-if="scope.row.exportStatus !== 2">
                                 <el-button type="primary" class="handle" size="small"
@@ -77,7 +77,7 @@
 
 <script>
 import "./log.scss";
-import { exportList,deleteExportData } from "@/api/log";
+import { exportList,deleteExportData,RecordFile } from "@/api/log";
 export default {
     name: "DataExport",
     components: {},
@@ -228,8 +228,10 @@ export default {
             .catch(err => { console.error(err) })
         },
         //下载文件
-        handleDownFile(url){
-            window.location.href=url
+        async handleDownFile(url,fileName){
+            //window.location.href=url
+            const fileDownName=fileName+'_'+(new Date().getTime())
+            const resUrl=await RecordFile(url, fileDownName)
         }
     },
 };

+ 4 - 4
src/views/power-change-monitoring/components/ProcessSymbol.vue

@@ -48,22 +48,22 @@ export default {
   margin-top: 12px;
 }
 .process {
-  flex: 1;
   width: 100%;
   position: relative;
   display: flex;
   flex-direction: column;
+  flex-wrap: wrap;
+  align-content: flex-start;
 }
 .top {
   display: flex;
-  flex-direction: row;
+  width: 100%;
+  height: 24px;
 }
 .bottom {
   display: flex;
-  flex-direction: row;
 }
 .top-1 {
-  flex: 1;
   border-top: 24px solid rgb(17, 24, 40);
   border-left: 24px solid transparent;
 }