guojy 1 anno fa
parent
commit
fdc2e9a39c
2 ha cambiato i file con 7 aggiunte e 7 eliminazioni
  1. 5 5
      src/screen.vue
  2. 2 2
      src/screenSan.vue

+ 5 - 5
src/screen.vue

@@ -39,7 +39,7 @@
 							<template v-if="rankingList.length>0">
 								<template v-if="rankingList.length==4">
 									<div style="margin-bottom: 8px;border-radius: 8px;box-shadow: 0 8px 8px #191E48;margin-top: 16px;">
-										<div v-for="(item, index) in result.ranking.list" :key="index" class="flex-box-ce rankingItem">
+										<div v-for="(item, index) in rankingList" :key="index" class="flex-box-ce rankingItem">
 											<div class="flex-1 flex-box-ce">
 												<template v-if="item.rank < 4">
 													<div v-if="item.rank == 1" class="index"><img src="./assets/image/1.png" /></div>
@@ -291,7 +291,7 @@
 										<div class="main-right2 flex-1">
 											<div class="context">{{ $moment.unix(item.event_time).format('YYYY-MM-DD') }}-{{ item.remark.customize ? item.remark.customize : item.remark.rule }}</div>
 											<div class="flex-box flex-v-ce">
-												<div class="name flex-1">{{ item.employee.name }}</div>
+												<div class="name flex-1">{{ item.employee_name }}</div>
 												<div style="font-size: 16px;" v-if="item.point > 0">+{{ item.point }}  <span style="color: #01EEFE;">{{ item.pt_id == 3 ? 'B分' : 'A分' }}</span></div>
 												<div style="font-size: 16px;" class="red " v-else>{{ item.point }}  <span style="color: #01EEFE;">{{ item.pt_id == 3 ? 'B分' : 'A分' }}</span></div>
 											</div>
@@ -525,9 +525,9 @@ export default {
 		ManagerSAwardCharts() {
 			//管理着奖扣统计表
 			const chart = this.$refs.ManagerSAwardChart;
-			let ratio_date=this.result.list.ratio_date;
-			let ratio_get=this.result.list.ratio_get;
-			let ratio_set=this.result.list.ratio_set;
+			let ratio_date=this.result.active.list.ratio_date;
+			let ratio_get=this.result.active.list.ratio_get;
+			let ratio_set=this.result.active.list.ratio_set;
 			if (chart) {
 				const myChart = this.$echarts.init(chart);
 				let option = {

+ 2 - 2
src/screenSan.vue

@@ -43,7 +43,7 @@
 							<template v-if="rankingList.length>0">
 								<template v-if="rankingList.length==4">
 									<div style="margin-bottom: 8px;border-radius: 8px;box-shadow: 0 8px 8px #191E48;margin-top: 16px;">
-										<div v-for="(item, index) in result.ranking.list" :key="index" class="flex-box-ce rankingItem">
+										<div v-for="(item, index) in rankingList" :key="index" class="flex-box-ce rankingItem">
 											<div class="flex-1 flex-box-ce">
 												<template v-if="item.rank < 4">
 													<div v-if="item.rank == 1" class="index"><img src="./assets/image/1.png" /></div>
@@ -147,7 +147,7 @@
 						</div>
 					</div>
 				</div>
-				<div  style="text-align: center;padding: 6px 0;font-size: 16px;color: #ccc;">@功道云积分制-提供技术支持</div>
+				<div style="text-align: center;padding: 6px 0;font-size: 16px;color: #ccc;">@功道云积分制-提供技术支持</div>
 			</div>
 			<div class="data-all" v-else style="height: 100%;">
 				<i class="el-icon-loading" style="margin-top: 15%;width: 150px;margin-bottom: 10px;color: #fff;font-size: 64px;"></i>