hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'report-master'

Browse Source
This commit is contained in:
BOE\10867418
2023-09-13 17:19:21 +08:00
parent 0206adf740 6c4b36fbf3
commit 2781b8f277
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/report/Operational.vue
View File

@@ -1632,7 +1632,8 @@ export default {
// const monthEnd = dayjs(new Date()).endOf("year").format("YYYY-MM"); // const monthEnd = dayjs(new Date()).endOf("year").format("YYYY-MM");
var year = dayjs(new Date()).year(); var year = dayjs(new Date()).year();
var month = dayjs(new Date()).month()+1; var month = dayjs(new Date()).month()+1;
console.log("initTime year:",year,"month:",month); var day = dayjs(new Date()).date();
console.log("initTime year:",year,"month:",month,"day:",day);
var year1 = year; var year1 = year;
var month1 = parseInt(month) - 5; var month1 = parseInt(month) - 5;
if(month1<=0){ if(month1<=0){
@@ -1646,9 +1647,9 @@ export default {
state.threeTime = [dayjs(start), dayjs(monthEnd)]; state.threeTime = [dayjs(start), dayjs(monthEnd)];
state.forTime = [dayjs(start), dayjs(monthEnd)]; state.forTime = [dayjs(start), dayjs(monthEnd)];
state.towParmasn.time = [dayjs(start), dayjs(monthEnd)]; state.towParmasn.time = [dayjs(start), dayjs(monthEnd)];
state.towParmasn.day = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)]; state.towParmasn.day = [dayjs( year + "-" + month + "-" + day ), dayjs( year + "-" + month + "-" + day )];
state.threeDay = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)]; state.threeDay = [dayjs( year + "-" + month + "-" + day ), dayjs( year + "-" + month + "-" + day )];
state.forDay = [dayjs( year + "-" + month + "-" + "01" ), dayjs(monthEnd)]; state.forDay = [dayjs( year + "-" + month + "-" + day ), dayjs( year + "-" + month + "-" + day )];
leftMonthChange([dayjs(start), dayjs(monthEnd)]); leftMonthChange([dayjs(start), dayjs(monthEnd)]);
rightMonthChange([dayjs(start), dayjs(monthEnd)]); rightMonthChange([dayjs(start), dayjs(monthEnd)]);
twoMonthChange([dayjs(start), dayjs(monthEnd)]); twoMonthChange([dayjs(start), dayjs(monthEnd)]);