This commit is contained in:
‘937886381’
2024-06-05 14:14:12 +08:00
parent 1e3ba8c9d0
commit 69f953fb0c
31 changed files with 1188 additions and 140 deletions

View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-05-20 13:32:59
* @LastEditTime: 2024-06-03 16:26:24
* @LastEditTime: 2024-06-05 13:43:13
* @LastEditors: zhp
* @Description:
-->
@@ -115,21 +115,25 @@ export default {
items = [
{ label: `${month}${today}日累计`,},
{ label: `去年${month}${today}日累计` },
{ label: `${month}${today}日目标`, },
];
} else if (this.period === '日' && this.than === '环比') {
items = [
{ label: `${month}${today}日累计`},
{ label: `${yesterday}日累计`},
{ label: `${yesterday}日累计` },
{ label: `${month}${today}日目标`, },
];
} else if (this.period === '周' && this.than === '同比') {
items = [
{ label: `本周累计`,},
{ label: `去年本周累计`},
{ label: `去年本周累计` },
{ label: `本周目标`, },
];
} else if (this.period === '周' && this.than === '环比') {
items = [
{ label: `本周累计`,},
{ label: `上周累计`,},
{ label: `上周累计`, },
{ label: `本周目标`, },
];
} else if (this.period === '月' && this.than === '同比') {
items = [
@@ -156,9 +160,9 @@ export default {
: (vt[1] != 0 && vt[1] != null) && vt[2] == 0
? "100%" : '0%',
subtitle =
this.period == "日" ? `${month}${today}日累计` : this.period == "周" ? `本周` : this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
this.period == "日" ? `${month}${today}日累计完成` : this.period == "周" ? `本周累计完成` : this.period == "月" ? `${month}月累计完成` : `${year}年累计完成`;
console.log(this.valueTuple[0], this.valueTuple[1], this.valueTuple[2],)
console.log(items)
console.log(this.valueTuple[2]- this.valueTuple[1])
return getOptions({
titleValue,
subtitle,
@@ -166,7 +170,7 @@ export default {
preName: items[1].label,
previousSum: this.valueTuple[0],
currentSum: this.valueTuple[1],
targetSum: this.valueTuple[2] ? this.valueTuple[2] :0 ,
targetSum: this.valueTuple[2] ? this.valueTuple[2] :0,
});
},
@@ -213,7 +217,8 @@ export default {
},
};
function calculateItems(period, valueTuple,than) {
function calculateItems(period, valueTuple, than) {
console.log('valueTuple', valueTuple);
let items = [];
var day1 = new Date();
day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
@@ -231,21 +236,25 @@ function calculateItems(period, valueTuple,than) {
items = [
{ label: `去年${month}${today}日累计`, value: valueTuple[0] },
{ label: `${month}${today}日累计`, value: valueTuple[1] },
{ label: `${month}${today}日目标`, value: valueTuple[2] },
];
} else if (period === '日' && than === '环比') {
items = [
{ label: `${yesterday}日累计`, value: valueTuple[0] },
{ label: `${month}${today}日累计`, value: valueTuple[1] },
{ label: `${month}${today}日目标`, value: valueTuple[2] },
];
} else if (period === '周' && than === '同比') {
items = [
{ label: `去年本周累计`, value: valueTuple[0] },
{ label: `本周累计`, value: valueTuple[1] },
{ label: `本周目标`, value: valueTuple[2] },
];
} else if (period === '周' && than === '环比') {
items = [
{ label: `上周累计`, value: valueTuple[0] },
{ label: `本周累计`, value: valueTuple[1] },
{ label: `本周目标`, value: valueTuple[2] },
];
} else if (period === '月' && than === '同比') {
items = [