Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/views/ranking/integral_event.vue

@@ -81,13 +81,14 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="dept" label="部门" align="left" width="200px"></el-table-column>
-					<el-table-column prop="point" label="积分" align="left" width="80px">
+					<el-table-column prop="point" label="积分" align="left" width="120px">
 						<template slot-scope="scope">
 							<span :class="scope.row.point < 0 ? 'green' : 'red'">{{ scope.row.point }} {{ point_name(scope.row.pt_id) }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="remark" show-overflow-tooltip label="事件" align="left"></el-table-column>
-					<el-table-column prop="create_time" label="事件时间" align="left" width="140px">
+					<el-table-column prop="remark" show-overflow-tooltip label="事件内容" align="left"></el-table-column>
+					<el-table-column prop="rule_name" show-overflow-tooltip label="规则分类" align="left" width="200px"></el-table-column>
+					<el-table-column prop="create_time" label="事件发生时间" align="left" width="140px">
 						<template slot-scope="scope">
 							{{ scope.row.event_time }}
 						</template>
@@ -106,9 +107,10 @@
 							<span v-show="scope.row.source_type > 10">其他</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="create_time" label="录入时间" align="left" width="110px">
+					<el-table-column prop="create_time" label="录入时间" align="left" width="140px">
 						<template slot-scope="scope">
-							{{ cuttString(scope.row.create_time) }}
+							<!-- {{ cuttString(scope.row.create_time) }} -->
+							{{ scope.row.create_time }}
 						</template>
 					</el-table-column>
 
@@ -389,7 +391,7 @@ export default {
 				{id: 1,name: '积分录入'},
 				{id: 2,name: '任务'},
 				{id: 3,name: '积分系统分配'},
-				// {id: 4,name: '考勤系统分配'},
+				{id: 4,name: '考勤系统分配'},
 				{id: 5,name: '积分申请'},
 				// {id: 6,name: '绩效任务包'},
 				{id: 8,name: '积分导入'},