diff --git a/src/views/statistics/bxerp/workHoursRY.vue b/src/views/statistics/bxerp/workHoursRY.vue
index d6fab545..2178302a 100644
--- a/src/views/statistics/bxerp/workHoursRY.vue
+++ b/src/views/statistics/bxerp/workHoursRY.vue
@@ -49,6 +49,26 @@
@click="handleQuery"
>
+
+
+
+
+
+
+
@@ -402,6 +422,96 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.暗点不合格.含}}
+ 0
+
+
+
+
+ {{((scope.row.暗点不合格.含/scope.row.总切片数)*100).toFixed(2) }}%
+ 0%
+
+
+
+
+ {{scope.row['放大率¢16mm不合格'].含}}
+ 0
+
+
+
+
+ {{((scope.row['放大率¢16mm不合格'].含/scope.row.总切片数)*100).toFixed(2) }}%
+ 0%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.暗点不合格.含}}
+ 0
+
+
+
+
+ {{((scope.row.暗点不合格.含/scope.row.总切片数)*100).toFixed(2) }}%
+ 0%
+
+
+
+
+ {{scope.row['放大率¢16mm不合格'].含}}
+ 0
+
+
+
+
+ {{((scope.row['放大率¢16mm不合格'].含/scope.row.总切片数)*100).toFixed(2) }}%
+ 0%
+
+
+
+
+
+
@@ -432,6 +542,9 @@ export default {
time_gte:'',
time_lte:'',
},
+ query2:{
+ process_name:'压板出炉',
+ },
query:{
end_date:'',
start_date:'',
@@ -440,6 +553,7 @@ export default {
mgruops:[],
tableData:[],
detailRow:[],
+ processList:['装模','装炉','压板出炉','脱膜测量'],
params:{cate:'热压'},
apiObj1: this.$API.wpm.wpr.query,
apiObj: this.$API.mtm.process.list,
@@ -455,15 +569,22 @@ export default {
getData(){
let that = this;
let params = {};
- params.query = that.query;
let biStr = '';
if(that.activeName=='luhao'){
+ params.query = that.query;
biStr = 'product_defect_equip_bdgy';
params.query.select_cols = ",ls.板段编号列表,ls.切片编号列表";
}else if(that.activeName=='muju'){
+ params.query = that.query;
biStr = 'product_defect_model';
params.query.select_cols = "";
+ }else if(that.activeName=='gongxu'){
+ params.query = that.query2;
+ biStr = 'product_defect_reya';
+ }else if(that.activeName=='total'){
+ biStr = 'product_defect_sg';
}
+ console.log('params',params);
that.$API.bi.dataset.exec.req(biStr, params).then((res) => {
let data = res.data2.ds0;
data.forEach(item=>{
@@ -528,7 +649,7 @@ export default {
console.log('e.props.name',e.props.name);
this.activeName = e.props.name;
this.showTable=false;
- if(e.props.name=='luhao'||e.props.name=='muju'){
+ if(e.props.name=='luhao'||e.props.name=='muju'||e.props.name=='gongxu'||e.props.name=='total'){
this.getData();
}
},