diff --git a/src/views/statistics/bxerp/workHoursNZ.vue b/src/views/statistics/bxerp/workHoursNZ.vue
new file mode 100644
index 00000000..8ee7b4f1
--- /dev/null
+++ b/src/views/statistics/bxerp/workHoursNZ.vue
@@ -0,0 +1,326 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel">
+				<el-select
+				 	v-if="activeName=='gongxu'"
+					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-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="handleQuery2"
+				></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="showTable"
+								ref="table1"
+								:data="tableData"
+								row-key="id"
+								hidePagination
+								hideDo
+								stripe
+							>
+								<el-table-column type="index" width="50"  fixed="left"/>
+								<el-table-column label="员工" prop="员工" fixed="left">	
+								</el-table-column>
+								<el-table-column label="物料名" prop="物料名" fixed="left">	
+								</el-table-column>
+								<el-table-column label="总切片数" prop="总切片数" fixed="left">	
+								</el-table-column>
+								<el-table-column label="暗点" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.暗点">{{ scope.row.暗点.含?scope.row.暗点.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="暗点重" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.暗点重">{{ scope.row.暗点重.含?scope.row.暗点重.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网轻" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.黑网轻">{{ scope.row.黑网轻.含?scope.row.黑网轻.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网重" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.黑网重">{{ scope.row.黑网重.含?scope.row.黑网重.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网废" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.黑网废">{{ scope.row.黑网废.含?scope.row.黑网废.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="白网轻" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.白网轻">{{ scope.row.白网轻.含?scope.row.白网轻.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="白网重" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.白网重">{{ scope.row.白网重.含?scope.row.白网重.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="小网轻" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.小网轻">{{ scope.row.小网轻.含?scope.row.小网轻.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="小网废" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.小网废">{{ scope.row.小网废.含?scope.row.小网废.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="分辨率" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.分辨率">{{ scope.row.分辨率.含?scope.row.分辨率.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="S畸变" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.S畸变不合格">{{ scope.row.S畸变不合格.含?scope.row.S畸变不合格.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="弓形畸变" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.弓形畸变不合格">{{ scope.row.弓形畸变不合格.含?scope.row.弓形畸变不合格.含:'' }}</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="table2"
+								: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.总切片数">{{ scope.row.总切片数 }}</span>
+										<span v-else>{{ scope.row.总生产数 }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="暗点" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.暗点">{{ scope.row.暗点.含?scope.row.暗点.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="暗点重" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.暗点重">{{ scope.row.暗点重.含?scope.row.暗点重.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网轻" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.黑网轻">{{ scope.row.黑网轻.含?scope.row.黑网轻.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网重" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.黑网重">{{ scope.row.黑网重.含?scope.row.黑网重.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="黑网废" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.黑网废">{{ scope.row.黑网废.含?scope.row.黑网废.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="白网轻" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.白网轻">{{ scope.row.白网轻.含?scope.row.白网轻.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="白网重" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.白网重">{{ scope.row.白网重.含?scope.row.白网重.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="小网轻" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.小网轻">{{ scope.row.小网轻.含?scope.row.小网轻.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="小网废" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.小网废">{{ scope.row.小网废.含?scope.row.小网废.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="分辨率" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.分辨率">{{ scope.row.分辨率.含?scope.row.分辨率.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="S畸变" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.S畸变不合格">{{ scope.row.S畸变不合格.含?scope.row.S畸变不合格.含:'' }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="弓形畸变" align="center">
+									<template #default="scope">
+										<span v-if="scope.row.弓形畸变不合格">{{ scope.row.弓形畸变不合格.含?scope.row.弓形畸变不合格.含:'' }}</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',
+			query1:{
+				number_contains:'',
+				time_gte:'',
+				time_lte:'',
+			},
+			query2:{
+				process_name:'压板出炉',
+			},
+			query:{
+				end_date:'',
+				start_date:'',
+  				select_cols: "",
+				mgroup_name: "扭转",
+				testmgroup_name: "扭后检测",
+			},
+			end_date:'',
+			start_date:'',
+			mgruops:[],
+			tableData:[],
+			detailRow:[],
+			processList:['装模','装炉','压板出炉','脱膜测量'],
+			params:{cate:'热压'},
+		};
+	},
+    mounted() {
+        let that = this;
+        let date = new Date();
+        that.end_date = that.query.end_date = that.$TOOL.dateFormat2(date);
+		that.start_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;
+            let params = {},biStr = '';
+			let query =that.query;
+			if(that.query.start_date==''||that.query.start_date==null){
+				that.query.start_date = query.start_date = that.start_date;
+			}else{
+				query.start_date = that.query.start_date;
+			}
+			if(that.query.end_date==''||that.query.end_date==null){
+				that.query.end_date = query.end_date = that.end_date;
+			}else{
+				query.end_date = that.query.end_date;
+			}
+			params.query = query;
+			if(that.activeName=='product'){
+				biStr = 'product_defect_pb_m';
+			}else{
+				biStr = 'product_defect_equip_mpjc';
+			}
+			console.log('params',params);
+			that.$API.bi.dataset.exec.req(biStr, 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.$nextTick(() => {
+					that.tableData = data;
+					that.showTable=true;
+                })
+			});
+        },
+		handleQuery2(){
+			let that = this;
+            that.getData();
+		},
+		filterName(value, row) {
+			return row.物料名 == value;
+		},
+		handleClick(e){
+			let that = this;
+			that.query.end_date = that.end_date;
+			that.query.start_date =  that.start_date;
+			that.activeName = e.props.name;
+			that.showTable=false;
+			that.getData();
+		},
+		handleNumClick(row){
+			let that = this;
+			that.userName = row.设备编号;
+			that.visible = true;
+			that.detailRow = row.切片编号列表;
+		},
+	},
+};
+</script>
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/workHoursRY.vue b/src/views/statistics/bxerp/workHoursRY.vue
deleted file mode 100644
index 080b3d1b..00000000
--- a/src/views/statistics/bxerp/workHoursRY.vue
+++ /dev/null
@@ -1,723 +0,0 @@
-<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-else>
-				<el-select
-				 	v-if="activeName=='gongxu'"
-					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-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="handleQuery2"
-				></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"
-								:default-sort="{ prop: 'date', order: 'descending' }"
-								stripe
-							>
-								<el-table-column type="index" width="50"  fixed="left"/>
-								<el-table-column label="装模日期" fixed="left" width="100" sortable>
-									<template #default="scope">
-										<span>{{ scope.row.data.装模_日期?scope.row.data.装模_日期:'' }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="装炉日期" fixed="left" width="100" sortable>
-									<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="params2"
-								:query="params2"
-								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="炉号" fixed="left">
-									<template #default="scope">
-										<span v-if="scope.row.data.装炉压板出炉_设备编号">{{ scope.row.data.装炉压板出炉_设备编号 }}</span>
-										<span v-else>{{ scope.row.wpr_from_.data.装炉压板出炉_设备编号 }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
-									<el-table-column label="差值" class-name="colorheader1">
-										<template #default="scope">
-											<span v-if="scope.row.data.毛坯检测_检测项_放大率2mm">{{ scope.row.data.毛坯检测_检测项_放大率2mm }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="合格数" class-name="colorheader1">
-										<template #default="scope">
-											<span v-if="scope.row.data['毛坯检测_缺陷项_放大率￠2mm不合格']">{{ scope.row.data['毛坯检测_缺陷项_放大率￠2mm不合格']==0?1:0 }}</span>
-											<span v-else>
-												<span v-if="scope.row.data.毛坯检测_检测项_放大率2mm">1</span>
-											</span>
-										</template>
-									</el-table-column>
-								</el-table-column>
-								<el-table-column label="放大率￠16mm" align="center" class-name="colorheader2">
-									<el-table-column label="差值" class-name="colorheader2">
-										<template #default="scope">
-											<span v-if="scope.row.data.毛坯检测_检测项_放大率16mm">{{ scope.row.data.毛坯检测_检测项_放大率16mm }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="合格数" class-name="colorheader2">
-										<template #default="scope">
-											<span v-if="scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']">{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']==0?1:0 }}</span>
-											<span v-else>
-												<span v-if="scope.row.data.毛坯检测_检测项_放大率16mm">1</span>
-											</span>
-										</template>
-									</el-table-column>
-								</el-table-column>
-								<el-table-column label="剪切￠18.3mm" align="center" class-name="colorheader3">
-									<el-table-column label="剪切" class-name="colorheader3">
-										<template #default="scope">
-											<span v-if="scope.row.data.毛坯检测_检测项_剪切18mm">{{ scope.row.data.毛坯检测_检测项_剪切18mm }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="剪切值" class-name="colorheader3">
-										<template #default="scope">
-											<span v-if="scope.row.data.毛坯检测_检测项_剪切值18mm">{{ scope.row.data.毛坯检测_检测项_剪切值18mm }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="合格数" class-name="colorheader3">
-										<template #default="scope">
-											<span v-if="scope.row.data.毛坯检测_检测项_剪切值18mm||scope.row.data.毛坯检测_检测项_剪切18mm">{{ !scope.row.data['毛坯检测_缺陷项_剪切￠18.3mm不合格']&&!scope.row.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0 }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="可加工" class-name="colorheader3">
-										<template #default="scope">
-											<span v-if="scope.row.data.毛坯检测_检测项_剪切值18mm||scope.row.data.毛坯检测_检测项_剪切18mm">{{ scope.row.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0 }}</span>
-										</template>
-									</el-table-column>
-								</el-table-column>
-								<el-table-column label="暗点" align="center" class-name="colorheader4">
-									<el-table-column label="内标合格" class-name="colorheader4">
-										<template #default="scope">
-											<span>{{scope.row.data.毛坯检测_缺陷项_暗点合格?scope.row.data.毛坯检测_缺陷项_暗点合格:0 }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="长点不合格" class-name="colorheader4">
-										<template #default="scope">
-											<span>{{scope.row.data.毛坯检测_缺陷项_暗点不合格?scope.row.data.毛坯检测_缺陷项_暗点不合格:0 }}</span>
-										</template>
-									</el-table-column>
-									<el-table-column label="可加工" class-name="colorheader4">
-										<template #default="scope">
-											<span>{{ scope.row.data.毛坯检测_缺陷项_暗点合格?0:scope.row.data.毛坯检测_缺陷项_暗点不合格?0:1 }}</span>
-										</template>
-									</el-table-column>
-								</el-table-column>
-								<el-table-column label="暗点重" align="center" class-name="colorheader5">
-									<template #default="scope">
-										<span>{{ scope.row.data.毛坯检测_缺陷项_暗点重?scope.row.data.毛坯检测_缺陷项_暗点重:0 }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="花丝" align="center" class-name="colorheader6">
-									<template #default="scope">
-										<span>{{scope.row.data.毛坯检测_缺陷项_花丝?scope.row.data.毛坯检测_缺陷项_花丝:0 }}</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">
-									<el-table-column label="轻" align="center" class-name="colorheader1">
-										<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.毛坯检测_缺陷项_花朵重:0 }}</span>
-										</template>
-									</el-table-column>
-								</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 label="丝高" align="center" class-name="colorheader2">
-									<template #default="scope">
-										<span>{{ scope.row.wpr_from_.data.排板_检测项_丝高?scope.row.wpr_from_.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.wpr_from_.data.装模_操作人?scope.row.wpr_from_.data.装模_操作人:'' }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="日期" align="center" class-name="colorheader5">
-									<template #default="scope">
-										<span>{{ scope.row.wpr_from_.data.装炉压板出炉_压板出炉_日期?scope.row.wpr_from_.data.装炉压板出炉_压板出炉_日期:'' }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="装炉人" align="center" class-name="colorheader6">
-									<template #default="scope">
-										<span>{{ scope.row.wpr_from_.data.装炉压板出炉_装炉_操作人?scope.row.wpr_from_.data.装炉压板出炉_装炉_操作人:'' }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="压板用时" align="center" class-name="colorheader7">
-									<template #default="scope">
-										<span>{{ scope.row.wpr_from_.data.装炉压板出炉_操作项_压板用时?scope.row.wpr_from_.data.装炉压板出炉_操作项_压板用时:0 }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="压板人" align="center" class-name="colorheader1">
-									<template #default="scope">
-										<span>{{ scope.row.wpr_from_.data.装炉压板出炉_压板出炉_操作人?scope.row.wpr_from_.data.装炉压板出炉_压板出炉_操作人:'' }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="模具号" align="center" class-name="colorheader3">
-									<template #default="scope">
-										<span>{{ scope.row.wpr_from_.data.装模_检测项_模具号?scope.row.wpr_from_.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-tab-pane name="muju" label="模具号统计" style="height: 100%;">
-					<el-container v-if="activeName=='muju'">
-						<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="模具号">
-									<template #default="scope">
-										<span>{{scope.row.模具号}}</span>
-										<span v-if="scope.row.横压!==null">{{scope.row.横压}}</span>
-									</template>
-								</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="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>
-			<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:'-create_time',
-				// ordering:'-data__装模_日期',
-				// querys:[[{field:"data__has_key",compare:"",value:"装炉压板出炉_批次号"}]],
-				querys:[[
-					{field:"wpr_mlogbw__mlogb__mlog__mgroup__name",compare:"",value:"装炉压板出炉"},
-					{field:"wpr_mlogbw__mlogb__material_out",compare:"isnull",value:false}]
-				],
-			},
-			params2: {
-				ordering:'-create_time',
-				querys:[[
-					{field:"wpr_mlogbw__mlogb__mlog__mgroup__name",compare:"",value:"毛坯检测"},
-					{field:"wpr_mlogbw__mlogb__material_out",compare:"isnull",value:false},
-					{field:"data__毛坯检测_日期",compare:"isnull",value:false},
-					{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]
-				],
-			},
-			query1:{
-				number_contains:'',
-				time_gte:'',
-				time_lte:'',
-			},
-			query2:{
-				process_name:'压板出炉',
-			},
-			query:{
-				end_date:'',
-				start_date:'',
-  				select_cols: ",ls.板段编号列表,ls.切片编号列表"
-			},
-			end_date:'',
-			start_date:'',
-			mgruops:[],
-			tableData:[],
-			detailRow:[],
-			processList:['装模','装炉','压板出炉','脱膜测量'],
-			params:{cate:'热压'},
-			apiObj1: this.$API.wpm.wpr.query,
-			apiObj: this.$API.mtm.process.list,
-		};
-	},
-    mounted() {
-        let that = this;
-        let date = new Date();
-        that.end_date = that.query.end_date = that.$TOOL.dateFormat2(date);
-		that.start_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 = {},query ={},biStr = '';
-			if(that.query.start_date==''||that.query.start_date==null){
-				that.query.start_date = query.start_date = that.start_date;
-			}else{
-				query.start_date = that.query.start_date;
-			}
-			if(that.query.end_date==''||that.query.end_date==null){
-				that.query.end_date = query.end_date = that.end_date;
-			}else{
-				query.end_date = that.query.end_date;
-			}
-			if(that.activeName=='luhao'){
-				query.select_cols = that.query.select_cols;
-				params.query = query;
-				biStr = 'product_defect_equip_bdgy';
-			}else if(that.activeName=='muju'){
-				query.select_cols = "";
-				params.query = query;
-				biStr = 'product_defect_model';
-			}else if(that.activeName=='gongxu'){
-				query.process_name = that.query2.process_name;
-				params.query = query;
-				biStr = 'product_defect_reya';
-			}else if(that.activeName=='total'){
-				params.query = query;
-				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=>{
-					if(item.缺陷分布!==null){
-						let defect = JSON.parse(item.缺陷分布);
-						for(let key in defect){
-							item[key]=defect[key];
-						}
-					}
-				})
-				that.$nextTick(() => {
-					that.tableData = data;
-					that.showTable=true;
-                })
-			});
-        },
-		handleQuery1(){
-			let that = this;
-			let querys1 = [[{field:"wpr_mlogbw__mlogb__mlog__mgroup__name",compare:"",value:"装炉压板出炉"},
-				{field:"wpr_mlogbw__mlogb__material_out",compare:"isnull",value:false}]];
-			if(that.activeName=='test'){
-				querys1 = [[{field:"wpr_mlogbw__mlogb__mlog__mgroup__name",compare:"",value:"毛坯检测"},
-					{field:"wpr_mlogbw__mlogb__material_out",compare:"isnull",value:false},
-					{field:"data__毛坯检测_日期",compare:"isnull",value:false},
-					{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
-			}
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = that.activeName=='product'?'number':'number';
-			obj.value = that.query1.number_contains;
-			obj.compare = '';
-
-			obj1.field =  that.activeName=='product'?'data__装炉压板出炉_日期':'data__毛坯检测_日期';
-			obj1.value = that.query1.time_gte;
-			obj1.compare = 'gte';
-
-			obj2.field = that.activeName=='product'?'data__装炉压板出炉_日期':'data__毛坯检测_日期';
-			obj2.value = that.query1.time_lte;
-			obj2.compare = 'lte';
-			if(that.query1.number_contains!==''&&that.query1.number_contains!==null){
-				querys1[0].push(obj);
-			}
-			if(that.query1.time_gte!==''&&that.query1.time_gte!==null){
-				querys1[0].push(obj1);
-			}
-			if(that.query1.time_lte!==''&&that.query1.time_lte!==null){
-				querys1[0].push(obj2);
-			}
-			
-			that.$nextTick(() => {
-				if(that.activeName=='product'){
-					that.params1.querys = querys1;
-					this.$refs.table1.queryData(that.params1);
-				}else if(that.activeName=='test'){
-					that.params2.querys = querys1;
-					this.$refs.table2.queryData(that.params2);
-				}
-			});
-			
-		},
-		handleQuery2(){
-			let that = this;
-            that.getData();
-		},
-		filterName(value, row) {
-			return row.物料名 == value;
-		},
-		handleClick(e){
-			let that = this;
-			that.query.end_date = that.end_date;
-			that.query.start_date =  that.start_date;
-			this.activeName = e.props.name;
-			this.showTable=false;
-			if(e.props.name=='luhao'||e.props.name=='muju'||e.props.name=='gongxu'||e.props.name=='total'){
-				this.getData();
-			}
-		},
-		handleNumClick(row){
-			let that = this;
-			that.userName = row.设备编号;
-			that.visible = true;
-			that.detailRow = row.切片编号列表;
-		},
-	},
-};
-</script>
-<style scoped>
-</style>
diff --git a/src/views/statistics/bxerp/workHoursRY_NZ.vue b/src/views/statistics/bxerp/workHoursRY_NZ.vue
new file mode 100644
index 00000000..84c94341
--- /dev/null
+++ b/src/views/statistics/bxerp/workHoursRY_NZ.vue
@@ -0,0 +1,445 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel">
+				<el-select
+				 	v-if="activeName=='gongxu'"
+					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-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="handleQuery2"
+				></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="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">
+										<!--  @click="handleNumClick(scope.row)"  -->
+										<span v-if="scope.row.总切片数">{{ scope.row.总切片数 }}</span>
+										<span v-else>{{ 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.白网重.含}}</span>
+										<span v-else>0</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.分辨率.含}}</span>
+										<span v-else>0</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.炸废.含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="S畸变">
+									<template #default="scope">
+										<span v-if="scope.row.S畸变">{{scope.row.S畸变.含}}</span>
+										<span v-else>0</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>
+							</scTable>
+						</el-main>
+					</el-container>
+				</el-tab-pane>
+				<el-tab-pane name="muju" label="模具号统计" style="height: 100%;">
+					<el-container v-if="activeName=='muju'">
+						<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="模具号">
+									<template #default="scope">
+										<span>{{scope.row.模具号}}</span>
+										<span v-if="scope.row.横压!==null">{{scope.row.横压}}</span>
+									</template>
+								</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.白网重.含}}</span>
+										<span v-else>0</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.分辨率.含}}</span>
+										<span v-else>0</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.炸废.含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="S畸变">
+									<template #default="scope">
+										<span v-if="scope.row.S畸变">{{scope.row.S畸变.含}}</span>
+										<span v-else>0</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>
+							</scTable>
+						</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.白网重.含}}</span>
+										<span v-else>0</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.分辨率.含}}</span>
+										<span v-else>0</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.炸废.含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="S畸变">
+									<template #default="scope">
+										<span v-if="scope.row.S畸变">{{scope.row.S畸变.含}}</span>
+										<span v-else>0</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>
+							</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="黑网重">
+									<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.白网重.含}}</span>
+										<span v-else>0</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.分辨率.含}}</span>
+										<span v-else>0</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.炸废.含}}</span>
+										<span v-else>0</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="S畸变">
+									<template #default="scope">
+										<span v-if="scope.row.S畸变">{{scope.row.S畸变.含}}</span>
+										<span v-else>0</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>
+							</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: 'luhao',
+			query1:{
+				number_contains:'',
+				time_gte:'',
+				time_lte:'',
+			},
+			query2:{
+				process_name:'压板出炉',
+			},
+			query:{
+				end_date:'',
+				start_date:'',
+  				select_cols: ""
+			},
+			end_date:'',
+			start_date:'',
+			mgruops:[],
+			tableData:[],
+			detailRow:[],
+			processList:['装模','装炉','压板出炉','脱膜测量'],
+		};
+	},
+    mounted() {
+        let that = this;
+        let date = new Date();
+        that.end_date = that.query.end_date = that.$TOOL.dateFormat2(date);
+		that.start_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;
+            let params = {},query ={testmgroup_name:'扭转'},biStr = '';
+			if(that.query.start_date==''||that.query.start_date==null){
+				that.query.start_date = query.start_date = that.start_date;
+			}else{
+				query.start_date = that.query.start_date;
+			}
+			if(that.query.end_date==''||that.query.end_date==null){
+				that.query.end_date = query.end_date = that.end_date;
+			}else{
+				query.end_date = that.query.end_date;
+			}
+			if(that.activeName=='luhao'){
+				query.select_cols = that.query.select_cols;
+				params.query = query;
+				biStr = 'product_defect_equip_mpjc';
+			}else if(that.activeName=='muju'){
+				query.select_cols = "";
+				params.query = query;
+				biStr = 'product_defect_model';
+			}else if(that.activeName=='gongxu'){
+				query.process_name = that.query2.process_name;
+				params.query = query;
+				biStr = 'product_defect_reya';
+			}else if(that.activeName=='total'){
+				params.query = query;
+				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=>{
+					if(item.缺陷分布!==null){
+						let defect = JSON.parse(item.缺陷分布);
+						for(let key in defect){
+							item[key]=defect[key];
+						}
+					}
+				})
+				console.log('data',data);
+				that.$nextTick(() => {
+					that.tableData = data;
+					that.showTable=true;
+                })
+			});
+        },
+		handleQuery2(){
+			let that = this;
+            that.getData();
+		},
+		handleClick(e){
+			let that = this;
+			that.query.end_date = that.end_date;
+			that.query.start_date =  that.start_date;
+			this.activeName = e.props.name;
+			this.showTable=false;
+			this.getData();
+		},
+		handleNumClick(row){
+			let that = this;
+			that.userName = row.设备编号;
+			that.visible = true;
+			that.detailRow = row.切片编号列表;
+		},
+	},
+};
+</script>
+<style scoped>
+</style>