From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/log/index.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index 1814ab5..1e2d8fc 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -79,9 +79,10 @@
<el-table-column type="selection" min-width="5"> </el-table-column>
<el-table-column
prop="createTime"
- sortable
label="鏃ュ織鏃堕棿"
min-width="10"
+ :sort-orders="['descending','ascending']"
+ sortable="custom"
>
<template slot-scope="scope">
<span>{{ changeTime(scope.row.createTime) }}</span>
@@ -146,6 +147,7 @@
</div>
</template>
<script>
+import {getNowDate} from '@/utils/helper'
import helper from "@/utils/mydate";
import { parseTime } from "@/utils/index";
import { createNamespacedHelpers } from "vuex";
@@ -197,17 +199,21 @@
},
// 瀵煎嚭鏃ュ織
async handleExport() {
- const { currentPage, pageSize, context, operationType } = this;
+ const { currentPage, pageSize, context, operationType, mysort, mytime } =
+ this;
+ console.log(mytime);
let arr = await this.exportLogs({
content: context,
current: currentPage,
+ endTime: mytime[1] !== "" ? parseTime(mytime[1]) : "",
+ id: "",
+ operationType: operationType === "鍏ㄩ儴" ? "" : operationType,
+ portEquipment: "",
size: pageSize,
+ startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
+ sort: mysort,
});
- let fileName = arr.headers["content-disposition"];
- console.log(fileName);
- if (fileName) {
- fileName = fileName.slice(fileName.indexOf("filename=") + 9);
- }
+ let fileName = getNowDate(new Date());
const blob = new Blob([arr.data], {
type: "application/octet-stream",
});
@@ -217,7 +223,7 @@
const href = window.URL.createObjectURL(blob);
downloadElement.href = href;
// // 涓嬭浇鍚庢枃浠跺悕
- downloadElement.download = fileName;
+ downloadElement.download = fileName + '鏃ュ織鏁版嵁.xlsx';
document.body.appendChild(downloadElement);
// 鐐瑰嚮涓嬭浇
downloadElement.click();
@@ -225,6 +231,7 @@
document.body.removeChild(downloadElement);
// 閲婃斁鎺塨lob瀵硅薄
window.URL.revokeObjectURL(href);
+ this.setTableData();
},
// 璁剧疆鎿嶄綔绫诲瀷
async setOperationType() {
--
Gitblit v1.8.0