diff --git a/src/views/warehouse/WmsImportResult/ItemAnalysis.vue b/src/views/warehouse/WmsImportResult/ItemAnalysis.vue
index afc4081..f60a257 100644
--- a/src/views/warehouse/WmsImportResult/ItemAnalysis.vue
+++ b/src/views/warehouse/WmsImportResult/ItemAnalysis.vue
@@ -64,7 +64,7 @@
-
数据范围: {{ props.dateRange.start_date }} 至 {{ props.dateRange.end_date }}
+
数据范围: {{ currentStartDate }} 至 {{ currentEndDate }}
总计机台数: {{ workbenchData.length }}
@@ -92,12 +92,9 @@ const props = defineProps({
type: Array,
default: () => []
},
- dateRange: {
- type: Object,
- default: () => ({
- start_date: '',
- end_date: ''
- })
+ selectedTimeRange: {
+ type: String,
+ default: '近1年'
}
})
@@ -114,6 +111,10 @@ const analysisResult = ref('')
// 机台不良数据
const workbenchData = ref([])
+// 当前查询的日期范围
+const currentStartDate = ref('')
+const currentEndDate = ref('')
+
// 项目名称列表
const itemList = ref([
'漆膜厚度',
@@ -154,15 +155,13 @@ async function handleFetchData() {
const endDate = new Date();
const startDate = new Date();
- if (props.dateRange.end_date) {
- // 如果有传入日期范围,使用传入的日期
- const endParts = props.dateRange.end_date.split('-');
- const startParts = props.dateRange.start_date.split('-');
- endDate.setFullYear(parseInt(endParts[0]), parseInt(endParts[1])-1, parseInt(endParts[2]));
- startDate.setFullYear(parseInt(startParts[0]), parseInt(startParts[1])-1, parseInt(startParts[2]));
- } else {
- // 否则使用默认的近一年时间
+ // 根据选择的时间范围计算日期
+ if (props.selectedTimeRange === '近1年') {
startDate.setFullYear(endDate.getFullYear() - 1);
+ } else if (props.selectedTimeRange === '近2年') {
+ startDate.setFullYear(endDate.getFullYear() - 2);
+ } else if (props.selectedTimeRange === '近3年') {
+ startDate.setFullYear(endDate.getFullYear() - 3);
}
// 格式化日期为 YYYY-MM-DD
@@ -175,6 +174,10 @@ async function handleFetchData() {
const startDateStr = formatDate(startDate);
const endDateStr = formatDate(endDate);
+
+ // 保存当前查询的日期范围
+ currentStartDate.value = startDateStr;
+ currentEndDate.value = endDateStr;
// 调用机台不良分布API
try {
@@ -209,7 +212,7 @@ async function handleAnalyzeItem() {
const prompt = `请对以下质检项目和机台不良分布进行详细分析:
项目名称: ${analysisForm.selectedItem}
-数据范围: ${props.dateRange.start_date} 至 ${props.dateRange.end_date}
+数据范围: ${currentStartDate.value} 至 ${currentEndDate.value}
帕累托分析数据:
${selectedItemData ?
diff --git a/src/views/warehouse/WmsImportResult/ParetoAnalysis.vue b/src/views/warehouse/WmsImportResult/ParetoAnalysis.vue
index d3d60ed..3906342 100644
--- a/src/views/warehouse/WmsImportResult/ParetoAnalysis.vue
+++ b/src/views/warehouse/WmsImportResult/ParetoAnalysis.vue
@@ -71,7 +71,6 @@