|
@@ -1,46 +1,56 @@
|
|
|
<template>
|
|
|
- <table-page-template>
|
|
|
- <div slot='form' class='condition'>
|
|
|
- <el-input
|
|
|
- v-model.trim='searchValue'
|
|
|
- class='margin-right'
|
|
|
- style='width: 300px;'
|
|
|
- placeholder='请输入操作人、动作、对象id等关键字搜索'
|
|
|
- @change='searchChange'
|
|
|
- ></el-input>
|
|
|
- <el-date-picker
|
|
|
- class='margin-right'
|
|
|
- v-model='dateValue'
|
|
|
- type='daterange'
|
|
|
- align='right'
|
|
|
- :clearable='false'
|
|
|
- unlink-panels
|
|
|
- range-separator='至'
|
|
|
- start-placeholder='开始日期'
|
|
|
- end-placeholder='结束日期'
|
|
|
- :picker-options='pickerOptions'
|
|
|
- @change='dateChange'
|
|
|
- value-format='yyyy-MM-dd'
|
|
|
- ></el-date-picker>
|
|
|
- <el-button type='primary'>动作说明</el-button>
|
|
|
- <el-button type='primary' @click='refresh'>刷新</el-button>
|
|
|
- <el-button type='primary' @click='downExcel'>导出到Excel</el-button>
|
|
|
- </div>
|
|
|
- <el-table slot='table' :data='tableData' border tooltip-effect='dark' style='width: 100%' v-loading='loading'>
|
|
|
- <el-table-column prop='CreateTime' label='时间' width='150'></el-table-column>
|
|
|
- <el-table-column prop='Comming' label='来源' width='120'></el-table-column>
|
|
|
- <el-table-column prop='UserName' label='操作人' width='120'></el-table-column>
|
|
|
- <el-table-column prop='Phone' label='手机' width='150'></el-table-column>
|
|
|
- <el-table-column prop='Action' label='动作'></el-table-column>
|
|
|
- <el-table-column prop='UserId' label='对象id'></el-table-column>
|
|
|
- <el-table-column label='操作说明' width='350'>
|
|
|
- <template slot-scope='scope'>
|
|
|
- <div class='ellipsis' :title='scope.row.Note'>{{scope.row.Note}}</div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
|
|
|
- </table-page-template>
|
|
|
+ <div style="display: flex; flex-direction: column;flex-grow: 1; flex-shrink: 1;">
|
|
|
+ <table-page-template>
|
|
|
+ <div slot='form' class='condition'>
|
|
|
+ <el-input
|
|
|
+ v-model.trim='searchValue'
|
|
|
+ class='margin-right'
|
|
|
+ style='width: 300px;'
|
|
|
+ placeholder='请输入操作人、动作、对象id等关键字搜索'
|
|
|
+ @change='searchChange'
|
|
|
+ ></el-input>
|
|
|
+ <el-date-picker
|
|
|
+ class='margin-right'
|
|
|
+ v-model='dateValue'
|
|
|
+ type='daterange'
|
|
|
+ align='right'
|
|
|
+ :clearable='false'
|
|
|
+ unlink-panels
|
|
|
+ range-separator='至'
|
|
|
+ start-placeholder='开始日期'
|
|
|
+ end-placeholder='结束日期'
|
|
|
+ :picker-options='pickerOptions'
|
|
|
+ @change='dateChange'
|
|
|
+ value-format='yyyy-MM-dd'
|
|
|
+ ></el-date-picker>
|
|
|
+ <el-button type='primary' @click='action'>动作说明</el-button>
|
|
|
+ <el-button type='primary' @click='refresh'>刷新</el-button>
|
|
|
+ <el-button type='primary' @click='downExcel'>导出到Excel</el-button>
|
|
|
+ </div>
|
|
|
+ <el-table
|
|
|
+ slot='table'
|
|
|
+ :data='tableData'
|
|
|
+ border
|
|
|
+ tooltip-effect='dark'
|
|
|
+ style='width: 100%; margin-top:10px;'
|
|
|
+ v-loading='loading'
|
|
|
+ >
|
|
|
+ <el-table-column prop='CreateTime' label='时间' width='150'></el-table-column>
|
|
|
+ <el-table-column prop='Comming' label='来源' width='120'></el-table-column>
|
|
|
+ <el-table-column prop='UserName' label='操作人' width='120'></el-table-column>
|
|
|
+ <el-table-column prop='Phone' label='手机' width='150'></el-table-column>
|
|
|
+ <el-table-column prop='Action' label='动作'></el-table-column>
|
|
|
+ <el-table-column prop='UserId' label='对象id'></el-table-column>
|
|
|
+ <el-table-column label='操作说明' width='350'>
|
|
|
+ <template slot-scope='scope'>
|
|
|
+ <div class='ellipsis' :title='scope.row.Note'>{{scope.row.Note}}</div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
|
|
|
+ </table-page-template>
|
|
|
+ <saga-action ref='action'></saga-action>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
@@ -50,7 +60,8 @@ import {
|
|
|
} from '@/api/scan/request'
|
|
|
import { mapGetters, mapActions } from 'vuex'
|
|
|
import axios from 'axios'
|
|
|
-
|
|
|
+//component
|
|
|
+import SagaAction from './Action'
|
|
|
var date = new Date()
|
|
|
const nowDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
|
|
|
export default {
|
|
@@ -115,6 +126,9 @@ export default {
|
|
|
total: 80
|
|
|
}
|
|
|
},
|
|
|
+ components: {
|
|
|
+ SagaAction
|
|
|
+ },
|
|
|
computed: {
|
|
|
...mapGetters('peojMess', ['projectId', 'userId'])
|
|
|
},
|
|
@@ -126,6 +140,9 @@ export default {
|
|
|
refresh() {
|
|
|
this.getLogData()
|
|
|
},
|
|
|
+ action() {
|
|
|
+ this.$refs['action'].show()
|
|
|
+ },
|
|
|
// 导出
|
|
|
downExcel() {
|
|
|
let param = {
|
|
@@ -177,7 +194,7 @@ export default {
|
|
|
this.getLogData()
|
|
|
},
|
|
|
getLogData() {
|
|
|
- this.loading = true;
|
|
|
+ this.loading = true
|
|
|
let param = {
|
|
|
startTime: this.dateValue[0] + ' 00:00:00',
|
|
|
endTime: this.dateValue[1] + ' 23:59:59',
|
|
@@ -188,7 +205,7 @@ export default {
|
|
|
UserId: this.userId
|
|
|
}
|
|
|
getBuildLog(param).then(res => {
|
|
|
- this.loading = false;
|
|
|
+ this.loading = false
|
|
|
this.total = res.data.Count
|
|
|
this.tableData = res.data.LogList
|
|
|
})
|
|
@@ -208,7 +225,7 @@ export default {
|
|
|
margin-right: 10px;
|
|
|
}
|
|
|
.condition {
|
|
|
- margin-bottom: 10px;
|
|
|
+ margin: 10px;
|
|
|
display: flex;
|
|
|
}
|
|
|
.ellipsis {
|