From 791e8759a2a5c53e924ab6fd59896c43b4c24286 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 02 六月 2024 21:39:44 +0800
Subject: [PATCH] 完善操作日志
---
src/views/dnc/log/index.vue | 117 ++++++++++++++++++++++++++++++++++----
src/views/dnc/setting/FTP.vue | 4
2 files changed, 105 insertions(+), 16 deletions(-)
diff --git a/src/views/dnc/log/index.vue b/src/views/dnc/log/index.vue
index 1b61358..4e79445 100644
--- a/src/views/dnc/log/index.vue
+++ b/src/views/dnc/log/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-20 21:43:10
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-26 22:17:43
+ * @LastEditTime: 2024-06-02 21:38:31
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/dnc/log/index.vue
-->
<template>
@@ -9,23 +9,42 @@
<el-card shadow="never" style="height: 100%;" body-style="height: 100%">
<el-container>
<el-header>
-
+ <el-button @click="exportExcel">瀵煎嚭</el-button>
+ <el-select style="margin-left: auto;padding-left: 20px;width: 240px;" v-model="params.sourceType"
+ placeholder="璇烽�夋嫨">
+ <template #prefix><span style="margin-right: 6px;">鏂囦欢鏉ユ簮</span></template>
+ <el-option v-for="item in options.sourceType" :key="item.id" :label="item.name"
+ :value="item.id" />
+ </el-select>
+ <el-select style="margin-left: 8px;padding-left: 20px;width: 240px;" v-model="params.operationType"
+ placeholder="璇烽�夋嫨">
+ <template #prefix><span style="margin-right: 6px;">鎿嶄綔绫诲瀷</span></template>
+ <el-option v-for="item in options.operationType" :key="item.id" :label="item.name"
+ :value="item.id" />
+ </el-select>
+ <el-date-picker style="width: 260px;flex-grow: 0;margin-left: 8px;" v-model="params.time"
+ type="daterange" range-separator="-" start-placeholder="鎿嶄綔寮�濮嬫椂闂�" end-placeholder="鎿嶄綔缁撴潫鏃堕棿" />
+ <el-input v-model="params.keyWord" style="width: 240px;margin-left: 8px;" placeholder="" clearable>
+ <template #prefix>鍏抽敭璇�</template>
+ </el-input>
+ <el-button style="margin-left: 8px;" @click="search" type="primary"
+ icon="el-icon-search"></el-button>
</el-header>
<el-main>
<scTable highlight-current-row @dataChange="dataChange" @row-click="rowClick" ref="table"
:params="params" :apiObj="apiObj" @selection-change="selectionChange" stripe>
<el-table-column type="selection" width="50"></el-table-column>
- <el-table-column label="鏂囦欢鍚嶇О" prop="name">
+ <el-table-column label="鏂囦欢鍚嶇О" prop="fileName">
</el-table-column>
- <el-table-column label="鐗堟湰" prop="allPathName"></el-table-column>
+ <el-table-column label="鐗堟湰" prop="version"></el-table-column>
<el-table-column label="鏂囦欢绫诲瀷" prop="suffix"></el-table-column>
- <el-table-column label="鏂囦欢鏉ユ簮" prop="suffix"></el-table-column>
- <el-table-column label="鎿嶄綔绫诲瀷" prop="updateTime"></el-table-column>
- <el-table-column label="婧愯矾寰�" prop="updateTime"></el-table-column>
- <el-table-column label="鐩爣璺緞" prop="updateTime"></el-table-column>
- <el-table-column label="鏂囦欢浣嶇疆" prop="updateTime"></el-table-column>
- <el-table-column label="鎿嶄綔浜哄憳" prop="updateTime"></el-table-column>
- <el-table-column label="鎿嶄綔鏃堕棿" prop="updateTime"></el-table-column>
+ <el-table-column label="鏂囦欢鏉ユ簮" prop="sourceTypeDesc"></el-table-column>
+ <el-table-column label="鎿嶄綔绫诲瀷" prop="operationTypeDesc"></el-table-column>
+ <el-table-column label="婧愯矾寰�" prop="sourcePathName"></el-table-column>
+ <el-table-column label="鐩爣璺緞" prop="targetPathName"></el-table-column>
+ <el-table-column label="鏂囦欢浣嶇疆" prop="fileLocationDesc"></el-table-column>
+ <el-table-column label="鎿嶄綔浜哄憳" prop="operatorName"></el-table-column>
+ <el-table-column label="鎿嶄綔鏃堕棿" prop="operationTime"></el-table-column>
</scTable>
</el-main>
</el-container>
@@ -39,13 +58,73 @@
return {
selection: [],
params: {},
+ options: {
+ sourceType: [
+ {
+ name: '鏈湴鏂囦欢',
+ id: 0
+ },
+ {
+ name: '鎴戠殑鏂囨。',
+ id: 1
+ },
+ {
+ name: '宸ヤ綅鏂囦欢',
+ id: 2
+ },
+ {
+ name: '宸ュ巶鏂囦欢',
+ id: 3
+ },
+ {
+ name: '鏈哄簥鍥炰紶',
+ id: 4
+ },
+ {
+ name: '宸ヨ壓鍖�',
+ id: 5
+ },
+ ],
+ operationType: [
+ {
+ name: '涓婁紶',
+ id: 1
+ },
+ {
+ name: '涓嬭浇',
+ id: 2
+ },
+ {
+ name: '鍒犻櫎',
+ id: 3
+ },
+ {
+ name: '鏇存柊',
+ id: 4
+ },
+ {
+ name: '绉诲姩',
+ id: 5
+ },
+ {
+ name: '澶嶅埗',
+ id: 6
+ },
+ ],
+ },
apiObj: {
get: async (data) => {
let params = {
- ...data,
- ...this.params
+ current: data.current,
+ size: data.size,
}
- return await this.$HTTP.get(`/api/blade-dnc/dnc-factory-file/page`, {}, { params }).then(res => {
+ let newData = {
+ ...data,
+ ...this.params,
+ startTime: this.params?.time?.[0] || '',
+ endTime: this.params?.time?.[1] || '',
+ }
+ return await this.$HTTP.post(`/api/blade-dnc/operation-file/page-allData?current=1&size=15`, {}, { params, data: newData }).then(res => {
return res
})
}
@@ -53,6 +132,16 @@
}
},
methods: {
+ exportExcel() {
+ let data = {
+ ...this.params,
+ startTime: this.params?.time?.[0] || '',
+ endTime: this.params?.time?.[1] || '',
+ }
+ this.$HTTP.post(`/api/blade-dnc/operation-file/export-log`, data).then(res => {
+
+ })
+ },
selectionChange(selection) {
this.selection = selection
},
diff --git a/src/views/dnc/setting/FTP.vue b/src/views/dnc/setting/FTP.vue
index d0993de..c4a7cfd 100644
--- a/src/views/dnc/setting/FTP.vue
+++ b/src/views/dnc/setting/FTP.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-26 22:26:35
* @LastEditors: Sneed
- * @LastEditTime: 2024-06-02 20:46:48
+ * @LastEditTime: 2024-06-02 21:20:21
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/dnc/setting/FTP.vue
-->
<template>
@@ -13,7 +13,7 @@
label: 'title',
}" node-key="id">
- <template #prefix>宸ヤ綅鐩綍</template>
+ <template #prefix><span style="margin-right: 6px;">宸ヤ綅鐩綍</span></template>
</el-tree-select>
<el-input v-model="params.name" style="width: 240px;margin-left: 8px;" placeholder="" clearable>
<template #prefix>鐩綍鍚嶇О</template>
--
Gitblit v1.9.3