处理问题

This commit is contained in:
TS-QD1 2023-07-14 16:16:35 +08:00
parent 79dfb00c47
commit 00c7eb6a7d
3 changed files with 23 additions and 20 deletions

View File

@ -164,11 +164,14 @@ export default {
}, },
{ {
align: 'center', align: 'center',
title: '姓名', title: '姓名(网格数)',
key: 'B', key: 'B',
keyName: 'name', keyName: 'name',
fixed: 'left', fixed: 'left',
width: 140 width: 140,
render(row) {
return `${row.B}(${row.gridCount})`
}
}, },
{ {
align: 'center', align: 'center',
@ -205,14 +208,6 @@ export default {
key: 'E', key: 'E',
keyName: 'shouldReportCount', keyName: 'shouldReportCount',
width: 60, width: 60,
// render(row, index) {
// return h('a', {
// href: 'javascript:void(0);',
// onClick() {
// vueSelf.onReportDayClick(row, index)
// }
// }, row.E)
// }
}, },
{ {
align: 'center', align: 'center',
@ -626,13 +621,21 @@ export default {
}, },
{ {
align: 'center', align: 'center',
title: '应发绩效工资', title: '应发(浮动)绩效工资',
key: 'AF', key: 'AF',
keyName: 'shouldPay', keyName: 'shouldPay',
fixed: 'right', fixed: 'right',
width: 100, width: 100,
render(row, index) { render(row, index) {
return vueSelf.computeAF(row); let score = vueSelf.computeAE(row);
if(score <= 100 && score >= 85) {
return `${333 * row.gridCount}(${500 * row.gridCount})`;
} else if(score >= 75) {
return `${333 * row.gridCount}(0)`;
} else if(score >= 60) {
return `${333 * row.gridCount}(0)`;
}
return `${333 * row.gridCount}(0)`;
} }
}, },
{ {
@ -937,9 +940,9 @@ export default {
} else if(score >= 75) { } else if(score >= 75) {
return '良'; return '良';
} else if(score >= 60) { } else if(score >= 60) {
return '一般'; return '合格';
} }
return ''; return '不合格';
}, },
onSearchClick() { onSearchClick() {
this.listData(); this.listData();
@ -1047,9 +1050,9 @@ export default {
}).then(({ data }) => { }).then(({ data }) => {
data.forEach((item, index) => { data.forEach((item, index) => {
item.A = index + 1; item.A = index + 1;
item.F = item.E === 0 ? 0 : item.D / item.E; item.F = item.E === 0 ? 0 : (item.D / item.E).toFixed(2);
item.H = item.F * item.G; item.H = Math.min(item.F * item.G, item.D);
item.J = item.F * item.I; item.J = Math.min(item.F * item.I, item.D);
item.L = (item.K > 10 ? 10 : item.K) * 0.5; item.L = (item.K > 10 ? 10 : item.K) * 0.5;
item.S = item.R * 0.2; item.S = item.R * 0.2;
}) })

View File

@ -165,7 +165,7 @@ export default {
{ {
align: 'center', align: 'center',
title: '不合格人员数', title: '不合格人员数',
key: 'E', key: 'D',
keyName: 'signUnPassCount', keyName: 'signUnPassCount',
width: 60 width: 60
}, },

View File

@ -25,8 +25,8 @@ const router = createRouter({
// axios // axios
const createAxios = { const createAxios = {
install(app, options) { install(app, options) {
// axios.defaults.baseURL = 'http://127.0.0.1:8087/bigdata'; axios.defaults.baseURL = 'http://127.0.0.1:8087/bigdata';
axios.defaults.baseURL = '/bigdata'; // axios.defaults.baseURL = '/bigdata';
axios.defaults.timeout = 20000; axios.defaults.timeout = 20000;
app.config.globalProperties.$axios = axios; app.config.globalProperties.$axios = axios;
} }