bug and 原片

This commit is contained in:
helloDy
2024-04-25 14:43:29 +08:00
parent b8d26c87d8
commit f0105c377c
4 changed files with 191 additions and 65 deletions

View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-25 09:53:41
* @LastEditTime: 2024-04-25 14:30:44
* @LastEditors: DY
* @Description:
-->
@@ -12,11 +12,11 @@
:model="listQuery"
class="blueTip">
<el-form-item
label="月"
label="月"
prop="reportTime">
<el-date-picker
v-model="listQuery.time"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp"
type="month"
size="small"
placeholder="选择月"></el-date-picker>
@@ -94,8 +94,8 @@ export default {
now.setHours(0, 0, 0, 0)
now.setDate(1)
let startOfMonth = now.getTime()
let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = parseTime(firstDayOfMonth)
// let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = startOfMonth
},
mounted() {
this.getList();

View File

@@ -1,14 +1,14 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-24 15:28:44
* @LastEditTime: 2024-04-25 14:31:53
* @LastEditors: DY
* @Description:
-->
<template>
<div class="weekly">
<el-form :inline="true" :model="listQuery" class="blueTip">
<el-form-item>
<el-form-item label="周" prop="reportTime">
<el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
:picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
style="width: 350px" placeholder="选择周">

View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-25 09:54:39
* @LastEditTime: 2024-04-25 11:14:34
* @LastEditors: DY
* @Description:
-->
@@ -12,11 +12,11 @@
:model="listQuery"
class="blueTip">
<el-form-item
label=""
label="年份"
prop="reportTime">
<el-date-picker
v-model="listQuery.time"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp"
type="year"
size="small"
placeholder="选择年"></el-date-picker>
@@ -93,9 +93,11 @@ export default {
let now = new Date()
now.setHours(0, 0, 0, 0)
now.setDate(1)
now.setMonth(0)
let startOfMonth = now.getTime()
let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = parseTime(firstDayOfMonth)
// let firstDayOfMonth = new Date(startOfMonth)
// console.log('看看', parseTime(firstDayOfMonth))
this.listQuery.time = startOfMonth
},
mounted() {
this.getList();