From 5c8aaba66c16b1a143fdec27e29ad36eaefd1e3a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:33:25 +0800
Subject: [PATCH] 无源器件检验开发
---
src/components/view/b4-inspection-item-statistics.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/components/view/b4-inspection-item-statistics.vue b/src/components/view/b4-inspection-item-statistics.vue
index 3c0e4a5..5654875 100644
--- a/src/components/view/b4-inspection-item-statistics.vue
+++ b/src/components/view/b4-inspection-item-statistics.vue
@@ -10,18 +10,18 @@
<el-date-picker
v-model="time.week"
type="week"
- format="yyyy-MM-dd"
+ format="yyyy 绗� WW 鍛�"
placeholder="閫夋嫨鍛�" size="small" v-if="type=='鍛�'" @change="m=>changeTime(type,m)">
</el-date-picker>
<el-date-picker
v-model="time.month"
type="month"
- placeholder="閫夋嫨鏈�" format="yyyy-MM-dd" size="small" v-if="type=='鏈�'" @change="m=>changeTime(type,m)">
+ placeholder="閫夋嫨鏈�" size="small" v-if="type=='鏈�'" @change="m=>changeTime(type,m)">
</el-date-picker>
<el-date-picker
v-model="time.year"
type="year"
- placeholder="閫夋嫨骞�" format="yyyy-MM-dd" size="small" v-if="type=='骞�'" @change="m=>changeTime(type,m)">
+ placeholder="閫夋嫨骞�" size="small" v-if="type=='骞�'" @change="m=>changeTime(type,m)">
</el-date-picker>
</div>
<el-row :gutter="20">
@@ -310,10 +310,10 @@
case '鏈�':
const year = new Date(this.time.month).getFullYear();
const month = new Date(this.time.month).getMonth();
-
+ const day = new Date(year, month + 1, 0).getDate(); //
// 璁剧疆璧峰鏃ユ湡鍜岀粨鏉熸棩鏈�
- this.startTime = new Date(year, month, 1).toISOString().slice(0, 10); // 鏈堝垵
- this.endTime = new Date(year, month + 1, 0).toISOString().slice(0, 10); // 鏈堟湯
+ this.startTime = `${year}-${month + 1}-01`
+ this.endTime = `${year}-${month + 1}-${day}` // 鏈堟湯
break;
case '骞�':
const year0 = new Date(this.time.year).getFullYear();
@@ -324,6 +324,7 @@
}else{
this.startTime = getYearAndMonthAndDays(new Date((new Date).getTime() - 24 * 60 * 60 * 1000))
this.endTime = getYearAndMonthAndDays(new Date((new Date).getTime() + 24 * 60 * 60 * 1000 * 5))
+ this.time.week = new Date()
}
this.init()
}
--
Gitblit v1.9.3