From 2d52ae26c5bb8ed3926c4c28a851e275419ab47c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 29 Nov 2024 17:45:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=92=E7=AE=A1=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js                      |  23 ++
 src/views/statistics/statistics_bang.vue | 341 +++++++++++++++++++++++
 src/views/statistics/statistics_guan.vue | 330 ++++++++++++++++++++++
 3 files changed, 694 insertions(+)
 create mode 100644 src/views/statistics/statistics_bang.vue
 create mode 100644 src/views/statistics/statistics_guan.vue

diff --git a/src/config/route.js b/src/config/route.js
index a4ccdeb8..fa3b3430 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -3445,6 +3445,29 @@ const routes = [
 				},
 				component: "statistics/total_statistics.vue",
 			},
+			//综合统计--棒
+			{
+				name: "statistics_bang",
+				path: "/statistic/statistics_bang",
+				meta: {
+					title: "棒综合统计",
+					icon: "el-icon-DataAnalysis",
+					perms: ["statistics_bang"],
+				},
+				component: "statistics/statistics_bang.vue",
+			},
+			//综合统计--管
+			{
+				name: "statistics_guan",
+				path: "/statistic/statistics_guan",
+				meta: {
+					title: "管综合统计",
+					icon: "el-icon-DataAnalysis",
+					perms: ["statistics_guan"],
+				},
+				component: "statistics/statistics_guan.vue",
+			},
+			//综合统计--AVG
 		],
 		// children:[
 		//   {
diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
new file mode 100644
index 00000000..d91eca98
--- /dev/null
+++ b/src/views/statistics/statistics_bang.vue
@@ -0,0 +1,341 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-select 
+					v-model="query.batch" 
+					style="width: 200px" 
+					@change="batchChange"
+				>
+					<el-option 
+						v-for="item in options" 
+						:key="item.batch" 
+						:label="item.batch" 
+						:value="item.batch">
+					</el-option>
+				</el-select>
+				<el-date-picker
+					v-model="query.date"
+					type="date"
+					placeholder="查询日期"
+					value-format="YYYY-MM-DD"
+					style="width: 150px; margin-right: 10px"
+				>
+				</el-date-picker>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+				<el-button
+					@click="handleExport"
+					class="tables"
+					type="primary"
+					>导出</el-button
+				>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+					:data="tableData"
+					id="exportDiv"
+					stripe
+					hideDo
+					hidePagination
+				>
+					<el-table-column label="产品编号" prop="产品编号">
+					</el-table-column>
+					<el-table-column label="7号车间生产" prop="7号车间生产" align="center">
+						<el-table-column label="规格" prop="规格">
+						</el-table-column>
+						<el-table-column label="实际重量/KG" prop="实际重量">
+						</el-table-column>
+						<el-table-column label="合格重量/KG" 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>
+						<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>
+						<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>
+						<el-table-column label="切料" prop="切料">
+						</el-table-column>
+						<el-table-column label="备注" prop="备注">
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="8号车间中检" prop="8号车间中检" align="center">
+						<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>
+						<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>
+						<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>
+					</el-table-column>
+					<el-table-column label="6号车间加工" prop="6号车间加工" align="center">
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+						<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>
+
+						<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>
+
+						<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>
+						<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>
+						<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>
+						<el-table-column label="操作人" prop="操作人">
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="技术质量" prop="技术质量" align="center">
+						<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>
+						<el-table-column label="合格重量/KG" prop="合格重量">
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="6号领取加工-发货合格率" prop="6号领取加工-发货合格率">
+					</el-table-column>
+					<el-table-column label="7号生产-发货合格率" prop="7号生产-发货合格率">
+					</el-table-column>
+				</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+function deepCopy(obj) {
+	return JSON.parse(JSON.stringify(obj));
+}
+export default {
+	name: "chart",
+	data() {
+		return {
+			query: {
+				batch: "",
+				date:''
+			},
+			options:[],
+			tableData:[],
+		};
+	},
+	mounted() {
+		let that = this;
+		that.getOptions();	
+		// that.getTableData();
+	},
+	methods: {
+		//获取物料批次
+		getOptions(){
+			let that = this;
+			let obj = {};
+			obj.page = 0;
+			obj.type__in = "10,20";
+			obj.is_hidden = false;
+			that.options = [];
+			that.$API.mtm.material.list.req(obj).then((res) => {
+				if(res.length>0){
+					that.options = res;
+				}
+			});
+		},
+		//获取表格数据
+		getTableData(){
+			let that = this;
+			let obj = {};
+			obj.query = that.query;
+			that.tableData =[];
+			that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
+				if(res.data2.ds0){
+					that.tableData = res.data2.ds0;
+				}
+			});
+		},
+		searchTypeChange(){
+			this.query.batch = '';
+		},
+		batchChange(val){
+		
+		},
+		handleQuery(){
+			this.getTableData();
+		},
+	},
+};
+</script>
+
+<style scoped>
+#bachart1{
+	width: 100%;
+	height: 500px;
+}
+
+.tableHead {
+	background:rgb(0,176,240);
+	height:40px;
+}
+.tableTh{
+	width:120px;
+	height:36px;
+}
+.tableTd{
+	width:120px;
+	height:36px;
+}
+</style>
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
new file mode 100644
index 00000000..e2bd7311
--- /dev/null
+++ b/src/views/statistics/statistics_guan.vue
@@ -0,0 +1,330 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-select 
+					v-model="query.batch" 
+					style="width: 200px" 
+					@change="batchChange"
+				>
+					<el-option 
+						v-for="item in options" 
+						:key="item.batch" 
+						:label="item.batch" 
+						:value="item.batch">
+					</el-option>
+				</el-select>
+				<el-date-picker
+					v-model="query.date"
+					type="date"
+					placeholder="查询日期"
+					value-format="YYYY-MM-DD"
+					style="width: 150px; margin-right: 10px"
+				>
+				</el-date-picker>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+				<el-button
+					@click="handleExport"
+					class="tables"
+					type="primary"
+					>导出</el-button
+				>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+					:data="tableData"
+					id="exportDiv"
+					stripe
+					hideDo
+					hidePagination
+				>
+					<el-table-column label="10号生产" align="center">
+						<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>
+						<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>
+						<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>
+					<el-table-column label="10号抽检" align="center">
+						<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>
+						<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>
+						<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>
+						<el-table-column label="抽检人" prop="抽检人">
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="8号入库" align="center">
+						<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>
+						<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>
+						<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>
+					<el-table-column label="退火" align="center">
+						<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>
+						<el-table-column label="其他" prop="其他">
+						</el-table-column>
+						<el-table-column label="退火人" prop="退火人">
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="6号领取" align="center">
+						<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>
+					</el-table-column>
+					<el-table-column label="开管" align="center">
+						<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>
+						<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>
+					</el-table-column>
+					<el-table-column label="检验" align="center">
+						<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>
+						<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>
+						<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>
+						<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>
+					<el-table-column label="终检" align="center">
+						<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>
+						<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>
+					<el-table-column label="领管-终检合格率" prop="领管-终检合格率">
+					</el-table-column>
+				</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+function deepCopy(obj) {
+	return JSON.parse(JSON.stringify(obj));
+}
+export default {
+	name: "chart",
+	data() {
+		return {
+			query: {
+				batch: "",
+				date:''
+			},
+			options:[],
+			tableData:[],
+		};
+	},
+	mounted() {
+		let that = this;
+		that.getOptions();	
+		// that.getTableData();
+	},
+	methods: {
+		//获取物料批次
+		getOptions(){
+			let that = this;
+			let obj = {};
+			obj.page = 0;
+			obj.type__in = "10,20";
+			obj.is_hidden = false;
+			that.options = [];
+			that.$API.mtm.material.list.req(obj).then((res) => {
+				if(res.length>0){
+					that.options = res;
+				}
+			});
+		},
+		//获取表格数据
+		getTableData(){
+			let that = this;
+			let obj = {};
+			obj.query = that.query;
+			that.tableData =[];
+			that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
+				if(res.data2.ds0){
+					that.tableData = res.data2.ds0;
+				}
+			});
+		},
+		searchTypeChange(){
+			this.query.batch = '';
+		},
+		batchChange(val){
+		
+		},
+		handleQuery(){
+			this.getTableData();
+		},
+	},
+};
+</script>
+
+<style scoped>
+#bachart1{
+	width: 100%;
+	height: 500px;
+}
+
+.tableHead {
+	background:rgb(0,176,240);
+	height:40px;
+}
+.tableTh{
+	width:120px;
+	height:36px;
+}
+.tableTd{
+	width:120px;
+	height:36px;
+}
+</style>