This commit is contained in:
liuye
2022-12-28 14:09:42 +08:00
parent 8b2c78636e
commit c61941e6ba
2 changed files with 7 additions and 7 deletions

View File

@@ -104,7 +104,7 @@
prop: 'status',
align: 'center',
label: '状态',
formart: v => this.dict.getLabel('integralApplyStatus', v)
formart: v => this.dict.getLabel('integralDeclareStatus', v)
}
],
tableData: [],
@@ -119,7 +119,7 @@
},
created () {
this.dict.load('integralApplyStatus', 'integralApplyEventType').then(() => {
this.dict.load('integralDeclareStatus', 'integralApplyEventType').then(() => {
this.getList()
})
},

View File

@@ -74,20 +74,18 @@
@getList="getTableData" :col-configs="colConfigs" :dict="dict">
<el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
<template slot-scope="{ row }">
<span v-if="row.integralRuleId">{{ row.integralRuleName }}</span>
<span v-else>{{ row.eventDesc }}</span>
<span v-if="row.integralRuleName">{{ row.integralRuleName || row.eventDesc}}</span>
</template>
</el-table-column>
<el-table-column slot="integralType" label="类型" align="center">
<template slot-scope="{ row }">
<span v-if="row.integralRuleId">{{ row.eventType }}</span>
<span v-else>{{ row.integralRuleName }}</span>
<span>{{ row.eventType || row.integralRuleName}}</span>
</template>
</el-table-column>
<el-table-column slot="changeIntegral" label="积分变动" align="center">
<template slot-scope="{ row }">
<span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
<span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 0 || row.integralType == 2">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
</template>
</el-table-column>
<el-table-column slot="options" label="操作" align="center">
@@ -140,6 +138,7 @@
<script>
import { mapState } from "vuex"
import * as echarts from 'echarts';
import dayjs from 'dayjs'
export default {
name: "gridScoreStatistics",
label: "积分统计",
@@ -208,6 +207,7 @@ export default {
}
},
created() {
this.time = [dayjs().subtract(1,'week').format('YYYY-MM-DD'),dayjs().format('YYYY-MM-DD')]
this.$dict.load('epidemicDangerousAreaLevel','integralType','integralRuleEvent','integralRuleEventType').then(() => {
this.getStatistics()
this.getGridList()