fix:禅道298

src/views/statistics/bxerp/workHoursRY.vue

@@ -49,6 +49,26 @@
 					@click="handleQuery"
 				></el-button>
 			</div>
+			<div class="right-panel" v-if="activeName=='gongxu'">
+				<el-select
+					v-model="query2.process_name"
+					placeholder="选择工序"
+					clearable
+					filterable
+				>
+					<el-option
+						v-for="item in processList"
+						:key="item"
+						:label="item"
+						:value="item">
+					</el-option>
+				</el-select>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
 		</el-header>
 		<el-main class="nopadding">
 			<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" style="height: 100%;" lazy>
@@ -402,6 +422,96 @@
 						</el-main>
 					</el-container>
 				</el-tab-pane>
+				<el-tab-pane name="gongxu" label="工序统计" style="height: 100%;">
+					<el-container v-if="activeName=='gongxu'">
+						<el-main>
+							<scTable
+							   v-if="showTable"
+								ref="table5"
+								:data="tableData"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="操作人" prop="员工">
+								</el-table-column>
+								<el-table-column label="总数" prop="总切片数">
+								</el-table-column>
+								<el-table-column label="长点">
+									<template #default="scope">
+										<span v-if="scope.row.暗点不合格">{{scope.row.暗点不合格.含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="长点率">
+									<template #default="scope">
+										<span v-if="scope.row.暗点不合格">{{((scope.row.暗点不合格.含/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>0%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="放大率不合格">
+									<template #default="scope">
+										<span v-if="scope.row['放大率￠16mm不合格']">{{scope.row['放大率￠16mm不合格'].含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="放大率不合格占比">
+									<template #default="scope">
+										<span v-if="scope.row['放大率￠16mm不合格']">{{((scope.row['放大率￠16mm不合格'].含/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>0%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="total" label="总统计" style="height: 100%;">
+					<el-container v-if="activeName=='total'">
+						<el-main>
+							<scTable
+							   v-if="showTable"
+								ref="table4"
+								:data="tableData"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="丝高" prop="丝高">
+								</el-table-column>
+								<el-table-column label="总数" prop="总切片数">
+								</el-table-column>
+								<el-table-column label="长点">
+									<template #default="scope">
+										<span v-if="scope.row.暗点不合格">{{scope.row.暗点不合格.含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="长点率">
+									<template #default="scope">
+										<span v-if="scope.row.暗点不合格">{{((scope.row.暗点不合格.含/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>0%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="放大率不合格">
+									<template #default="scope">
+										<span v-if="scope.row['放大率￠16mm不合格']">{{scope.row['放大率￠16mm不合格'].含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="放大率不合格占比">
+									<template #default="scope">
+										<span v-if="scope.row['放大率￠16mm不合格']">{{((scope.row['放大率￠16mm不合格'].含/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>0%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
 			</el-tabs>
 		</el-main>
 		<el-drawer v-model="visible" :title="userName+'板段列表'" size="50%" direction="rtl" append-to-body destroy-on-close>
@@ -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();
 			}
 		},