From 41db9a55f1c3afe1f6fde12a32fdaa3dede68e1a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 10 Feb 2026 09:49:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=92=E6=9D=BF=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=92=8C=E7=83=AD=E5=8E=8B=E7=BB=9F=E8=AE=A1=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/workHoursPB.vue   | 592 +++++++++++++++++++
 src/views/statistics/bxerp/workHoursRY.vue   | 478 +++++++++++++++
 src/views/statistics/bxerp/workerTimesRY.vue | 139 -----
 3 files changed, 1070 insertions(+), 139 deletions(-)
 create mode 100644 src/views/statistics/bxerp/workHoursPB.vue
 create mode 100644 src/views/statistics/bxerp/workHoursRY.vue
 delete mode 100644 src/views/statistics/bxerp/workerTimesRY.vue

diff --git a/src/views/statistics/bxerp/workHoursPB.vue b/src/views/statistics/bxerp/workHoursPB.vue
new file mode 100644
index 00000000..c4d8f2ba
--- /dev/null
+++ b/src/views/statistics/bxerp/workHoursPB.vue
@@ -0,0 +1,592 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel">
+                <el-date-picker
+					v-model="query.start_date"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.end_date"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<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="tabsClick" style="height: 100%;" lazy>
+				<el-tab-pane name="paiban" label="统计1" style="height: 100%;" :key="tabKey">
+					<el-container v-if="activeName=='paiban'">
+						<el-main>
+							<scTable
+								ref="table"
+								:data="tableData"
+								id="exportDiv"
+								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="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="总数">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
+										<span v-else @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总生产数 }}</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>
+									</template>
+								</el-table-column>
+								<el-table-column label="剪切加工率">
+									<template #default="scope">
+										<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>100%</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>{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="加工率">
+									<template #default="scope">
+										<span>{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+									<template #default="scope">
+										<span>{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+							<el-drawer v-model="visible" :title="userName+'板段列表'" size="50%" direction="rtl" append-to-body destroy-on-close>
+								<el-card shadow="never">
+									<div v-for="(item,index) in detailRow" :key="item" style="height:22px;border-bottom: 1px solid #efefef;">
+										<span style="margin-right:10px;width: 18px;display: inline-block;">{{ index+1 }} </span>
+										{{ item }}
+									</div>
+								</el-card>
+							</el-drawer>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="paiban2" label="统计2" style="height: 100%;" :key="tabKey">
+					<el-container v-if="activeName=='paiban2'">
+						<el-main>
+							<scTable
+								ref="table"
+								:data="tableData"
+								id="exportDiv"
+								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="总数">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
+										<span v-else @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总生产数 }}</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>
+									</template>
+								</el-table-column>
+								<el-table-column label="剪切加工率">
+									<template #default="scope">
+										<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>100%</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>{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="加工率">
+									<template #default="scope">
+										<span>{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+									<template #default="scope">
+										<span>{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+							<el-drawer v-model="visible" :title="userName+'板段列表'" size="50%" direction="rtl" append-to-body destroy-on-close>
+								<el-card shadow="never">
+									<div v-for="(item,index) in detailRow" :key="item" style="height:22px;border-bottom: 1px solid #efefef;">
+										<span style="margin-right:10px;width: 18px;display: inline-block;">{{ index+1 }} </span>
+										{{ item }}
+									</div>
+								</el-card>
+							</el-drawer>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="houzhui1" label="板段统计1" style="height: 100%;" :key="tabKey">
+					<el-container v-if="activeName=='houzhui1'">
+						<el-main>
+							<scTable
+								ref="table"
+								:data="tableData"
+								id="exportDiv"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="员工" prop="员工" :filters="userFilters" :filter-method="filterUser" filter-placement="bottom-end" >
+								</el-table-column>
+								<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="切片后缀" prop="切片后缀" :filters="houzhuiFilters" :filter-method="filterHouzhui" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="总数">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
+										<span v-else @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总生产数 }}</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>
+									</template>
+								</el-table-column>
+								<el-table-column label="剪切加工率">
+									<template #default="scope">
+										<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>100%</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>{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="加工率">
+									<template #default="scope">
+										<span>{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+									<template #default="scope">
+										<span>{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="houzhui2" label="板段统计2" style="height: 100%;" :key="tabKey">
+					<el-container v-if="activeName=='houzhui2'">
+						<el-main>
+							<scTable
+								ref="table"
+								:data="tableData"
+								id="exportDiv"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="员工" prop="员工" :filters="userFilters" :filter-method="filterUser" filter-placement="bottom-end" >
+								</el-table-column>
+								<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="切片后缀" prop="切片后缀" :filters="houzhuiFilters" :filter-method="filterHouzhui" filter-placement="bottom-end">
+								</el-table-column>
+								<el-table-column label="总数">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
+										<span v-else @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总生产数 }}</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>
+									</template>
+								</el-table-column>
+								<el-table-column label="剪切加工率">
+									<template #default="scope">
+										<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
+										<span v-else>100%</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>{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="加工率">
+									<template #default="scope">
+										<span>{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+									<template #default="scope">
+										<span>{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+			</el-tabs>
+		</el-main>
+		<el-drawer v-if="visible&&(activeName=='paiban'||activeName=='paiban2')" :title="userName+'板段列表'" size="50%" direction="rtl" append-to-body destroy-on-close>
+			<el-card shadow="never">
+				<div v-for="(item,index) in detailRow" :key="item" style="height:22px;border-bottom: 1px solid #efefef;">
+					<span style="margin-right:10px;width: 18px;display: inline-block;">{{ index+1 }} </span>
+					{{ item }}
+				</div>
+			</el-card>
+		</el-drawer>
+		<el-container v-if="visible&&(activeName=='houzhui1'||activeName=='houzhui2')" style="height:100%;overflow-y: scroll;">
+			<el-main class="nopadding">
+				<div style="padding: 10px;">
+					<div style="height: 35px;font-size: 18px;">
+						<span>{{ userName }}-{{ banduanNum }}板段列表 </span>
+						<el-button type="primary" style="position: absolute;right: 20px;" @click="listClose">关闭</el-button>
+					</div>
+					<div v-for="(item,index) in detailRow" :key="item" style="display: inline-block;width:150px;margin-bottom: 5px;">
+						<span style="margin-right:10px;display: inline-block;">{{ index+1 }}、{{ item }} </span>
+					</div>
+				</div>
+			</el-main>
+		</el-container>
+	</el-container>
+</template>
+<script>
+export default {
+	name: "workHoursPB",
+	data() {
+		return {
+			tabKey: 0,
+			visible:false,
+			userName:'',
+			banduanNum:'',
+			activeName:'paiban',
+			query:{
+				end_date:'',
+                mgroup_name:'排板',
+				start_date:'',
+  				select_cols: ", ls.产品编号列表, ls.切片编号列表"
+			},
+			tableData:[],
+			detailRow:[],
+			nameFilters:[],
+			userFilters:[],
+			houzhuiFilters:[],
+		};
+	},
+    mounted() {
+        let that = this;
+        let date = new Date();
+		that.query.end_date = that.$TOOL.dateFormat2(date);
+		that.query.start_date =  that.query.end_date.split('-')[0] + '-' + that.query.end_date.split('-')[1] + '-01';
+		that.getData1();
+		that.activeName = 'paiban';
+	},
+	methods: {
+        getData1(){
+             let that = this;
+			let nameList = [],names = [];
+            let params = {};
+            params.query = that.query;
+			that.$API.bi.dataset.exec.req('product_defect_pb_m', params).then((res) => {
+				let data = res.data2.ds0;
+				data.forEach(item=>{
+					if(names.indexOf(item.物料名)>-1){}else{
+						names.push(item.物料名);
+						nameList.push({text:item.物料名,value:item.物料名})
+					}
+					if(item.缺陷分布!==null){
+						let defect = JSON.parse(item.缺陷分布);
+						for(let key in defect){
+							item[key]=defect[key];
+						}
+					}
+					item.长点数 = item.暗点不合格?item.暗点重?item.暗点不合格.含 + item.暗点重.含:item.暗点不合格.含:item.暗点重?item.暗点重.含:0;
+					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
+					let count_hgls = item.暗点合格?item.暗点合格.含:0;
+					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
+						}
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点重']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点重'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm不合格+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm不合格+暗点合格'];
+						}
+					}
+					item.加工率数 = count1;//总数-暗点不合格.含-暗点重.含-剪切不合格.含+两个组合数；
+					item.合格率数 = count_hgls;//：在暗点合格含里刨除剪切可加工和剪切不合格
+				})
+				that.$nextTick(() => {
+                  	that.nameFilters = nameList;
+					that.tableData = data;
+                })
+			});
+        },
+		getData2(){
+            let that = this;
+            let params = {};
+            params.query = that.query;
+			that.$API.bi.dataset.exec.req('prodect_defect_pb1', params).then((res) => {
+				let data = res.data2.ds0;
+				data.forEach(item=>{
+					if(item.缺陷分布!==null){
+						let defect = JSON.parse(item.缺陷分布);
+						for(let key in defect){
+							item[key]=defect[key];
+						}
+					}
+					item.长点数 = item.暗点不合格?item.暗点重?item.暗点不合格.含 + item.暗点重.含:item.暗点不合格.含:item.暗点重?item.暗点重.含:0;
+					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
+					let count_hgls = item.暗点合格?item.暗点合格.含:0;
+					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
+						}
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点重']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点重'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm不合格+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm不合格+暗点合格'];
+						}
+					}
+					item.加工率数 = count1;
+					item.合格率数 = count_hgls;
+				})
+				that.$nextTick(() => {
+					that.tableData = data;
+                })
+			});
+        },
+		getData3(){
+            let that = this;
+            let params = {};
+			let userList = [],users = [];
+			let nameList = [],names = [];
+			let houzhuiList = [],houzhuis=[];
+            params.query = that.query;
+			that.$API.bi.dataset.exec.req('product_defect_pb_hz_m', params).then((res) => {
+				let data = res.data2.ds0;
+				data.forEach(item=>{
+					if(users.indexOf(item.员工)>-1){}else{
+						users.push(item.员工);
+						userList.push({text:item.员工,value:item.员工})
+					}
+					if(names.indexOf(item.物料名)>-1){}else{
+						names.push(item.物料名);
+						nameList.push({text:item.物料名,value:item.物料名})
+					}
+					if(houzhuis.indexOf(item.切片后缀)>-1){}else{
+						houzhuis.push(item.切片后缀);
+						houzhuiList.push({text:item.切片后缀,value:item.切片后缀})
+					}
+					if(item.缺陷分布!==null){
+						let defect = JSON.parse(item.缺陷分布);
+						for(let key in defect){
+							item[key]=defect[key];
+						}
+					}
+					item.长点数 = item.暗点不合格?item.暗点重?item.暗点不合格.含 + item.暗点重.含:item.暗点不合格.含:item.暗点重?item.暗点重.含:0;
+					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
+					let count_hgls = item.暗点合格?item.暗点合格.含:0;
+					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
+						}
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点重']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点重'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm不合格+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm不合格+暗点合格'];
+						}
+					}
+					item.加工率数 = count1;
+					item.合格率数 = count_hgls;
+				})
+				 that.$nextTick(() => {
+                  	that.userFilters = userList;
+                  	that.nameFilters = nameList;
+					that.houzhuiFilters = houzhuiList;
+					that.tableData = data;
+                })
+			});
+        },
+		getData4(){
+            let that = this;
+            let params = {};
+			let userList = [],users = [];
+			let houzhuiList = [],houzhuis=[];
+            params.query = that.query;
+			that.$API.bi.dataset.exec.req('product_defect_pb_hz1', params).then((res) => {
+				let data = res.data2.ds0;
+				data.forEach(item=>{
+					if(users.indexOf(item.员工)>-1){}else{
+						users.push(item.员工);
+						userList.push({text:item.员工,value:item.员工})
+					}
+					if(houzhuis.indexOf(item.切片后缀)>-1){}else{
+						houzhuis.push(item.切片后缀);
+						houzhuiList.push({text:item.切片后缀,value:item.切片后缀})
+					}
+					if(item.缺陷分布!==null){
+						let defect = JSON.parse(item.缺陷分布);
+						for(let key in defect){
+							item[key]=defect[key];
+						}
+					}
+					item.长点数 = item.暗点不合格?item.暗点重?item.暗点不合格.含 + item.暗点重.含:item.暗点不合格.含:item.暗点重?item.暗点重.含:0;
+					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
+					let count_hgls = item.暗点合格?item.暗点合格.含:0;
+					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
+						}
+						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点重']){
+							count1 = count1 + item['剪切￠18.3mm不合格+暗点重'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格'];
+						}
+						if(item['剪切￠18.3mm可加工'].组['剪切￠18.3mm不合格+暗点合格']){
+							count_hgls = count_hgls - item['剪切￠18.3mm不合格+暗点合格'];
+						}
+					}
+					item.加工率数 = count1;
+					item.合格率数 = count_hgls;
+				})
+				 that.$nextTick(() => {
+                  	that.userFilters = userList;
+					that.houzhuiFilters = houzhuiList;
+					that.tableData = data;
+                })
+			});
+        },
+		filterName(value, row) {
+			return row.物料名 == value;
+		},
+		filterUser(value, row) {
+			return row.员工 == value;
+		},
+		filterHouzhui(value, row) {
+			return row.切片后缀 == value;
+		},
+		handleClick(row){
+			let that = this;
+			that.detailRow = [];
+			that.userName = row.员工;
+			that.banduanNum = row.切片后缀;
+			that.detailRow = row.切片编号列表;
+			that.visible = true;
+		},
+		listClose(){
+			let that = this;
+			that.visible = false;
+			that.detailRow = [];
+		},
+		tabsClick(tab){
+			let that = this;
+			this.tableData = [];
+			this.activeName = tab.props.name;
+			this.$nextTick(() => {
+				that.tabKey++;
+				if(that.activeName==='paiban'){
+					that.query.select_cols = ", ls.产品编号列表, ls.切片编号列表";
+					that.getData1();
+				}else if(that.activeName==='paiban2'){
+					that.query.select_cols = ", ep.总生产数, ep.切片编号列表";
+					that.getData2();
+				}else if(that.activeName==='houzhui1'){
+					that.query.select_cols = ", ls.产品编号列表, ls.切片编号列表";
+					that.getData3();
+				}else if(that.activeName==='houzhui2'){
+					that.query.select_cols = ", ep.总生产数, ep.切片编号列表";
+					that.getData4();
+				}
+			});
+		},
+		handleQuery(){
+			let that = this;
+			if(that.activeName==='paiban'){
+				that.getData1();
+			}else if(that.activeName==='paiban2'){
+				that.getData2();
+			}else if(that.activeName==='houzhui1'){
+				that.getData3();
+			}else if(that.activeName==='houzhui2'){
+				that.getData4();
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/workHoursRY.vue b/src/views/statistics/bxerp/workHoursRY.vue
new file mode 100644
index 00000000..f15ee8b4
--- /dev/null
+++ b/src/views/statistics/bxerp/workHoursRY.vue
@@ -0,0 +1,478 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel" v-if="activeName=='product'||activeName=='test'">
+				<el-date-picker
+					v-model="query1.time_gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query1.time_lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<el-input v-model="query1.number_contains" 
+					placeholder="板号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery1"
+				></el-button>
+			</div>
+			<div class="right-panel" v-if="activeName=='luhao'">
+                <el-date-picker
+					v-model="query.start_date"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.end_date"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<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>
+				<el-tab-pane name="product" label="生产数据" style="height: 100%;">
+					<el-container v-if="activeName=='product'">
+						<el-main>
+							<scTable
+							    v-if="activeName=='product'"
+								ref="table1"
+								:apiObj="apiObj1"
+								:params="params1"
+								:query="params1"
+								row-key="id"
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="日期" fixed="left" width="100">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_日期?scope.row.data.装炉压板出炉_日期:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="板号" prop="number" fixed="left">	
+								</el-table-column>
+								<el-table-column label="压前对边" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_对边?scope.row.data.排板_检测项_对边:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="模具号" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装模_检测项_模具号?scope.row.data.装模_检测项_模具号:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="对模具人" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装模_操作人?scope.row.data.装模_操作人:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="丝高" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="炉号" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_设备编号?scope.row.data.装炉压板出炉_设备编号:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="装炉人" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_装炉_操作人?scope.row.data.装炉压板出炉_装炉_操作人:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压板温度" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_操作项_温度?scope.row.data.装炉压板出炉_操作项_温度:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压力" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_操作项_压力?scope.row.data.装炉压板出炉_操作项_压力:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="下压刻度" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_操作项_刻度?scope.row.data.装炉压板出炉_操作项_刻度:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压板用时" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_操作项_压板用时?scope.row.data.装炉压板出炉_操作项_压板用时:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压板人" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_压板出炉_操作人?scope.row.data.装炉压板出炉_压板出炉_操作人:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压后上边" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.脱膜测量_检测项_对边上?scope.row.data.脱膜测量_检测项_对边上:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压后下边" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.脱膜测量_检测项_对边下?scope.row.data.脱膜测量_检测项_对边下:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压后伸长" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.脱膜测量_检测项_伸长?scope.row.data.脱膜测量_检测项_伸长:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="日期" align="center" width="100">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_压板出炉_日期?scope.row.data.装炉压板出炉_压板出炉_日期:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="备注" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_备注 }}</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="test" label="检测数据" style="height: 100%;">
+					<el-container v-if="activeName=='test'">
+						<el-main>
+							<scTable
+								ref="table2"
+								:apiObj="apiObj1"
+								:params="params1"
+								:query="params1"
+								row-key="id"
+								stripe
+							>
+								<el-table-column label="序号" type="index" width="50"  fixed="left"/>
+								<el-table-column label="板号" prop="number" fixed="left">
+								</el-table-column>
+								<el-table-column label="炉号" prop="number" fixed="left">
+								</el-table-column>
+								<el-table-column label="放大率￠16mm" align="center" class-name="colorheader1">
+									<el-table-column label="差值" class-name="colorheader1">
+										<template #default="scope">
+											<span>{{ scope.row.data.毛坯检测_检测项_放大率16mm }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="合格数" class-name="colorheader1">
+										<template #default="scope">
+											<span>{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']?0:1 }}</span>
+										</template>
+									</el-table-column>
+								</el-table-column>
+								<el-table-column label="剪切￠18.3mm" align="center" class-name="colorheader2">
+									<el-table-column label="剪切" class-name="colorheader2">
+										<template #default="scope">
+											<span>{{ scope.row.data.毛坯检测_检测项_剪切18mm }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="剪切值" class-name="colorheader2">
+										<template #default="scope">
+											<span>{{ scope.row.data.毛坯检测_检测项_剪切值18mm }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="合格数" class-name="colorheader2">
+										<template #default="scope">
+											<span>{{ !scope.row.data['毛坯检测_缺陷项_剪切￠18.3mm不合格']&&!scope.row.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0 }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="可加工" class-name="colorheader2">
+										<template #default="scope">
+											<span>{{ scope.row.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0 }}</span>
+										</template>
+									</el-table-column>
+								</el-table-column>
+								<el-table-column label="暗点" align="center" class-name="colorheader3">
+									<el-table-column label="内标合格" class-name="colorheader3">
+										<template #default="scope">
+											<span>{{scope.row.data.毛坯检测_缺陷项_暗点合格?scope.row.data.毛坯检测_缺陷项_暗点合格:0 }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="长点不合格" class-name="colorheader3">
+										<template #default="scope">
+											<span>{{scope.row.data.毛坯检测_缺陷项_暗点不合格?scope.row.data.毛坯检测_缺陷项_暗点不合格:0 }}</span>
+										</template>
+									</el-table-column>
+								</el-table-column>
+								<el-table-column label="崩炸" align="center" class-name="colorheader4">
+									<el-table-column label="轻" align="center" class-name="colorheader4">
+										<template #default="scope">
+											<span>{{scope.row.data.毛坯检测_缺陷项_花朵?scope.row.data.毛坯检测_缺陷项_花朵:0 }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="重" align="center" class-name="colorheader4">
+										<template #default="scope">
+											<span>{{scope.row.data.毛坯检测_缺陷项_花朵重?scope.row.data.毛坯检测_缺陷项_花朵重:0 }}</span>
+										</template>
+									</el-table-column>
+								</el-table-column>
+								<el-table-column label="扭后内质" align="center" class-name="colorheader5">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_对边==undefined?scope.row.data.排板_检测项_对边:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网" align="center" class-name="colorheader6">
+									<template #default="scope">
+										<span>{{ scope.row.data.装模_检测项_模具号==undefined?scope.row.data.装模_检测项_模具号:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="白网" align="center" class-name="colorheader7">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:0 }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="板号" prop="number" class-name="colorheader1">
+								</el-table-column>
+								<el-table-column label="丝高" align="center" class-name="colorheader2">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="丝长" align="center" class-name="colorheader3">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="对模具人" align="center" class-name="colorheader4">
+									<template #default="scope">
+										<span>{{ scope.row.data.装模_操作人?scope.row.data.装模_操作人:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="日期" align="center" class-name="colorheader5">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_压板出炉_日期?scope.row.data.装炉压板出炉_压板出炉_日期:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="装炉人" align="center" class-name="colorheader6">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_装炉_操作人?scope.row.data.装炉压板出炉_装炉_操作人:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压板用时" align="center" class-name="colorheader7">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_操作项_压板用时?scope.row.data.装炉压板出炉_操作项_压板用时:0 }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="压板人" align="center" class-name="colorheader1">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_压板出炉_操作人?scope.row.data.装炉压板出炉_压板出炉_操作人:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="炉号" align="center" class-name="colorheader2">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_设备编号?scope.row.data.装炉压板出炉_设备编号:''}}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="模具号" align="center" class-name="colorheader3">
+									<template #default="scope">
+										<span>{{ scope.row.data.装模_检测项_模具号?scope.row.data.装模_检测项_模具号:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="备注" align="center" class-name="colorheader4">
+									<template #default="scope">
+										<span>{{ scope.row.data.装炉压板出炉_备注 }}</span>
+									</template>
+								</el-table-column>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="luhao" label="炉号统计" style="height: 100%;">
+					<el-container v-if="activeName=='luhao'">
+						<el-main>
+							<scTable
+							   v-if="showTable"
+								ref="table3"
+								: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="总数">
+									<template #default="scope">
+										<span v-if="scope.row.总切片数" @click="handleNumClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
+										<span v-else @click="handleNumClick(scope.row)" style="color:#0052d9;">{{ scope.row.总生产数 }}</span>
+									</template>
+								</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>
+			<el-card shadow="never">
+				<div v-for="(item,index) in detailRow" :key="item" style="height:22px;border-bottom: 1px solid #efefef;">
+					<span style="margin-right:10px;width: 18px;display: inline-block;">{{ index+1 }} </span>
+					{{ item }}
+				</div>
+			</el-card>
+		</el-drawer>
+	</el-container>
+</template>
+<script>
+export default {
+	name: "workHoursRY",
+	data() {
+		return {
+			visible:false,
+			showTable:false,
+			userName:'',
+			activeName: 'product',
+			params1: {
+				ordering:'data__装炉压板出炉_批次号',
+				querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"装炉压板出炉_批次号"}]],
+			},
+			query1:{
+				number_contains:'',
+				time_gte:'',
+				time_lte:'',
+			},
+			query:{
+				end_date:'',
+				start_date:'',
+  				select_cols: ",ls.板段编号列表,ls.切片编号列表"
+			},
+			mgruops:[],
+			tableData:[],
+			detailRow:[],
+			params:{cate:'热压'},
+			apiObj1: this.$API.wpm.wpr.query,
+			apiObj: this.$API.mtm.process.list,
+		};
+	},
+    mounted() {
+        let that = this;
+        let date = new Date();
+        that.query.end_date = that.$TOOL.dateFormat2(date);
+		that.query.start_date =  that.query.end_date.split('-')[0] + '-' + that.query.end_date.split('-')[1] + '-01';
+    },
+	methods: {
+        getData(){
+            let that = this;
+            let params = {};
+            params.query = that.query;
+			that.$API.bi.dataset.exec.req('product_defect_equip_bdgy', params).then((res) => {
+				let data = res.data2.ds0;
+				data.forEach(item=>{
+					if(item.缺陷分布!==null){
+						let defect = JSON.parse(item.缺陷分布);
+						for(let key in defect){
+							item[key]=defect[key];
+						}
+					}
+				})
+				that.tableData = data;
+				that.showTable=true;
+			});
+        },
+		handleQuery1(){
+			let that = this;
+			let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"装炉压板出炉_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__装炉压板出炉_批次号';
+			obj.value = that.query.number_contains;
+			obj.compare = '';
+
+			obj1.field = 'data__装炉压板出炉_日期';
+			obj1.value = that.query.time_gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'data__装炉压板出炉_日期';
+			obj2.value = that.query.time_lte;
+			obj2.compare = 'lte';
+			if(that.query.number_contains!==''&&that.query.number_contains!==null){
+				querys[0].push(obj);
+			}
+			if(that.query.time_gte!==''&&that.query.time_gte!==null){
+				querys[0].push(obj1);
+			}
+			if(that.query.time_lte!==''&&that.query.time_lte!==null){
+				querys[0].push(obj2);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		deptChange(){
+			this.getData();
+		},
+		filterName(value, row) {
+			return row.物料名 == value;
+		},
+		handleClick(e){
+			console.log('e.props.name',e.props.name)
+			this.query1.time_gte = '';
+			this.query1.time_lte = '';
+			this.query1.number_contains = '';
+			this.showTable=false;
+			if(e.props.name=='luhao'){
+				this.getData();
+			}
+		},
+		handleNumClick(row){
+			let that = this;
+			that.userName = row.设备编号;
+			that.visible = true;
+			that.detailRow = row.切片编号列表;
+		},
+		handleQuery(){
+			let that = this;
+			that.getData();
+		},
+	},
+};
+</script>
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/workerTimesRY.vue b/src/views/statistics/bxerp/workerTimesRY.vue
deleted file mode 100644
index 25ab6102..00000000
--- a/src/views/statistics/bxerp/workerTimesRY.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-	<el-container>
-		<el-header>
-			<div class="left-panel"></div>
-			<div class="right-panel">
-				<xtSelect
-					:apiObj="apiObj"
-					v-model="query.process_name"
-					:valueField="'name'"
-					:labelField="'name'"
-					:params = "params"
-					v-model:label="query.process_name"
-					style="width:150px; margin-right: 5px;"
-				>
-					<el-table-column label="工序" prop="name"></el-table-column>
-				</xtSelect>
-                <el-date-picker
-					v-model="query.start_date"
-					type="date"
-					value-format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 150px"
-				/>
-				<el-date-picker
-					v-model="query.end_date"
-					type="date"
-					value-format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 150px"
-				/>
-				<el-button
-					type="primary"
-					icon="el-icon-search"
-					@click="handleQuery"
-				></el-button>
-			</div>
-		</el-header>
-		<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:data="tableData"
-				id="exportDiv"
-				row-key="id"
-				hidePagination
-				hideDo
-				stripe
-			>
-				<el-table-column label="员工" prop="员工" fixed="left">
-				</el-table-column>
-				<el-table-column label="总加工" prop="总生产数">
-				</el-table-column>
-				<el-table-column label="总切片数" prop="总切片数">
-				</el-table-column>
-				<el-table-column label="暗点" prop="暗点不合格">
-				</el-table-column>
-				<el-table-column label="长点" prop="长点">
-				</el-table-column>
-				<el-table-column label="暗点合格率" prop="暗点合格率">
-					<!-- <template #default="scope">
-						{{ scope.row.暗点不合格/scope.row.总切片数 }}
-					</template> -->
-				</el-table-column>
-				<el-table-column label="长点率" prop="长点率">
-				</el-table-column>
-				<el-table-column label="加功率" prop="加功率">
-				</el-table-column>
-				<el-table-column label="暗点系数" prop="暗点系数">
-				</el-table-column>
-				<el-table-column label="系数" prop="系数">
-				</el-table-column>
-				<el-table-column label="奖励金额" prop="奖励金额">
-				</el-table-column>
-			</scTable>
-		</el-main>
-	</el-container>
-</template>
-
-<script>
-export default {
-	name: "workerTimesRY",
-	data() {
-		return {
-			query:{
-				end_date:'',
-                process_name:'',
-				start_date:'',
-			},
-			lists:[],
-			mgruops:[],
-			tableData:[],
-			params:{cate:'热压'},
-			apiObj: this.$API.mtm.process.list,
-		};
-	},
-    mounted() {
-        let that = this;
-        let date = new Date();
-        that.query.end_date = that.$TOOL.dateFormat2(date);
-		that.query.start_date =  that.query.end_date.split('-')[0] + '-' + that.query.end_date.split('-')[1] + '-01';
-		that.getData();
-    },
-	methods: {
-        getData(){
-            let that = this;
-			that.mgruops = [];
-			that.tableData = [];
-            let params = {};
-            params.query = that.query;
-			that.$API.bi.dataset.exec.req('prodect_defect_reya', params).then((res) => {
-				 let data = res.data2.ds0;
-				 that.lists = [];
-				 let coefficient = [];
-				 data.forEach(item=>{
-					let obj = JSON.parse(item.缺陷分布);
-					console.log('obj',obj);
-					for(let key in obj){
-						item[key]= obj[key].含;
-					}
-					if(item.暗点合格){
-						item.暗点合格率 = ((item.暗点合格/item.总切片数)*100).toFixed(2)+'%'
-					}
-				 })
-				 console.log('data',data)
-				 that.tableData = data;
-			});
-        },
-		deptChange(){
-			this.getData();
-		},
-		handleQuery(){
-			let that = this;
-			that.getData();
-		},
-	},
-};
-</script>
-
-<style scoped>
-</style>