From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/log/index.vue | 180 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index e0a1363..2322b2d 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,11 +70,10 @@
<!-- 鏁版嵁灞曠ず -->
<el-table
ref="multipleTable"
- :default-sort="{ prop: 'createTime' }"
:header-cell-style="{
- background: '#06122c',
+ // background: '#06122c',
'font-size': '12px',
- color: '#4b9bb7',
+ color: '#606266',
'font-weight': '650',
'line-height': '45px',
}"
@@ -82,7 +88,7 @@
prop="createTime"
label="鏃ュ織鏃堕棿"
min-width="10"
- :sort-orders="['descending','ascending']"
+ :sort-orders="['descending', 'ascending']"
sortable="custom"
>
<template slot-scope="scope">
@@ -148,7 +154,7 @@
</div>
</template>
<script>
-import {getNowDate} from '@/utils/helper'
+import { downloadFile, getNowDate } from "@/utils/helper";
import helper from "@/utils/mydate";
import { parseTime } from "@/utils/index";
import { createNamespacedHelpers } from "vuex";
@@ -202,7 +208,6 @@
async handleExport() {
const { currentPage, pageSize, context, operationType, mysort, mytime } =
this;
- console.log(mytime);
let arr = await this.exportLogs({
content: context,
current: currentPage,
@@ -210,7 +215,7 @@
id: "",
operationType: operationType === "鍏ㄩ儴" ? "" : operationType,
portEquipment: "",
- size: pageSize,
+ size: 50000,
startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
sort: mysort,
});
@@ -224,7 +229,7 @@
const href = window.URL.createObjectURL(blob);
downloadElement.href = href;
// // 涓嬭浇鍚庢枃浠跺悕
- downloadElement.download = fileName + '鏃ュ織鏁版嵁.xlsx';
+ downloadElement.download = fileName + "鏃ュ織鏁版嵁.xlsx";
document.body.appendChild(downloadElement);
// 鐐瑰嚮涓嬭浇
downloadElement.click();
@@ -285,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,
@@ -297,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) {
@@ -345,12 +347,9 @@
message: res.message,
});
}
- console.log(res);
});
})
- .catch((err) => {
- console.log(err);
- });
+ .catch((err) => {});
},
// 琛ㄦ牸鐩戝惉
tableChange(list) {
@@ -412,9 +411,7 @@
.then((_) => {
done();
})
- .catch((err) => {
- console.log(err);
- });
+ .catch((err) => {});
},
// 鑷畾涔夊叧闂脊绐�
closeDialog({ flag, index }) {
@@ -423,9 +420,7 @@
}
},
//
- timechange(data) {
- console.log(data);
- },
+ timechange(data) {},
},
};
</script>
@@ -433,11 +428,11 @@
.userList {
text-align: left;
margin: 10px 20px;
- color: #4b9bb7;
+ color: #606266;
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ background-color: white;
+ border: 1px solid #fff;
.header-nav {
line-height: 40px;
@@ -451,24 +446,27 @@
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;
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ //&::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ //}
}
.el-select {
flex: 1;
@@ -476,11 +474,13 @@
.el-date-editor {
flex: 1;
}
- :deep(.el-range-input) {
- background-color: #09152f;
- }
+ //:deep(.el-range-input) {
+ // background-color: #09152f;
+ //}
}
-
+ .find {
+ margin-left: 15px;
+ }
.findBtn {
line-height: 100px;
margin-left: 15px;
@@ -497,10 +497,10 @@
}
main {
- background-color: #09152f;
+ background-color: white;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
+ border: 1px solid #fff;
.el-link {
color: #4b9bb7;
@@ -552,10 +552,10 @@
width: 120px;
}
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
+ //&::v-deep .el-input__inner {
+ // border: none;
+ // background-color: #09152f;
+ //}
&:hover {
border: 1px solid #4b9bb7;
@@ -573,33 +573,33 @@
line-height: 50px;
justify-content: center;
- .el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
-
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
- }
+ //.el-pagination {
+ // &::v-deep li,
+ // &::v-deep .btn-prev,
+ // &::v-deep .btn-next {
+ // background-color: #071f39;
+ // color: #4b9bb7;
+ // }
+ //
+ // &::v-deep .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
+ //}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #606266;
+ // font-size: 10px;
- &::v-deep .el-table__empty-block {
- background-color: #09152f;
- }
-
- &::v-deep .el-table__empty-block {
- color: #4b9bb7;
- }
+ //&::v-deep .el-table__empty-block {
+ // background-color: #09152f;
+ //}
+ //
+ //&::v-deep .el-table__empty-block {
+ // color: #4b9bb7;
+ //}
.operation {
display: flex;
@@ -614,13 +614,13 @@
}
}
- .el-table::v-deep .warning-row {
- background: #06122c;
- }
-
- .el-table::v-deep .success-row {
- background: #071f39;
- }
+ //.el-table::v-deep .warning-row {
+ // background: #06122c;
+ //}
+ //
+ //.el-table::v-deep .success-row {
+ // background: #071f39;
+ //}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0