From 82469748e87e514cf46703cd4edc296d4bcb2680 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期一, 12 十二月 2022 18:04:09 +0800
Subject: [PATCH] 图片的新增页面改动
---
src/views/operate/log/index.vue | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index 2b7370d..b9de74f 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -3,35 +3,42 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right">楂樼骇鎼滅储</span>
+ <!-- <span class="nav-right">楂樼骇鎼滅储</span> -->
</div>
<div class="header-content">
<div class="search">
<span>杈撳叆鏌ヨ:</span>
- <el-input placeholder="鍐呭淇℃伅" v-model="context"></el-input>
+
+ <div class="option">
+ <el-input placeholder="鍐呭淇℃伅" v-model="context"></el-input>
+ </div>
</div>
<div class="message-status">
<span>鎿嶄綔绫诲瀷:</span>
- <el-select v-model="operationType">
- <el-option
- v-for="item in operationTypeList"
- :key="item.id"
- :label="item.operationType"
- :value="item.operationType"
- >
- </el-option>
- </el-select>
+ <div class="option">
+ <el-select v-model="operationType">
+ <el-option
+ v-for="item in operationTypeList"
+ :key="item.id"
+ :label="item.operationType"
+ :value="item.operationType"
+ >
+ </el-option>
+ </el-select>
+ </div>
</div>
<div class="message-kind">
<span>鏃堕棿鑼冨洿:</span>
- <el-date-picker
- v-model="mytime"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
- </el-date-picker>
+ <div class="option">
+ <el-date-picker
+ v-model="mytime"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
+ </el-date-picker>
+ </div>
</div>
<div class="find">
<el-button
@@ -63,7 +70,6 @@
<!-- 鏁版嵁灞曠ず -->
<el-table
ref="multipleTable"
- :default-sort="{ prop: 'createTime' }"
:header-cell-style="{
background: '#06122c',
'font-size': '12px',
@@ -80,9 +86,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>
@@ -147,6 +154,7 @@
</div>
</template>
<script>
+import { downloadFile, getNowDate } from "@/utils/helper";
import helper from "@/utils/mydate";
import { parseTime } from "@/utils/index";
import { createNamespacedHelpers } from "vuex";
@@ -170,7 +178,7 @@
label: "鎵归噺鍒犻櫎",
},
],
- mysort: 0,
+ mysort: 1,
tempList: [],
operationType: "鍏ㄩ儴",
operationTypeList: [],
@@ -198,17 +206,20 @@
},
// 瀵煎嚭鏃ュ織
async handleExport() {
- const { currentPage, pageSize, context, operationType } = this;
+ const { currentPage, pageSize, context, operationType, mysort, mytime } =
+ this;
let arr = await this.exportLogs({
content: context,
current: currentPage,
- size: pageSize,
+ endTime: mytime[1] !== "" ? parseTime(mytime[1]) : "",
+ id: "",
+ operationType: operationType === "鍏ㄩ儴" ? "" : operationType,
+ portEquipment: "",
+ size: 50000,
+ 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",
});
@@ -218,7 +229,7 @@
const href = window.URL.createObjectURL(blob);
downloadElement.href = href;
// // 涓嬭浇鍚庢枃浠跺悕
- downloadElement.download = fileName;
+ downloadElement.download = fileName + "鏃ュ織鏁版嵁.xlsx";
document.body.appendChild(downloadElement);
// 鐐瑰嚮涓嬭浇
downloadElement.click();
@@ -226,6 +237,7 @@
document.body.removeChild(downloadElement);
// 閲婃斁鎺塨lob瀵硅薄
window.URL.revokeObjectURL(href);
+ this.setTableData();
},
// 璁剧疆鎿嶄綔绫诲瀷
async setOperationType() {
@@ -278,7 +290,6 @@
async getLogList() {
const { currentPage, pageSize, context, operationType, mysort, mytime } =
this;
- console.log(mytime);
let arr = await this.getLogsList({
content: context,
current: currentPage,
@@ -290,12 +301,10 @@
startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
sort: mysort,
});
- console.log(arr);
return arr.data.data;
},
// 鎵归噺涓嬫媺妗嗘搷浣�
async selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
this.preMyIdx = list;
if (list === 3) {
@@ -338,12 +347,9 @@
message: res.message,
});
}
- console.log(res);
});
})
- .catch((err) => {
- console.log(err);
- });
+ .catch((err) => {});
},
// 琛ㄦ牸鐩戝惉
tableChange(list) {
@@ -405,9 +411,7 @@
.then((_) => {
done();
})
- .catch((err) => {
- console.log(err);
- });
+ .catch((err) => {});
},
// 鑷畾涔夊叧闂脊绐�
closeDialog({ flag, index }) {
@@ -416,9 +420,7 @@
}
},
//
- timechange(data) {
- console.log(data);
- },
+ timechange(data) {},
},
};
</script>
@@ -444,16 +446,19 @@
padding: 0 40px;
display: flex;
line-height: 100px;
- justify-content: space-between;
+ // justify-content: space-between;
align-items: center;
-
+ span {
+ min-width: 120px;
+ padding-left: 15px;
+ }
.search,
.message-status,
.message-kind {
display: flex;
justify-content: flex-start;
align-items: center;
- flex: 1;
+ // flex: 1;
.el-input {
flex: 1;
color: #1d3f57;
@@ -473,7 +478,9 @@
background-color: #09152f;
}
}
-
+ .find {
+ margin-left: 15px;
+ }
.findBtn {
line-height: 100px;
margin-left: 15px;
--
Gitblit v1.8.0