blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-11 13:39:48 +08:00
Code Issues Releases Wiki Activity

group by logId (#288)

Browse Source 
* group by logId

* changing structure of the change log
This commit is contained in:
elsiosanchez 2020-01-31 07:41:20 -04:00 committed by GitHub
parent 5beca7630a
commit 045536f4b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/views/ADempiere/Window/index.vue
View File

@ -5,7 +5,7 @@
> >
<el-container style="height: 86vh;"> <el-container style="height: 86vh;">
<Split> <Split>
<SplitArea :size="!show ? 100 : 70" :min-size="100"> <SplitArea :size="!show ? 100 : 50" :min-size="100">
<el-aside width="100%"> <el-aside width="100%">
<split-pane :min-percent="10" :default-percent="defaultPorcentSplitPane" split="vertical"> <split-pane :min-percent="10" :default-percent="defaultPorcentSplitPane" split="vertical">
<template> <template>
@ -148,7 +148,7 @@
</split-pane> </split-pane>
</el-aside> </el-aside>
</SplitArea> </SplitArea>
<SplitArea :size="show ? 30 : 0"> <SplitArea :size="show ? 50 : 0">
<el-main> <el-main>
<div style="top: 40%;position: absolute;"> <div style="top: 40%;position: absolute;">
<el-button v-show="show" type="info" icon="el-icon-info" circle style="float: right;" class="el-button-window" @click="conteInfo" /> <el-button v-show="show" type="info" icon="el-icon-info" circle style="float: right;" class="el-button-window" @click="conteInfo" />
@ -165,35 +165,32 @@
<div <div
v-if="getIsChangeLog" v-if="getIsChangeLog"
> >
<el-card <el-scrollbar wrap-class="scroll-window-log-change">
v-for="(listLogs, index) in getTypeLogs" <el-timeline>
:key="index" <el-timeline-item
> v-for="(listLogs, key) in gettersListRecordLogs"
<el-scrollbar wrap-class="scroll-window-log-change"> :key="key"
<el-timeline> :timestamp="translateDate(listLogs.logDate)"
<el-timeline-item placement="top"
v-for="(evenType, key) in listLogs.logs" color="#008fd3"
:key="key" >
:timestamp="translateDate(evenType.logDate)" <el-card shadow="hover" class="clearfix">
placement="top" <div>
:color="listLogs.eventType === 1 ? 'rgb(22, 130, 230)' : 'rgba(67, 147, 239, 1)'" {{ listLogs.userName }}
> <el-link type="primary" style="float: right;" @click="showkey(key)"> {{ $t('window.containerInfo.changeDetail') }} </el-link>
<el-card shadow="hover" @click.native="changeField(evenType)"> </div>
<div> <br>
<span>{{ evenType.userName }}</span> <el-collapse-transition>
<el-link type="primary" style="float: right;" @click="showkey(key, index)"> {{ $t('window.containerInfo.changeDetail') }} </el-link> <div v-show="(currentKey === key)">
<span v-for="(list, index) in listLogs.changeLogs" :key="index">
<p><b> {{ list.displayColumnName }} :</b> <strike> {{ list.oldDisplayValue }} </strike> {{ list.newDisplayValue }} </p>
</span>
</div> </div>
<br> </el-collapse-transition>
<el-collapse-transition> </el-card>
<div v-show="(currentKey === key) && (typeAction === index)" :key="key" class="text item"> </el-timeline-item>
<span><p><b> {{ evenType.displayColumnName }}: </b> <strike>{{ evenType.oldDisplayValue }} </strike> {{ evenType.newDisplayValue }}</p></span> </el-timeline>
</div> </el-scrollbar>
</el-collapse-transition>
</el-card>
</el-timeline-item>
</el-timeline>
</el-scrollbar>
</el-card>
</div> </div>
<div <div
v-else v-else
@ -491,16 +488,16 @@ export default {
}, },
getTypeLogs() { getTypeLogs() {
const groupLog = this.gettersListRecordLogs.reduce((groupLog, item) => { const groupLog = this.gettersListRecordLogs.reduce((groupLog, item) => {
if (!groupLog.includes(item.eventType)) { if (!groupLog.includes(item.logId)) {
groupLog.push(item.eventType) groupLog.push(item.logId)
} }
return groupLog return groupLog
}, []) }, [])
.map(i => { .map(log => {
// agrup for logId // agrup for logId
return { return {
logs: this.gettersListRecordLogs.filter(b => b.eventType === i), logs: this.gettersListRecordLogs.filter(change => change.logId === log),
eventType: i logId: log
} }
}) })
return groupLog return groupLog
@ -822,7 +819,7 @@ export default {
</style> </style>
<style> <style>
.scroll-window-log-change { .scroll-window-log-change {
max-height: 45vh !important; max-height: 74vh !important;
} }
.scroll-window-log-workflow { .scroll-window-log-workflow {
max-height: 68vh !important; max-height: 68vh !important;