|
|
@@ -3,23 +3,23 @@
|
|
|
<div class="list-filter">
|
|
|
<el-form :ref="formName" inline label-width="110px">
|
|
|
<el-row>
|
|
|
- <el-form-item prop="createUser" label="操作人姓名">
|
|
|
- <el-input v-model="formData.createUser" class="filter-item" clearable placeholder="请输入" />
|
|
|
+ <el-form-item prop="userName" label="操作人姓名">
|
|
|
+ <el-input v-model="formData.userName" class="filter-item" clearable placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="createBy" label="身份证号">
|
|
|
- <el-input v-model="formData.createBy" class="filter-item" clearable placeholder="请输入" />
|
|
|
+ <el-form-item prop="idCard" label="操作人身份证号">
|
|
|
+ <el-input v-model="formData.idCard" class="filter-item" clearable placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="createOrgName" label="操作人单位名称">
|
|
|
- <el-input v-model="formData.createOrgName" class="filter-item" clearable placeholder="请输入" />
|
|
|
+ <el-form-item prop="orgName" label="操作人单位名称">
|
|
|
+ <el-input v-model="formData.orgName" class="filter-item" clearable placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-form-item prop="title" label="操作类型">
|
|
|
<el-input v-model="formData.title" class="filter-item" clearable placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="moduleName" label="功能模块名称">
|
|
|
- <el-select v-model="formData.moduleName" clearable placeholder="请选择">
|
|
|
- <el-option v-for="(item) in moduleData" :key="item.id" :label="item.label" :value="item.id" />
|
|
|
+ <el-form-item prop="moduleType" label="功能模块名称">
|
|
|
+ <el-select v-model="formData.moduleType" clearable placeholder="请选择">
|
|
|
+ <el-option v-for="(item) in moduleData" :key="item.key" :label="item.value" :value="item.key" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="createTime" label="操作日期">
|
|
|
@@ -44,18 +44,18 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div class="list-table">
|
|
|
- <el-table v-loading="loading" :data="tableData" fit border stripe height="calc(100% - 32px)">
|
|
|
+ <el-table v-loading="loading" :data="tableData" border stripe height="calc(100% - 32px)">
|
|
|
<el-table-column type="index" label="序号" width="50" />
|
|
|
<el-table-column prop="createUser" label="操作人姓名" width="120" show-overflow-tooltip />
|
|
|
- <el-table-column prop="createBy" label="操作人身份证号" show-overflow-tooltip />
|
|
|
- <el-table-column prop="createOrgName" label="操作人单位名称" width="180" show-overflow-tooltip />
|
|
|
+ <el-table-column prop="createBy" label="操作人身份证号" width="190" />
|
|
|
+ <el-table-column prop="createOrgName" label="操作人单位名称" min-width="150" show-overflow-tooltip />
|
|
|
<el-table-column prop="moduleName" label="功能模块名称" width="200" show-overflow-tooltip />
|
|
|
- <el-table-column prop="createTime" label="操作时间" width="160" />
|
|
|
- <el-table-column prop="title" label="操作类型" width="160" />
|
|
|
+ <el-table-column prop="createTime" label="操作时间" width="170" />
|
|
|
+ <el-table-column prop="title" label="操作类型" width="240" show-overflow-tooltip />
|
|
|
<el-table-column prop="remoteAddr" label="终端IP" width="160" />
|
|
|
<el-table-column label="操作" align="center" width="160" class-name="action-column">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button type="text" @click="viewItem(scope.row.id)">详情</el-button>
|
|
|
+ <el-button type="text" @click="viewItem(scope.row)">详情</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -71,16 +71,21 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <log-view ref="logView" />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
|
|
|
-import { isNull, hasValidRecords, formatDictData } from '@/utils/convert'
|
|
|
+import { isNull, hasValidRecords } from '@/utils/convert'
|
|
|
+
|
|
|
+import { fetchTableList, fetchModuleData } from '@/api/log'
|
|
|
+
|
|
|
+import LogView from './components/LogView'
|
|
|
|
|
|
export default {
|
|
|
name: 'Log',
|
|
|
- components: { },
|
|
|
+ components: { LogView },
|
|
|
data() {
|
|
|
return {
|
|
|
// table
|
|
|
@@ -93,11 +98,12 @@ export default {
|
|
|
// filter
|
|
|
formName: 'filterForm',
|
|
|
formData: {
|
|
|
+ userName: '',
|
|
|
+ idCard: '',
|
|
|
+ orgName: '',
|
|
|
title: '',
|
|
|
- content: '',
|
|
|
- messageType: '',
|
|
|
- deptCode: '',
|
|
|
- publishDate: null
|
|
|
+ moduleType: '',
|
|
|
+ createTime: null
|
|
|
},
|
|
|
// select
|
|
|
moduleData: [],
|
|
|
@@ -106,7 +112,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- this.getTypeData()
|
|
|
+ this.getModuleData()
|
|
|
this.searchTable()
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -136,64 +142,62 @@ export default {
|
|
|
},
|
|
|
// 获取table数据
|
|
|
getTablelist() {
|
|
|
- this.$message({
|
|
|
- type: 'info',
|
|
|
- message: '开发中'
|
|
|
+ this.loading = true
|
|
|
+ const params = {
|
|
|
+ current: this.current,
|
|
|
+ size: this.size,
|
|
|
+ orders: [{ column: 'create_time', asc: 0 }],
|
|
|
+ delFlag: 0,
|
|
|
+ userName: this.formData.userName,
|
|
|
+ idCard: this.formData.idCard,
|
|
|
+ orgName: this.formData.orgName,
|
|
|
+ title: this.formData.title,
|
|
|
+ moduleType: this.formData.moduleType
|
|
|
+ }
|
|
|
+ if (this.formData.createTime) {
|
|
|
+ params.createTimeStart = this.formData.createTime[0] + '000000'
|
|
|
+ params.createTimeEnd = this.formData.createTime[1] + '235959'
|
|
|
+ }
|
|
|
+ fetchTableList(params).then(response => {
|
|
|
+ this.loading = false
|
|
|
+ if (hasValidRecords(response)) {
|
|
|
+ this.tableData = response.data.records
|
|
|
+ this.total = response.data.total
|
|
|
+ } else {
|
|
|
+ this.tableData = []
|
|
|
+ this.total = 0
|
|
|
+ }
|
|
|
+ }).catch(error => {
|
|
|
+ console.log(error)
|
|
|
+ this.loading = false
|
|
|
+ this.$message({
|
|
|
+ type: 'error',
|
|
|
+ duration: 0,
|
|
|
+ showClose: true,
|
|
|
+ message: '获取信息列表出错: ' + error.message
|
|
|
+ })
|
|
|
})
|
|
|
- // this.loading = true
|
|
|
- // const params = {
|
|
|
- // current: this.current,
|
|
|
- // size: this.size,
|
|
|
- // delFlag: 0,
|
|
|
- // title: this.formData.title,
|
|
|
- // content: this.formData.content,
|
|
|
- // messageType: this.formData.messageType,
|
|
|
- // deptCode: this.formData.deptCode
|
|
|
- // }
|
|
|
- // if (this.formData.publishDate) {
|
|
|
- // params.publishTimeStart = this.formData.publishDate[0] + '000000'
|
|
|
- // params.publishTimeEnd = this.formData.publishDate[1] + '000000'
|
|
|
- // }
|
|
|
- // fetchTableList(params).then(response => {
|
|
|
- // this.loading = false
|
|
|
- // if (hasValidRecords(response)) {
|
|
|
- // this.tableData = response.data.records
|
|
|
- // this.total = response.data.total
|
|
|
- // } else {
|
|
|
- // this.tableData = []
|
|
|
- // this.total = 0
|
|
|
- // }
|
|
|
- // }).catch(error => {
|
|
|
- // console.log(error)
|
|
|
- // this.loading = false
|
|
|
- // this.$message({
|
|
|
- // type: 'error',
|
|
|
- // duration: 0,
|
|
|
- // showClose: true,
|
|
|
- // message: '获取信息列表出错: ' + error.message
|
|
|
- // })
|
|
|
- // })
|
|
|
},
|
|
|
- viewItem(id) {
|
|
|
- this.$refs['infoView'].open(id)
|
|
|
+ viewItem(row) {
|
|
|
+ this.$refs['logView'].open(row.id, row.createBy)
|
|
|
},
|
|
|
- getTypeData() {
|
|
|
- // fetchDictData(this.dictType).then(response => {
|
|
|
- // if (!isNull(response.data)) {
|
|
|
- // this.typeData = response.data
|
|
|
- // } else {
|
|
|
- // this.typeData = []
|
|
|
- // }
|
|
|
- // }).catch(error => {
|
|
|
- // console.log(error)
|
|
|
- // this.topLoading = false
|
|
|
- // this.$message({
|
|
|
- // type: 'error',
|
|
|
- // duration: 0,
|
|
|
- // showClose: true,
|
|
|
- // message: '获取信息类型出错: ' + error.message
|
|
|
- // })
|
|
|
- // })
|
|
|
+ getModuleData() {
|
|
|
+ fetchModuleData().then(response => {
|
|
|
+ if (!isNull(response.data)) {
|
|
|
+ this.moduleData = response.data
|
|
|
+ } else {
|
|
|
+ this.moduleData = []
|
|
|
+ }
|
|
|
+ }).catch(error => {
|
|
|
+ console.log(error)
|
|
|
+ this.topLoading = false
|
|
|
+ this.$message({
|
|
|
+ type: 'error',
|
|
|
+ duration: 0,
|
|
|
+ showClose: true,
|
|
|
+ message: '获取功能模块名称出错: ' + error.message
|
|
|
+ })
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
}
|
caiaa