Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2022-02-17 16:39:18 +08:00
3 changed files with 233 additions and 0 deletions
+5
View File
@@ -320,6 +320,11 @@
path: '/standLawsAttrManage',
menuId: '72a24657972d286b8b5d80735cf4eee2'
},
{
title: '操作日志',
path: '/OperationLog',
menuId: ''
},
// {
// title: '资料中心管理',
// path: '/dynamicInformationManage',
@@ -0,0 +1,217 @@
<template>
<div class="Operation-log">
<div class="search-area">
<div class="left">
<el-form
ref="searchForm"
:model="searchForm"
inline
>
<el-form-item label="操作人" class="search-item">
<el-input
v-model="searchForm.account"
style="display: none;"
></el-input>
<el-input
v-model="searchForm.accountName"
placeholder="请选择操作人"
readonly="readonly"
@click.native="choiceZRR"
></el-input>
</el-form-item>
<el-form-item label="开始日期" >
<el-date-picker
v-model="searchForm.sTime"
type="datetime"
placeholder="请选择开始日期"
size="small"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="结束日期" >
<el-date-picker
v-model="searchForm.eTime"
type="datetime"
placeholder="请选择结束日期"
size="small"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="操作类型" class="search-item">
<el-select v-model="searchForm.oper" clearable placeholder="请选择操作类型">
<el-option
v-for="(item, index) in typeList"
placeholder="请选择操作类型"
:key="index"
:value="item.oper"
:label="item.oper"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="操作内容" class="search-item">
<el-input
v-model="searchForm.content"
placeholder="请选择操作内容"
clearable
></el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button
class="common-button-primary"
type="primary"
size="mini"
@click="searchBtn"
>搜索</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button
class="common-button-default"
@click="resetSelect"
size="mini"
>清空</el-button>
</el-form-item>
</el-form>
</div>
</div>
<div class="content">
<el-table
stripe
ref="selections"
tooltip-effect="dark"
border
height="100%"
:data="data"
class="table"
:header-cell-style="{
background: '#e8e8e8',
color: '#333333',
fontSize: '16px',
fontWeight: 'bold',
height: '48px',
}">
<el-table-column prop="account" label="操作人">
</el-table-column>
<el-table-column prop="dept" label="所属部门">
</el-table-column>
<el-table-column prop="operTime" label="操作时间">
</el-table-column>
<el-table-column prop="oper" label="操作类型">
</el-table-column>
<el-table-column prop="operLocation" label="操作内容">
</el-table-column>
</el-table>
<loading :loading="dataLoading">数据处理中</loading>
</div>
<pagination
:total="total"
:pageChange="searchForm.page"
:pageSizeChange="searchForm.pageSize"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
></pagination>
<Role-tree
check-box
:is-title="'选择操作人'"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
export default {
name: "OperationLog",
data () {
return {
dataLoading: false,
total: 0,
data: [],
typeList: [],
styles: {
height: 'calc(100% - 55px)',
overflow: 'auto',
paddingBottom: '53px',
position: 'static'
},
searchForm: {
accountName: '',
account: '',
sTime: '',
eTime: '',
oper: '',
content: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
},
nodeList: [],
modalshowflag: false,
}
},
methods: {
checkedRole (data) {
this.searchForm.account = data[0].id
this.searchForm.accountName = data[0].name
},
choiceZRR () {
this.nodeList = []
this.nodeList.push(this.searchForm.account)
this.modalshowflag = true
},
searchBtn () {
this.searchForm.page = 1
this.getData()
},
getData () {
this.$http.get('sysLog/sys-log/getAllLog', this.searchForm, {
_this: this,
loading: 'dataLoading'
}, res => {
if (res.ok) {
this.total = res.data.total
this.data = res.data.records
}
})
},
pageChange (page) {
this.searchForm.page = page
this.getData()
},
pageSizeChange (pageSize) {
this.searchForm.pageSize = pageSize
this.getData()
},
resetSelect () {
this.searchForm.page = 1
this.searchForm.accountName = ''
this.searchForm.account = ''
this.searchForm.sTime = ''
this.searchForm.eTime = ''
this.searchForm.oper = ''
this.searchForm.content = ''
this.getData()
},
},
mounted () {
this.getData()
this.$http.get('sysLog/sys-log/getLogOper', {}, {
_this: this,
}, res => {
if (res.ok) {
this.typeList = res.data
}
})
}
}
</script>
<style lang="less" scoped>
.Operation-log {
height: 100%;
.content {
height: calc(~"100% - 55px - 56px");
overflow-y: auto;
}
.search-select.el-dropdown {
width: 100%;
}
}
</style>
+11
View File
@@ -3564,6 +3564,17 @@ const routes = [
menuId: 'PGPZXNUFEXC85BVPV9AU'
}
},
{
path: '/OperationLog',
name: 'OperationLog',
component: () =>
import('@/pages/config/pages/operationLog/index'),
meta: {
requireAuth: true,
title: '操作日志',
menuId: ''
}
},
{
path: '/processManage',
name: 'ProcessManage',