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

src/views/ranking/individual_statistics.vue

@@ -83,7 +83,7 @@
 										<b style="color:#26A2FF;font-size:27px;">
 											{{
 												authorityManagerHeaders.performance
-													? authorityManagerHeaders.performance.total_count + '/' + authorityManagerHeaders.performance.complete_count
+													? authorityManagerHeaders.performance.complete_count + '/' + authorityManagerHeaders.performance.total_count
 													: '0/0'
 											}}
 										</b>

src/views/ranking/integral_event.vue

@@ -72,7 +72,7 @@
 			<div>
 				<el-table :data="list" style="width: 100%" v-loading="loading" @row-click="open_detail" @selection-change="deleteEvents">
 					<el-table-column v-if="employeeOrdept" type="selection" width="55"></el-table-column>
-					<el-table-column prop="employee_name" label="姓名" align="left" width="200px">
+					<el-table-column prop="employee_name" label="姓名" align="left" min-width="125px">
 						<template slot-scope="scope">
 							<div class="flex-box">
 								<userImage :user_name="scope.row.employee_name" :img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
@@ -80,20 +80,20 @@
 							</div>
 						</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="120px">
+					<el-table-column prop="dept" show-overflow-tooltip label="部门" align="left" min-width="120px"></el-table-column>
+					<el-table-column prop="point" label="积分" align="left" min-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="rule_name" show-overflow-tooltip label="规则分类" align="left" width="200px"></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" min-width="280px"></el-table-column>
+					<el-table-column prop="rule_name" show-overflow-tooltip label="规则分类" align="left" min-width="140px"></el-table-column>
+					<el-table-column prop="create_time" label="事件发生时间" align="left" min-width="140px">
 						<template slot-scope="scope">
 							{{ scope.row.event_time }}
 						</template>
 					</el-table-column>
-					<el-table-column prop="source_type" label="来源" align="left" width="160px">
+					<el-table-column prop="source_type" label="来源" align="left" min-width="140px">
 						<template slot-scope="scope">
 							<span v-show="scope.row.source_type == 1">积分录入 <span v-if="scope.row.employee_name">({{scope.row.recorder_name}})</span></span>
 							<span v-show="scope.row.source_type == 2">任务</span>
@@ -107,7 +107,7 @@
 							<span v-show="scope.row.source_type > 10">其他</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="create_time" label="录入时间" align="left" width="140px">
+					<el-table-column prop="create_time" label="录入时间" align="left" width="120px">
 						<template slot-scope="scope">
 							<!-- {{ cuttString(scope.row.create_time) }} -->
 							{{ scope.row.create_time }}