mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
‘937886381’
2024-03-05 09:48:16 +08:00
parent f685a65a1f
commit a027c4ca63
13 changed files with 414 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/report/glass/day.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-24 15:15:24
* @LastEditTime: 2024-01-24 15:38:53
* @LastEditTime: 2024-03-05 09:36:28
* @LastEditors: zhp
* @Description:
-->
@@ -62,9 +62,14 @@ export default {
};
},
created() {
this.getDict()
this.getDict()
this.getTodayStartTimeAndEndTime()
},
methods: {
methods: {
getTodayStartTimeAndEndTime() {
this.reportTime = new Date()
this.changeTime(this.reportTime)
},
async getDict() {
// 产线列表
const res = await getCorePLList();

34
src/views/report/glass/month.vue
View File

@@ -59,7 +59,8 @@ export default {
all: {}
};
},
created() {
created() {
this.getCurrentMonthFirst()
this.getDict()
},
methods: {
@@ -67,7 +68,15 @@ export default {
// 产线列表
const res = await getCorePLList();
this.proLineList = res.data;
},
},
getCurrentMonthFirst() {
const date = new Date();
date.setDate(1);
this.reportTime = date
// console.log(date)
this.changeTime(date)
// console.log(date.valueOf());
},
// 获取数据列表
async getDataList() {
this.dataListLoading = true;
@@ -90,24 +99,35 @@ export default {
this.dataListLoading = false;
});
},
changeTime(val) {
changeTime(val) {
console.log(val)
if(val) {
const timeStamp = val.getMonth(); //标准时间转为时间戳，毫秒级别
const fullyear = val.getFullYear()
let days = 0
switch (timeStamp) {
case 0, 2, 4, 6, 7, 9, 11:
case 0:
case 2:
case 4:
case 6:
case 7:
case 9:
case 11:
days = 31
break
case 3, 4, 8, 10:
case 3:
case 4:
case 8:
case 10:
days = 30
break
case 1:
if ((fullyear % 400 === 0) || (fullyear() % 4 === 0 && fullyear() % 100 !== 0)) {
if ((fullyear % 400 === 0) || (fullyear % 4 === 0 && fullyear % 100 !== 0)) {
days = 29
} else {
days = 28
}
}
break
}
this.startTimeStamp = this.timeFun(new Date(fullyear, timeStamp, 1).getTime()); //开始时间
this.endTimeStamp = this.timeFun(new Date(fullyear, timeStamp, days, 23, 59, 59).getTime()); //结束时间

12
src/views/report/glass/weekly.vue
View File

@@ -93,7 +93,8 @@ export default {
},
mounted() {
// const day = new Date().getDay()
// console.log('周四', day)
// console.log('周四', day)
this.getCurrentWeekStartTimeAndEndTime()
// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
this.getDict()
},
@@ -104,7 +105,11 @@ export default {
this.proLineList = res.data;
// this.getDataList()
});
},
},
getCurrentWeekStartTimeAndEndTime() {
this.reportTime = new Date()
this.changeTime(this.reportTime)
},
// 获取数据列表
async getDataList() {
this.dataListLoading = true;
@@ -127,7 +132,8 @@ export default {
this.dataListLoading = false;
});
},
changeTime(val) {
changeTime(val) {
console.log(val);
if(val) {
let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
this.startTimeStamp = this.timeFun(timeStamp - 24 * 60 * 60 * 1000); //开始时间

20
src/views/report/glass/year.vue
View File

@@ -57,10 +57,24 @@ export default {
all: {},
};
},
created() {
created() {
this.getDict()
},
methods: {
},
mounted () {
this.getCurrentYearFirst()
;
},
methods: {
getCurrentYearFirst() {
let date = new Date();
date.setDate(1);
date.setMonth(0);
this.reportTime = date;
this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1).getTime()); //开始时间
this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间
this.listQuery.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100
},
async getDict() {
// 产线列表
const res = await getCorePLList();