From 40fee153f5c427c23b7191e8116c342b51ac6009 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 27 一月 2026 17:10:41 +0800
Subject: [PATCH] 业务管理：问题修复
---
src/views/statisticalCharts/qualificationRateStatistics/index.vue | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/src/views/statisticalCharts/qualificationRateStatistics/index.vue b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
index a1e8649..b009415 100644
--- a/src/views/statisticalCharts/qualificationRateStatistics/index.vue
+++ b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
@@ -1,19 +1,19 @@
<template>
<div class="app-container">
<el-row>
- <el-col :span="4">
- <el-radio-group v-model="dateType" @change="changeDateType">
- <el-radio-button label="1">鏈懆</el-radio-button>
- <el-radio-button label="2">鏈湀</el-radio-button>
- <el-radio-button label="3">浠婂勾</el-radio-button>
- </el-radio-group>
- </el-col>
+<!-- <el-col :span="4">-->
+<!-- <el-radio-group v-model="dateType" @change="changeDateType">-->
+<!-- <el-radio-button label="1">鏈懆</el-radio-button>-->
+<!-- <el-radio-button label="2">鏈湀</el-radio-button>-->
+<!-- <el-radio-button label="3">浠婂勾</el-radio-button>-->
+<!-- </el-radio-group>-->
+<!-- </el-col>-->
<el-col :span="20">
<el-form ref="entity" size="small" :inline="true">
<el-form-item style="width: 20%;">
- <el-date-picker v-model="datePicker" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ <el-date-picker :picker-options="pickerOptions" v-model="datePicker" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" style="width: 100%;"
- value-format="yyyy-MM-dd" @change="changeDatePicker">
+ value-format="yyyy-MM-dd" clearable @change="changeDatePicker">
</el-date-picker>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О" prop="sampleName">
@@ -25,6 +25,13 @@
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName">
<el-input v-model="supplierName" clearable placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" size="small"
@change="changeDate"></el-input>
+ </el-form-item>
+ <el-form-item label="IFS鍩�" prop="contract">
+ <el-select v-model="contract" clearable placeholder="璇烽�夋嫨IFS鍩�" size="small"
+ @change="changeDate">
+ <el-option label="ZTNS" value="ZTNS"/>
+ <el-option label="KJNS" value="KJNS"/>
+ </el-select>
</el-form-item>
</el-form>
</el-col>
@@ -108,11 +115,39 @@
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ pickerOptions: {
+ shortcuts: [{
+ text: '鏈�杩戜竴鍛�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴骞�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 365);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
dateType: '1',
datePicker: [],
beginDate: '',
endDate: '',
sampleName: '',
+ contract: '',
modelName: '',
supplierName: '',
inspectionTitle: '鍘熸潗鏂�',
@@ -405,7 +440,6 @@
sum: '',
}
},
-
mounted() {
this.setBarChartTitle();
this.getBar();
@@ -414,7 +448,28 @@
this.getPassRateCom();
this.getTableData();
},
-
+watch:{
+ datePicker:{
+ handler(newVal){
+ //璁＄畻寮�濮嬫椂闂翠笌缁撴潫鏃堕棿鐨勫ぉ鏁板樊
+ if (newVal && newVal.length === 2) {
+ const startDate = new Date(newVal[0]);
+ const endDate = new Date(newVal[1]);
+ const timeDiff = endDate - startDate;
+ const dayDiff = timeDiff / (1000 * 3600 * 24);
+ if (dayDiff <= 7) {
+ this.dateType = '1';
+ } else if (dayDiff > 7 && dayDiff <= 31) {
+ this.dateType = '2';
+ } else if (dayDiff > 31) {
+ this.dateType = '3';
+ }
+ }else{
+ this.dateType = '1';
+ }
+ }, immediate:true
+ }
+},
// 鏂规硶闆嗗悎
methods: {
// 鑾峰彇鍚堟牸鐜囧浘琛ㄦ暟鎹�
@@ -431,6 +486,7 @@
sampleName: this.sampleName,
modelName: this.modelName,
supplierName: this.supplierName,
+ contract:this.contract,
materialProp: t,
};
return getRawPassRateByBarChart(params);
@@ -489,7 +545,6 @@
let lineData = [];
let xAxis = [];
- console.log(sortedDates)
sortedDates.forEach(date => {
const { qualified, unQualified } = dateMap[date];
const total = qualified + unQualified;
@@ -505,7 +560,6 @@
this.echartsSeries[1].data = unQualifiedData;
this.echartsSeries[2].data = lineData;
this.xAxis[0].data = xAxis;
- console.log(xAxis)
});
},
@@ -527,6 +581,7 @@
sampleName: this.sampleName,
modelName: this.modelName,
supplierName: this.supplierName,
+ contract:this.contract,
materialProp: t
};
return getRawPassRateByCake(params);
@@ -635,6 +690,7 @@
sampleName: this.sampleName,
modelName: this.modelName,
supplierName: this.supplierName,
+ contract:this.contract,
materialProp: t,
};
return getMaterialPropTable(params);
--
Gitblit v1.9.3