From 54678f9ffc31dc1b84f69005aae4d7e879871260 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 10 Sep 2024 15:06:33 +0800
Subject: [PATCH 01/16] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0wpm=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A3=B0=E6=98=8E=EF=BC=88=E8=BD=A6=E9=97=B4=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E7=94=A8=E5=88=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/wpm.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
index bbb0c48a..fe465d05 100644
--- a/src/api/model/wpm.js
+++ b/src/api/model/wpm.js
@@ -417,4 +417,18 @@ export default {
 			return await http.post("http://localhost:8080/prints/", data);
 		},
 	},
+	ana:{
+		equipLastMlog:{
+			name: "设备状态列表",
+			req: async function (data) {
+				return await http.post(`${config.API_URL}/wpm/ana/equip_last_mlog/`, data);
+			},
+		},
+		put_prod:{
+			name: "统计值",
+			req: async function (data) {
+				return await http.post(`${config.API_URL}/wpm/ana/put_prod/`, data);
+			},
+		},
+	},
 };

From 7f3c2f00f6da46e61c18b02a8019ea30e872321a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 10 Sep 2024 15:50:44 +0800
Subject: [PATCH 02/16] =?UTF-8?q?fix:=E5=85=B6=E4=BB=96=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8A=A0=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mio.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/inm/mio.vue b/src/views/inm/mio.vue
index f7f02517..1bbd9266 100644
--- a/src/views/inm/mio.vue
+++ b/src/views/inm/mio.vue
@@ -94,6 +94,14 @@
 					width="150px"
 				>
 					<template #default="scope">
+						<el-button
+							link
+							type="primary"
+							@click="table_edit(scope.row)"
+							v-if="scope.row.state == 10&&(scope.row.type == 'other_in' ||scope.row.type == 'other_out')"
+						>
+							编辑
+						</el-button>
 						<el-button
 							link
 							type="primary"
@@ -106,11 +114,7 @@
 							type="primary"
 							@click="table_submit(scope.row)"
 							v-auth="'mio.submit'"
-							v-if="
-								scope.row.state == 10 &&
-								(scope.row.type == 'other_in' ||
-									scope.row.type == 'other_out')
-							"
+							v-if="scope.row.state == 10 &&(scope.row.type == 'other_in' ||scope.row.type == 'other_out')"
 						>
 							提交
 						</el-button>
@@ -211,9 +215,10 @@ export default {
 		table_edit(row) {
 			this.dialog.save = true;
 			this.$nextTick(() => {
-				this.$refs.saveDialog.open("edit", type).setData(row);
+				this.$refs.saveDialog.open("edit", row.type).setData(row);
 			});
 		},
+	
 		//查看
 		table_detail(row) {
 			this.type = row.type;

From 9a41a29f49601902f06749b3b92e8bd3612637b6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 10 Sep 2024 16:59:39 +0800
Subject: [PATCH 03/16] =?UTF-8?q?fix:coding#493=E4=BF=9D=E6=B8=A9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E5=86=B7=E5=8D=B4=E6=97=B6=E9=97=B4=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_form.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 6bcb02e6..f4719102 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -137,7 +137,6 @@
 								<el-input-number
 									v-model="form.reminder_interval_list[0]"
 									:min="0"
-									:disabled="mode == 'edit'"
 									controls-position="right"
 								/>(min)
 							</el-form-item>
@@ -147,7 +146,6 @@
 								<el-input-number
 									v-model="form.reminder_interval_list[1]"
 									:min="0"
-									:disabled="mode == 'edit'"
 									controls-position="right"
 								/>(min)
 							</el-form-item>

From 654a7a3e862d2783a46c207d8804d7c58538ef3a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 10 Sep 2024 17:30:00 +0800
Subject: [PATCH 04/16] =?UTF-8?q?fix:=E9=BB=91=E5=8C=96=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_heihuadept.vue | 1031 +++++++++++-----------
 1 file changed, 536 insertions(+), 495 deletions(-)

diff --git a/src/views/bigScreen/index_heihuadept.vue b/src/views/bigScreen/index_heihuadept.vue
index a6be8cfd..c445fd8c 100644
--- a/src/views/bigScreen/index_heihuadept.vue
+++ b/src/views/bigScreen/index_heihuadept.vue
@@ -7,44 +7,47 @@
 		<el-main>
 			<!-- 黑化 -->
 			<el-row style="height: 30%" :gutter="10">
-				<el-col :xs="7" :md="7" style="height: 100%">
-					<div class="box">
-						<div class="boxtitle bgimg">
-							<div class="boxlabel">昨日黑化合格统计</div>
-						</div>
-						<div style="height: 4px"></div>
-						<div class="boxmain bigdata border">
-							<div v-for="item in yesHeihuaData" :key="item.物料名" class="lineDiv">
-								<span>{{ item.物料名 }}</span>
-								<span class="boxmainItemNumber">{{item.合格数}}</span>
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="7" :md="7">
+				<el-col :span="10" style="height: 100%">
 					<div class="box">
 						<div class="boxtitle">
 							<div class="boxlabel">
-								昨日黑化不合格统计
+								黑化设备
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon bwIcon"></span>
+								<span>保温中</span>
+								<span class="eqNum">{{hh.bw}}台</span>
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon lqIcon"></span>
+								<span>冷却中</span>
+								<span class="eqNum">{{hh.lq}}台</span>
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon wyxIcon"></span>
+								<span>未运行</span>
+								<span class="eqNum">{{hh.wyx}}台</span>
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon gzIcon"></span>
+								<span>故障</span>
+								<span class="eqNum">{{hh.gz}}台</span>
 							</div>
 						</div>
-						<div class="boxmain" id="pieChart1"></div>
+						<div style="height: 2px"></div>
+						<div class="boxmain" id="scrollContainer">
+							<dv-scroll-board :config="configData01" style="width:98%;margin:auto" />
+						</div>
 					</div>
 				</el-col>
-				<el-col :xs="10" :md="10" style="height: 100%">
+				<el-col :span="14" style="height: 100%">
 					<div class="box">
 						<div class="boxtitle">
 							<div class="boxlabel">黑化任务进度</div>
 						</div>
 						<div style="height: 2px"></div>
 						<div class="boxmain" id="scrollContainer">
-							<scScrollTavle
-								v-if="table1Visible"
-								:tableHeight="tableHeight"
-								:rowData="processData1"
-								:titleData="liData"
-								:refValue="refValue1"
-							></scScrollTavle>
+							<dv-scroll-board :config="configData1" style="width:98%;margin:auto" />
 						</div>
 					</div>
 				</el-col>
@@ -52,67 +55,106 @@
 			<div style="height: 0.3%"></div>
 			<!-- 退火 -->
 			<el-row style="height: 30%" :gutter="10">
-				<el-col :xs="7" :md="7" style="height: 100%">
-					<div class="box">
-						<div class="boxtitle bgimg">
-							<div class="boxlabel">昨日退火合格统计</div>
-						</div>
-						<div style="height: 4px"></div>
-						<div class="boxmain bigdata border">
-							<!-- flex_center -->
-							<div v-for="item in yesTuihuoData" :key="item.物料名"  class="lineDiv">
-								<span>{{ item.物料名 }}</span>
-								<span class="boxmainItemNumber">{{item.合格数}}</span>
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="7" :md="7">
+				<el-col :span="10" style="height: 100%">
 					<div class="box">
 						<div class="boxtitle">
 							<div class="boxlabel">
-								昨日退火不合格统计
+								退火设备
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon bwIcon"></span>
+								<span>保温中</span>
+								<span class="eqNum">{{th.bw}}台</span>
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon lqIcon"></span>
+								<span>冷却中</span>
+								<span class="eqNum">{{th.lq}}台</span>
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon wyxIcon"></span>
+								<span>未运行</span>
+								<span class="eqNum">{{th.wyx}}台</span>
+							</div>
+							<div class="boxlabel">
+								<span class="stateIcon gzIcon"></span>
+								<span>故障</span>
+								<span class="eqNum">{{th.gz}}台</span>
 							</div>
 						</div>
-						<div class="boxmain" id="pieChart2"></div>
+						<div style="height: 2px"></div>
+						<div class="boxmain" id="scrollContainer">
+							<dv-scroll-board :config="configData02" style="width:98%;margin:auto" />
+						</div>
 					</div>
 				</el-col>
-				<el-col :xs="10" :md="10" style="height: 100%">
+				<el-col :span="14" style="height: 100%">
 					<div class="box">
 						<div class="boxtitle">
 							<div class="boxlabel">退火任务进度</div>
 						</div>
 						<div style="height: 2px"></div>
 						<div class="boxmain" id="scrollContainer">
-							<scScrollTavle
-								v-if="table2Visible"
-								:tableHeight="tableHeight"
-								:rowData="processData2"
-								:titleData="liData"
-								:refValue="refValue2"
-							></scScrollTavle>
+							<dv-scroll-board :config="configData2" style="width:98%;margin:auto" />
 						</div>
 					</div>
-					
 				</el-col>
 			</el-row>
-			<!-- 合格数/合格率 -->
+			<!-- 投产/生产 分析 -->
 			<div style="height: 0.3%"></div>
 			<el-row style="height: 39%" :gutter="10">
-				<el-col :xs="24" :md="12">
+				<el-col :xs="8" :md="8" style="height: 100%;">
 					<div class="box">
 						<div class="boxtitle">
-							<div class="boxlabel">黑化车间本月合格数统计</div>
+							<div class="boxlabel">投产分析（2:00 — 次日2:00）</div>
 						</div>
-						<div class="boxmain" id="chart1"></div>
+						<div class="totalStatic">
+							<span class="totalStaticItem">昨日退火投产统计</span>
+							<span class="totalStaticItem">今日退火投产预测</span>
+							<span class="totalStaticItem">明日退火投产预测</span>
+						</div>
+						<div class="totalStatic">
+							<span class="totalStaticItem totalStaticItemNum">{{ tcfx.yesterday }}</span>
+							<span class="totalStaticItem totalStaticItemNum">{{ tcfx.today }}</span>
+							<span class="totalStaticItem totalStaticItemNum">{{ tcfx.tomorrow }}</span>
+						</div>
+						<div class="boxmain boxmainbottom" id="chart1"></div>
 					</div>
 				</el-col>
-				<el-col :xs="24" :md="12">
+				<el-col :xs="8" :md="8" style="height: 100%;">
 					<div class="box">
 						<div class="boxtitle">
-							<div class="boxlabel">黑化车间本月合格率统计</div>
+							<div class="boxlabel">生产分析（8:00 — 次日8:00）</div>
 						</div>
-						<div class="boxmain" id="chart2"></div>
+						<div class="totalStatic">
+							<span class="totalStaticItem">昨日黑化进炉统计</span>
+							<span class="totalStaticItem">昨日退火进炉统计</span>
+						</div>
+						<div class="totalStatic">
+							<span class="totalStaticItem totalStaticItemNum">{{ sctj_ysetday.hh }}</span>
+							<span class="totalStaticItem totalStaticItemNum">{{ sctj_ysetday.th }}</span>
+						</div>
+						<div class="boxmain boxmainbottom" id="chart2"></div>
+					</div>
+				</el-col>
+				<el-col :xs="8" :md="8" style="height: 100%;">
+					<div class="box">
+						<div class="boxtitle">
+							<div class="boxlabel">库存统计</div>
+						</div>
+						<div class="totalStatic">
+							<span class="totalStaticItem">待黑化片</span>
+							<span class="totalStaticItem">黑化中</span>
+							<span class="totalStaticItem">退火中</span>
+							<span class="totalStaticItem">退火合格数</span>
+						</div>
+						<div class="totalStatic">
+							<span class="totalStaticItem totalStaticItemNum">{{ kctj.dhh }}</span>
+							<span class="totalStaticItem totalStaticItemNum">{{ kctj.hhz }}</span>
+							<span class="totalStaticItem totalStaticItemNum">{{ kctj.thz }}</span>
+							<span class="totalStaticItem totalStaticItemNum">{{ kctj.thok }}</span>
+						</div>
+						<dv-scroll-board :config="configData" class="boxmain boxmainbottom" style="width:98%;margin:auto" />
 					</div>
 				</el-col>
 			</el-row>
@@ -239,7 +281,7 @@ export default {
 				},
 				series: [
 					{
-						name: "黑化",
+						name: "今日统计",
 						type: "bar",
 						// stack: "Ad",
 						barWidth: 10,
@@ -270,34 +312,11 @@ export default {
 								]
 							),
 						},
-						areaStyle: {
-							opacity: 0.8,
-							color: new echarts.graphic.LinearGradient(
-								0,
-								0,
-								0,
-								1,
-								[
-									{
-										offset: 0,
-										color: "rgb(250,205,0)",
-									},
-									{
-										offset: 1,
-										color: "rgb(254,129,0)",
-									},
-								]
-							),
-						},
-						smooth: true,
-						// lineStyle: {
-						// 	width: 1,
-						// 	color: "rgb(1,235,239)",
-						// },
+						
 						data: [],
 					},
 					{
-						name: "退火",
+						name: "",
 						type: "bar",
 						// stack: "Ad",
 						barWidth: 10,
@@ -328,144 +347,134 @@ export default {
 								]
 							),
 						},
-						areaStyle: {
-							opacity: 0.8,
-							color: new echarts.graphic.LinearGradient(
-								0,
-								0,
-								0,
-								1,
-								[
-									{
-										offset: 0,
-										color: "rgb(1,235,239)",
-									},
-									{
-										offset: 1,
-										color: "rgb(5, 158, 163)",
-									},
-								]
-							),
-						},
-						smooth: true,
-						// lineStyle: {
-						// 	width: 1,
-						// 	color: "rgb(1,235,239)",
-						// },
-						data: [10,50,80,60,65,58,70,80,90,100,110,120],
+						data: [],
 					},
 				],
 			},
-			pieOption: {
-				backgroundColor: "",
-				tooltip: {
-					trigger: "item",
-				},
-				legend: {
-					top: "bottom",
-				},
-				series: {
-					name: "不合格统计",
-					type: "pie",
-					radius: "50%",
-					itemStyle: {
-						borderRadius: 2,
-					},
-					center: ["50%", "45%"],
-					data: [
-					{ value: 0, name: "划伤" },
-					{ value: 0, name: "气泡" },
-					{ value: 0, name: "水纹" },
-					{ value: 0, name: "崩边" },
-					{ value: 0, name: "雾面" },
-					{ value: 0, name: "麻点" },
-					{ value: 0, name: "线痕" },
-					{ value: 0, name: "破损" },
-					{ value: 0, name: "其他" },
-					],
-					emphasis: {
-						itemStyle: {
-							shadowBlur: 10,
-							shadowOffsetX: 0,
-							shadowColor: "rgba(0, 0, 0, 0.5)",
-						},
-					},
-				},
-			},
 			tableHeight: 100,
-			table1Visible: false,
-			table2Visible: false,
-			refValue1: "moocBox1",
-			refValue2: "moocBox2",
-			liData: ["序号","产出名称","规格","型号","开始时间","结束时间","完成进度","产量","状态"],
-			processData1: [],
-			processData2: [],
-			todayMtask: [],
 			speed: 2000,
-			myScroll: null,
-			iliHeight: 30,
 			time: null,
-			delay: 20,
-			start_date: "",
-			end_date: "",
-			yesterday: "",
+			hh:{
+				bw:0,
+				lq:0,
+				wyx:0,
+				gz:0,
+			},
+			th:{
+				bw:0,
+				lq:0,
+				wyx:0,
+				gz:0,
+			},
+			sctj_ysetday:{
+				hh:0,
+				th:0
+			},
+			tcfx:{
+				yesterday:0,
+				today:0,
+				tomorrow:0,
+
+			},
+			kctj:{
+				dhh:0,
+				hhz:0,
+				thz:0,
+				thok:0,
+			},
 			dayInterval: null,
-			chartInterval1: null,
 			chartInterval2: null,
-			chartInterval3: null,
-			stateOption: {
-				30: "生产中",
-				40: "已完成",
+			configData:{
+				header:['物料名称','批次号','数量'],
+				headerBGC:'#0a3f44',
+				headerHeight:40,
+				align:'center',
+				data:[],
+				// carousel:'page',
+				waitTime:1000,
+				// columnWidth: [,,50]
+			},
+			configData1:{
+				headerBGC:'#0a3f44',
+				header:['产出名称','规格','型号','开始时间','结束时间','完成进度','产量','状态'],
+				headerHeight:40,
+				data:[]
+			},
+			configData2:{
+				headerBGC:'#0a3f44',
+				header:['产出名称','规格','型号','开始时间','结束时间','完成进度','产量','状态'],
+				headerHeight:40,
+				data:[]
+			},
+			configData01:{
+				headerBGC:'#0a3f44',
+				header:['设备名称','设备编号','设备状态','生产进度','物料数量','保温剩余时间'],
+				headerHeight:40,
+				data:[]
+			},
+			configData02:{
+				headerBGC:'#0a3f44',
+				header:['设备名称','设备编号','设备状态','生产进度','物料数量','保温剩余时间'],
+				headerHeight:40,
+				data:[]
 			},
 			currentTime: "",
 			currentDay: "",
 			today: "",
-			yesterdayObjet: {},
-			yesHeihuaData:[
-				{年: 2024, 月: 7, 日: 5, 物料名: "CNC_黑化", 生产数: 260, 合格数: 240, 不合格数: 0, 划伤: 0, 气泡: 0, 水纹: 0, 崩边: 0, 雾面: 0,麻点:0},
-			],
-			yesTuihuoData:[
-				{年: 2024, 月: 7, 日: 5, 物料名: "CNC_退火", 生产数: 250, 合格数: 240, 不合格数: 0, 划伤: 0, 气泡: 0, 水纹: 0, 崩边: 0, 雾面: 0,麻点:0},
-			],
+			end_time:'',
+			start_time:'',
 		};
 	},
 	mounted() {
 		//表格table的高度
 		this.tableHeight = document.getElementById("scrollContainer").clientHeight;
-		this.table1Visible = true;
-		this.table2Visible = true;
-
 		this.showTime();
 		this.dayInterval = setInterval(() => {
 			this.showTime();
 		}, 1000);
-		let date = new Date();
-		let year = date.getFullYear();
-		let month = date.getMonth() + 1;
-		let day = date.getDate();
-		let days = new Date(year, month, 0).getDate();
-		this.days = days;
-		this.currentYear = year;
-		this.currentMonth = month;
-		this.currentDay = day;
-		month = month < 10 ? "0" + month : month;
-		this.start_date = year + "-" + month + "-01";
-		this.end_date =
-			year + "-" + month + "-" + new Date(year, month, 0).getDate();
-		this.today = year + "-" + month + "-" + day;
-		let yesterday = new Date(date.getTime() - 24 * 60 * 60 * 1000);
-		this.yesterday =
-			yesterday.getFullYear() +
-			"-" +
-			(yesterday.getMonth() + 1) +
-			"-" +
-			yesterday.getDate();
-		this.getProductLine1();
-		// this.getProductLine2();
-		this.getMtask1();
-		this.getMtask2();
+		//近七天的日期数组
+		let daysArr = this.getMondayOfCurrentWeek();
+		this.daysArr = daysArr;
+		let xAxisData = [];
+		daysArr.forEach((item)=>{
+			let dates  = item.split('-');
+			let obj = dates[1]+'-'+dates[2];
+			xAxisData.push(obj);
+		})
+		this.xAxisData = xAxisData;
+		let startDate = new Date(daysArr[0]).getTime()-(1000*60*60*24);
+		let endDate = new Date(daysArr[6]).getTime()+(1000*60*60*24);
+		let start_time = this.$TOOL.dateFormat(new Date(startDate), "yyyy-MM-dd hh:mm:ss");
+		let end_time = this.$TOOL.dateFormat(new Date(endDate), "yyyy-MM-dd hh:mm:ss");
+		this.start_time = start_time;
+		this.end_time = end_time;
+		this.$nextTick(() => {
+			//设备数据
+			this.getEqState1();
+			this.getEqState2();
+			//任务进度
+			this.getMtask1();
+			this.getMtask2();
+			//投产/生产分析
+		    this.getProductLine1();
+			this.getProductLine2();
+			//库存统计
+			this.getMaterials();
+			//投产分析统计数
+			this.getLeftBottomNum();
+		})
 	},
 	methods: {
+		getMondayOfCurrentWeek() {
+			let today = new Date();
+			let days = [];
+			for (let i = 6; i >= 0; i--) {
+				let date = new Date(today);
+				date.setDate(today.getDate() - i);
+				days.push(date.toISOString().split('T')[0]); // 格式化为 YYYY-MM-DD
+			}
+			return days;
+		},
 		//时间
 		showTime() {
 			this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
@@ -475,10 +484,7 @@ export default {
 			);
 		},
 		setChart(name, option = null) {
-			// 根据name 渲染数据, option需填写，否则option为模拟数据
-			var myChart = echarts.getInstanceByDom(
-				document.getElementById(name)
-			);
+			var myChart = echarts.getInstanceByDom(document.getElementById(name));
 			if (myChart == undefined) {
 				myChart = echarts.init(document.getElementById(name), "dark", {
 					renderer: "svg",
@@ -494,96 +500,43 @@ export default {
 			}, 500);
 			return myChart;
 		},
-		//黑化合格数统计
+		//投产分析
 		getProductLine1() {
 			let that = this;
 			let obj = {
-				query: {
-					start_date: that.start_date,
-					end_date: that.end_date,
-					mgroup_name: "黑化",
-					"group_bys_material": "",
-					"order_bys_material": "",
-					"select_cols_material": "",
-				},
+				query: {start_time: that.start_time,end_time: that.end_time},
 			};
-			that.$API.bi.dataset.exec.req("lineDay_m", obj).then((res) => {
-				console.log("本月黑化生产统计:", res);
-				let list2 = res.data2.ds0;
-				let seriesData1 = [],
-					seriesData2 = [],
-					seriesData3 = [];
-				for (let i = 0; i < that.days; i++) {
+			that.$API.bi.dataset.exec.req("thslrk", obj).then((res) => {
+				let list = res.data2.ds0;
+				let seriesData1 = [];
+				for (let i = 0; i < that.xAxisData.length; i++) {
 					seriesData1[i] = 0;
-					seriesData2[i] = 0;
 				}
-				if (list2.length > 0) {
-					list2.forEach((item2) => {
-						let index2 = item2.日 - 1;
-						//合格率=当天的合格数/当天的总生产数
-						seriesData1[index2] += item2.合格数;
-						seriesData2[index2] += item2.生产数;
+				if (list.length > 0) {
+					list.forEach((item) => {
+						let date = item.日期.split("-")[1]+'-'+item.日期.split("-")[2];
+						let index = that.xAxisData.indexOf(date);
+						seriesData1[index] = item.送料数+item.入库数;
 					});
 				}
-				for (let i = 0; i < that.days; i++) {
-					if(seriesData2[i]>0&&seriesData1[i] >=0){
-						seriesData3[i] = Math.round(seriesData1[i]/seriesData2[i])*100 ;
-					}else{
-						seriesData3[i]=0;
-					}
-				}
+				that.tcfx.yesterday = seriesData1[5];
 				let chart1Option = deepCopy(this.basicOption);
-				let chart2Option = deepCopy(this.basicOption);
-
-				
+				chart1Option.xAxis.data = that.xAxisData;
 				chart1Option.series[0].data = seriesData1;
-				chart2Option.series[0].type = 'line';
-				chart2Option.series[0].data = seriesData3;
-				that.getProductLine2(chart1Option,chart2Option);
-			});
-
-			//黑化生产昨日统计
-			let obj2 = {
-				query: {
-					start_date: that.yesterday,
-					end_date: that.yesterday,
-					mgroup_name: "黑化",
-					"group_bys_material": "",
-					"order_bys_material": "",
-					"select_cols_material": "",
-				},
-			};
-			that.$API.bi.dataset.exec.req("lineDay_m", obj2).then((res2) => {
-				// console.log("黑化生产昨日统计:", res2);
-				that.yesHeihuaData = res2.data2.ds0;
-				let pieOption = deepCopy(that.pieOption);
-				if (res2.data2.ds0.length > 0) {
-					res2.data2.ds0.forEach((item) => {
-						pieOption.series.data[0].value += item.划伤;
-						pieOption.series.data[1].value += item.气泡;
-						pieOption.series.data[2].value = item.水纹;
-						pieOption.series.data[3].value = item.崩边;
-						pieOption.series.data[4].value = item.雾面;
-						pieOption.series.data[5].value = item.麻点;
-						pieOption.series.data[5].value = item.线痕;
-						pieOption.series.data[5].value = item.破损;
-						pieOption.series.data[5].value = item.其他;
-					});
-				}
-				let pieChart1 = this.setChart("pieChart1", pieOption);
+				let chart1 = this.setChart("chart1", chart1Option);
 				let index1 = 0;
-				this.chartInterval3 = setInterval(function () {
-					if (index1 < that.pieOption.series.data.length) {
-						pieChart1.dispatchAction({
+				this.chartInterval2 = setInterval(function () {
+					if (index1 < chart1Option.series[0].data.length) {
+						chart1.dispatchAction({
 							type: "downplay",
 							seriesIndex: 0,
 						});
-						pieChart1.dispatchAction({
+						chart1.dispatchAction({
 							type: "highlight",
 							seriesIndex: 0,
 							dataIndex: index1,
 						});
-						pieChart1.dispatchAction({
+						chart1.dispatchAction({
 							type: "showTip",
 							seriesIndex: 0,
 							dataIndex: index1,
@@ -593,64 +546,41 @@ export default {
 						index1 = 0;
 					}
 				}, 3000);
-				debugger;
 			});
 		},
-		//退火合格数统计
-		getProductLine2(chart1Option,chart2Option) {
+		//生产分析
+		getProductLine2() {
 			let that = this;
 			let obj = {
-				query: {
-					start_date: that.start_date,
-					end_date: that.end_date,
-					mgroup_name: "退火",
-					"group_bys_material": "",
-					"order_bys_material": "",
-					"select_cols_material": "",
-				},
+				query: {start_time: that.start_time,end_time: that.end_time},
 			};
-			that.$API.bi.dataset.exec.req("lineDay_m", obj).then((res) => {
-				// console.log("本月退火生产统计:", res);
+			that.$API.bi.dataset.exec.req("jltj", obj).then((res) => {
 				let list = res.data2.ds0;
-				let seriesData1 = [],
-					seriesData2 = [],
-					seriesData3 = [],
-					xAxisData = [];
-				for (let i = 0; i < that.days; i++) {
-					let day = i + 1;
-					let text = day + "日";
-					xAxisData[i] = text;
+				let seriesData1 = [],seriesData2 = [];
+				for (let i = 0; i < that.xAxisData.length; i++) {
 					seriesData1[i] = 0;
 					seriesData2[i] = 0;
 				}
 				if (list.length > 0) {
-					list.forEach((item2) => {
-						let index2 = item2.日 - 1;
-						seriesData1[index2] += item2.合格数;
-						seriesData2[index2] += item2.生产数;
+					list.forEach((item) => {
+						let date = item.日期.split("-")[1]+'-'+item.日期.split("-")[2];
+						let index = that.xAxisData.indexOf(date);
+						seriesData1[index] = item.黑化数;
+						seriesData2[index] = item.退火数;
 					});
 				}
-				for (let i = 0; i < that.days; i++) {
-					if(seriesData2[i]>0&&seriesData1[i] >=0){
-						seriesData3[i] = Math.round(seriesData1[i]/seriesData2[i])*100 ;
-					}else{
-						seriesData3[i]=0;
-					}
-				}
-				chart1Option.xAxis.data = xAxisData;
-				chart2Option.xAxis.data = xAxisData;
-
-				
-				chart1Option.series[1].data = seriesData1;
-				chart2Option.series[1].type = 'line';
-				chart2Option.series[1].data = seriesData3;
-
-				let chart1 = this.setChart("chart1", chart1Option);
+				that.sctj_ysetday.hh = seriesData1[5];
+				that.sctj_ysetday.th = seriesData2[5];
+				let chart2Option = deepCopy(this.basicOption);
+				chart2Option.xAxis.data = that.xAxisData;
+				chart2Option.series[0].name = '黑化数';
+				chart2Option.series[1].name = '退火数';
+				chart2Option.series[0].data = seriesData1;
+				chart2Option.series[1].data = seriesData2;
 				let chart2 = this.setChart("chart2", chart2Option);
-				
 				let index2 = 0;
 				this.chartInterval2 = setInterval(function () {
-					if (index2 < chart1Option.series[0].data.length) {
+					if (index2 < chart2Option.series[0].data.length) {
 						chart2.dispatchAction({
 							type: "downplay",
 							seriesIndex: 0,
@@ -665,201 +595,266 @@ export default {
 							seriesIndex: 0,
 							dataIndex: index2,
 						});
-						chart1.dispatchAction({
-							type: "downplay",
-							seriesIndex: 0,
-						});
-						chart1.dispatchAction({
-							type: "highlight",
-							seriesIndex: 0,
-							dataIndex: index2,
-						});
-						chart1.dispatchAction({
-							type: "showTip",
-							seriesIndex: 0,
-							dataIndex: index2,
-						});
 						index2++;
 					} else {
 						index2 = 0;
 					}
 				}, 3000);
 			});
-			
-			//车间生产昨日统计 
-			let obj2 = {
-				query: {
-					start_date: that.yesterday,
-					end_date: that.yesterday,
-					mgroup_name: "退火",
-					"group_bys_material": "",
-					"order_bys_material": "",
-					"select_cols_material": "",
-				},
-			};
-			that.$API.bi.dataset.exec.req("lineDay_m", obj2).then((res2) => {
-				// console.log("车间生产昨日统计:", res2);
-				that.yesTuihuoData = res2.data2.ds0;
-				let pieOption = deepCopy(that.pieOption);
-				if (res2.data2.ds0.length > 0) {
-					res2.data2.ds0.forEach((item) => {
-						pieOption.series.data[0].value += item.划伤;
-						pieOption.series.data[1].value += item.气泡;
-						pieOption.series.data[2].value = item.水纹;
-						pieOption.series.data[3].value = item.崩边;
-						pieOption.series.data[4].value = item.雾面;
-						pieOption.series.data[5].value = item.麻点;
-						pieOption.series.data[5].value = item.线痕;
-						pieOption.series.data[5].value = item.破损;
-						pieOption.series.data[5].value = item.其他;
+		},
+		//黑化设备运行状态0
+		getEqState10() {
+			let that = this;
+			that.$API.wpm.ana.equipLastMlog.req({mgroup_name: '黑化'}).then((res) => {
+				console.log('黑化设备运行状态',res);
+				that.hh.bw = res.保温;
+				that.hh.lq = res.冷却;
+				that.hh.wyx = res.未运行;
+				that.hh.gz = res.故障;
+				let processData = [];
+				let now = new Date(res.now).getTime();
+				if(res.rows.length>0){
+					res.rows.forEach((item) => {
+						let arr = [],obj1 = {},obj2 = {},obj3 = {},obj4 = {},obj5 = {};
+						obj1.elType = "primary";
+						obj1.value = item.name;
+						obj2.elType = "primary";
+						obj2.value = item.number;
+						obj3.elType = "elicon";
+						obj3.value = item.mstate;
+						obj4.elType = "progress";
+						let process = 0;
+						let startTime = new Date(item.work_start_time).getTime();
+						let endTime = new Date(item.work_end_time).getTime();
+						let sumTime =0;
+						if(item.reminder_interval_list&&item.reminder_interval_list>0){
+							sumTime = item.reminder_interval_list[0]+item.reminder_interval_list[1];
+						}else{
+							sumTime = endTime - startTime;
+						}
+						if(now>startTime&&now<endTime){
+							process = Math.round((now - startTime)/sumTime*100);
+						}else if(now<startTime){
+							process = 0;
+						}else if(now>endTime){
+							process = 100;
+						}
+						obj4.value = process;
+						obj5.elType = "primary";
+						obj5.value = item.t_count_use;
+						arr.push(obj1);
+						arr.push(obj2);
+						arr.push(obj3);
+						arr.push(obj4);
+						arr.push(obj5);
+						processData.push(arr);
 					});
+					this.processData01 = processData;
 				}
-				let pieChart2 = this.setChart("pieChart2", pieOption);
-				let index2 = 0;
-				this.chartInterval3 = setInterval(function () {
-					if (index2 < pieOption.series.data.length) {
-						pieChart2.dispatchAction({
-							type: "downplay",
-							seriesIndex: 0,
-						});
-						pieChart2.dispatchAction({
-							type: "highlight",
-							seriesIndex: 0,
-							dataIndex: index2,
-						});
-						pieChart2.dispatchAction({
-							type: "showTip",
-							seriesIndex: 0,
-							dataIndex: index2,
-						});
-						index2++;
-					} else {
-						index2 = 0;
-					}
-				}, 3000);
-				debugger;
+					
+			});
+		},
+		//黑化设备运行状态
+		getEqState1() {
+			let that = this;
+			that.$API.wpm.ana.equipLastMlog.req({mgroup_name: '黑化'}).then((res) => {
+				console.log('黑化设备运行状态',res);
+				that.hh.bw = res.保温;
+				that.hh.lq = res.冷却;
+				that.hh.wyx = res.未运行;
+				that.hh.gz = res.故障;
+				that.configData01.data = [];
+				let nowTime = new Date(res.now).getTime();
+				if(res.rows.length>0){
+					res.rows.forEach((item) => {
+						let arr = [];
+						arr[0] = item.name;
+						arr[1] =  item.number;
+						if(item.mstate=='保温'){
+							arr[2] =   '<span style="color:rgb(245, 196, 0)">保温</span>';
+						}else if(item.mstate=='冷却'){
+							arr[2] =   '<span style="color:rgb(0,163,245)">冷却</span>';
+						}else if(item.mstate=='未运行'){
+							arr[2] =   '<span style="color:rgb(69,176,118)">未运行</span>';
+						}else if(item.mstate=='故障'){
+							arr[2] =  '<span style="color:rgb(222,60,54)">故障</span>';
+						}
+						let process = null, workTime =0,saveTime=null,sumTime=0;
+						if(item.reminder_interval_list&&item.reminder_interval_list.length>0){
+							item.reminder_interval_list.forEach(item=>{
+								sumTime += item;
+							})
+							let startTime = new Date(item.work_start_time).getTime();
+							workTime = (nowTime-startTime)/60000;//已工作时间
+							process = Math.round((workTime/sumTime)*100);
+							process = process>100?'100%':process+'%';
+							let bwSaveTime =  Math.round(item.reminder_interval_list[0]-workTime);
+							if(bwSaveTime>0){
+								saveTime = bwSaveTime;
+							}else{
+								saveTime = 0;
+							}
+						}else{
+							process = '';
+							saveTime = '';
+						}
+						arr[3] = process;
+						arr[4] = item.t_count_use?item.t_count_use:0;
+						arr[5] = saveTime;
+						that.configData01.data.push(arr);
+					});
+				}	
 			});
 		},
 		//黑化任务进度
 		getMtask1() {
 			let that = this;
-			that.$API.mtm.mgroup.list.req({ page: 0, search: '黑化'})
-			.then((res) => {
-				if(res.length != 1){
-					that.$message.error("获取工段错误");
-					return;
-				}
-				let mgroup = res[0].id;
-				let obj = {};
-				// obj.start_date__gte = this.start_date;
-				// obj.end_date__lte = this.end_date;
-				obj.mgroup = mgroup;
-				obj.page = 0;
-				that.$API.pm.mtask.list.req(obj).then((res) => {
-					let processData = [];
-					res.forEach((item) => {
-						let arr = [],
-							obj1 = {},
-							obj2 = {},
-							obj3 = {},
-							obj4 = {},
-							obj5 = {},
-							obj6 = {},
-							obj7 = {},
-							obj8 = {};
-						obj1.elType = "primary";
-						obj1.value = item.material_out_.name;
-						obj2.elType = "primary";
-						obj2.value = item.material_out_.specification;
-						obj8.elType = "primary";
-						obj8.value = item.material_out_.model;
-						obj3.elType = "primary";
-						obj3.value = item.start_date;
-						obj4.elType = "primary";
-						obj4.value = item.end_date;
-						obj5.elType = "progress";
-						let process = Math.round(
-							(item.count_ok / item.count) * 100
-						);
-						obj5.value = process;
-						obj6.elType = "primary";
-						obj6.value = item.count_ok;
-						obj7.elType = "tag";
-						obj7.value = item.state;
-						arr.push(obj1);
-						arr.push(obj2);
-						arr.push(obj8);
-						arr.push(obj3);
-						arr.push(obj4);
-						arr.push(obj5);
-						arr.push(obj6);
-						arr.push(obj7);
-						processData.push(arr);
-					});
-					this.processData1 = processData;
+			let obj = {};
+			obj.mgroup__name =  '黑化';
+			obj.page = 0;
+			that.$API.pm.mtask.list.req(obj).then((res) => {
+				that.configData1.data = [];
+				res.forEach((item) => {
+					let arr = [];
+					arr[0] = item.material_out_.name;
+					arr[1] = item.material_out_.specification;
+					arr[2] = item.material_out_.model;
+					arr[3] = item.start_date;
+					arr[4] = item.end_date;
+					let process = Math.round((item.count_ok / item.count) * 100)+'%';
+					arr[5] = process;
+					arr[6] = item.count_ok;
+					if(item.state==20){
+						arr[7]='<span style="color:rgb(0,163,245);displaydisplay:inline-block;padding:2px 6px;background:rgb(226,241,245);border:1px solid rgb(0,163,245);border-radius:3px">已下达</span>';
+					}else if(item.state==34){
+						arr[7]='<span style="color:rgb(222,60,54);displaydisplay:inline-block;padding:2px 6px;background:rgb(247,231,231);border:1px solid rgb(222,60,54);border-radius:3px">已停止</span>';
+					}else if(item.state==40){
+						arr[7]='<span style="color:rgb(69,176,118);displaydisplay:inline-block;padding:2px 6px;background:rgb(231,247,232);border:1px solid rgb(69,176,118);border-radius:3px">已提交</span>';
+					}
+					that.configData1.data.push(arr);
 				});
 			});
 		},
+		//退火设备运行状态
+		getEqState2() {
+			let that = this;
+			that.$API.wpm.ana.equipLastMlog.req({mgroup_name: '退火'}).then((res) => {
+				console.log('退火设备运行状态',res);
+				that.th.bw = res.保温;
+				that.th.lq = res.冷却;
+				that.th.wyx = res.未运行;
+				that.th.gz = res.故障;
+				that.configData02.data = [];
+				let nowTime = new Date(res.now).getTime();
+				if(res.rows.length>0){
+					res.rows.forEach((item) => {
+						let arr = [];
+						arr[0] = item.name;
+						arr[1] =  item.number;
+						if(item.mstate=='保温'){
+							arr[2] =   '<span style="color:rgb(245, 196, 0)">保温</span>';
+						}else if(item.mstate=='冷却'){
+							arr[2] =   '<span style="color:rgb(0,163,245)">冷却</span>';
+						}else if(item.mstate=='未运行'){
+							arr[2] =   '<span style="color:rgb(69,176,118)">未运行</span>';
+						}else if(item.mstate=='故障'){
+							arr[2] =  '<span style="color:rgb(222,60,54)">故障</span>';
+						}
+						let process = null, workTime =0,saveTime=null,sumTime=0;
+						if(item.reminder_interval_list&&item.reminder_interval_list.length>0){
+							item.reminder_interval_list.forEach(item=>{
+								sumTime += item;
+							})
+							let startTime = new Date(item.work_start_time).getTime();
+							workTime = (nowTime-startTime)/60000;//已工作时间
+							process = Math.round((workTime/sumTime)*100);
+							process = process>100?'100%':process+'%';
+							let bwSaveTime = Math.round(item.reminder_interval_list[0]-workTime);
+							if(bwSaveTime>0){
+								saveTime = bwSaveTime;
+							}else{
+								saveTime = 0;
+							}
+						}else{
+							process = '';
+							saveTime = '';
+						}
+						arr[3] = process;
+						arr[4] = item.t_count_use?item.t_count_use:0;
+						arr[5] = saveTime;
+						that.configData02.data.push(arr);
+					});
+				}	
+			});
+		},
 		//退火任务进度
 		getMtask2() {
 			let that = this;
-			that.$API.mtm.mgroup.list.req({ page: 0, search: '退火'})
-			.then((res) => {
-				if(res.length != 1){
-					that.$message.error("获取工段错误");
-					return;
-				}
-				let mgroup = res[0].id;
-				let obj = {};
-				// obj.start_date__gte = this.start_date;
-				// obj.end_date__lte = this.end_date;
-				obj.mgroup = mgroup;
-				obj.page = 0;
-				that.$API.pm.mtask.list.req(obj).then((res) => {
-					let processData = [];
-					res.forEach((item) => {
-						let arr = [],
-							obj1 = {},
-							obj2 = {},
-							obj3 = {},
-							obj4 = {},
-							obj5 = {},
-							obj6 = {},
-							obj7 = {},
-							obj8 = {};
-						obj1.elType = "primary";
-						obj1.value = item.material_out_.name;
-						obj2.elType = "primary";
-						obj2.value = item.material_out_.specification;
-						obj8.elType = "primary";
-						obj8.value = item.material_out_.model;
-						obj3.elType = "primary";
-						obj3.value = item.start_date;
-						obj4.elType = "primary";
-						obj4.value = item.end_date;
-						obj5.elType = "progress";
-						let process = Math.round(
-							(item.count_ok / item.count) * 100
-						);
-						obj5.value = process;
-						obj6.elType = "primary";
-						obj6.value = item.count_ok;
-						obj7.elType = "tag";
-						obj7.value = item.state;
-						arr.push(obj1);
-						arr.push(obj2);
-						arr.push(obj8);
-						arr.push(obj3);
-						arr.push(obj4);
-						arr.push(obj5);
-						arr.push(obj6);
-						arr.push(obj7);
-						processData.push(arr);
-					});
-					this.processData2 = processData;
+			let obj = {};
+			obj.mgroup__name = '退火';
+			obj.page = 0;
+			that.$API.pm.mtask.list.req(obj).then((res) => {
+				that.configData2.data = [];
+				res.forEach((item) => {
+					let arr = [];
+					arr[0] = item.material_out_.name;
+					arr[1] = item.material_out_.specification;
+					arr[2] = item.material_out_.model;
+					arr[3] = item.start_date;
+					arr[4] = item.end_date;
+					let process = Math.round((item.count_ok / item.count) * 100)+'%';
+					arr[5] = process;
+					arr[6] = item.count_ok;
+					if(item.state==20){
+						arr[7]='<span style="color:rgb(0,163,245);displaydisplay:inline-block;padding:2px 6px;background:rgb(226,241,245);border:1px solid rgb(0,163,245);border-radius:3px">已下达</span>';
+					}else if(item.state==34){
+						arr[7]='<span style="color:rgb(222,60,54);displaydisplay:inline-block;padding:2px 6px;background:rgb(247,231,231);border:1px solid rgb(222,60,54);border-radius:3px">已停止</span>';
+					}else if(item.state==40){
+						arr[7]='<span style="color:rgb(69,176,118);displaydisplay:inline-block;padding:2px 6px;background:rgb(231,247,232);border:1px solid rgb(69,176,118);border-radius:3px">已提交</span>';
+					}
+					that.configData2.data.push(arr);
 				});
 			});
 		},
+		getLeftBottomNum(){
+			let that = this;
+			this.$API.wpm.ana.put_prod.req().then((res) => {
+			    that.tcfx.today = res.今日退火投产预测;
+			    that.tcfx.tomorrow = res.明日退火投产预测;
+			})
+		},
+		//库存统计列表
+		getMaterials() {
+			let that = this;
+			that.$API.wpm.wmaterial.list.req({ page: 0,mgroup__name__in:'退火,黑化' }).then((res) => {
+				that.configData.data = [];
+				if(res.length>0){
+					res.forEach((item) => {
+					    let arr = [];
+						arr[0] = item.material_name;
+						arr[1] = item.batch;
+						arr[2] = item.count;
+						that.configData.data .push(arr);
+					})
+				}
+			})
+		},
+		//工段生产数量
+		getMgroupCount(){
+			let that = this;
+			that.$API.bi.dataset.exec.req("	gdscs").then((res) => {
+				let arr = res.data2.ds0;
+				arr.forEach((item) => {
+					if(item.工段=='退火'){
+						that.kctj.thz = item.生产中数;
+						that.kctj.thok = item.合格品数;
+					}else if(item.工段=='黑化'){
+						that.kctj.dhh = item.待生产数;
+						that.kctj.hhz = item.生产中数;
+					}
+				})
+			})
+		},
 	},
 };
 </script>
@@ -909,6 +904,7 @@ export default {
 	font-size: 16px;
 	display: flex;
 	height: 36px;
+	line-height: 36px;
 	background: linear-gradient(
 		40deg,
 		rgba(11, 101, 140, 0.451),
@@ -925,11 +921,35 @@ export default {
 .boxlabel {
 	margin-left: 6px;
 	font-size: 18px;
-	margin-top: 6px;
+	/* margin-top: 6px; */
+}
+.stateIcon{
+	width:16px;
+	height: 16px;
+	margin: 0 5px;
+	border-radius: 8px;
+	display: inline-block;
+}
+.bwIcon{
+	background-color: rgb(245, 196, 0);
+}
+.lqIcon{
+	background-color: rgb(0,163,245);
+}
+.wyxIcon{
+	background-color: rgb(69,176,118);
+}
+.gzIcon{
+	background-color: rgb(222,60,54);
+}
+.eqNum{
+	margin: 0 10px;
 }
-
 .boxmain {
-	height: calc(100% - 40px);
+	height: calc(100% - 50px);
+}
+.boxmain.boxmainbottom{
+	height: calc(100% - 120px);
 }
 .lineDiv {
     height: 40px;
@@ -989,4 +1009,25 @@ export default {
 .halfBox {
 	height: 50%;
 }
+
+.totalStatic{
+	display: flex;
+}
+.totalStaticItem{
+	flex: 1;
+	height: 25px;
+	text-align: center;
+	line-height: 25px;
+	font-size: 14px;
+	margin-top: 5px;
+}
+.totalStaticItemNum{
+	font-size: 24px;
+	height: 40px;
+	line-height: 40px;
+	font-family: "myfont";
+	text-align: center;
+	margin-top: 0;
+	color: rgb(149, 255, 255);
+}
 </style>

From 6764381bad52fed4fa436ef383891020f0da3c1a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 10 Sep 2024 17:30:55 +0800
Subject: [PATCH 05/16] =?UTF-8?q?fix:=E6=8E=A5=E6=94=B6=E9=83=A8=E9=97=A8p?=
 =?UTF-8?q?laceholder=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 73a09904..f90e5f62 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -62,7 +62,7 @@
 					<el-form-item label="接收部门" prop="recive_dept">
 						<el-select
 							v-model="form.recive_dept"
-							placeholder="接收工段"
+							placeholder="接收部门"
 							clearable
 							style="width: 100%"
 							@change="getUserList3"

From 98b54e50d5893627a56fabd812997811964f1d77 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Sep 2024 15:27:06 +0800
Subject: [PATCH 06/16] =?UTF-8?q?fix:=E9=BB=91=E5=8C=96=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_heihuadept.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/bigScreen/index_heihuadept.vue b/src/views/bigScreen/index_heihuadept.vue
index c445fd8c..e37a867b 100644
--- a/src/views/bigScreen/index_heihuadept.vue
+++ b/src/views/bigScreen/index_heihuadept.vue
@@ -462,6 +462,8 @@ export default {
 			this.getMaterials();
 			//投产分析统计数
 			this.getLeftBottomNum();
+			//工段生产数量
+			this.getMgroupCount();
 		})
 	},
 	methods: {
@@ -844,6 +846,7 @@ export default {
 			let that = this;
 			that.$API.bi.dataset.exec.req("	gdscs").then((res) => {
 				let arr = res.data2.ds0;
+				console.log('工段生产数量',arr)
 				arr.forEach((item) => {
 					if(item.工段=='退火'){
 						that.kctj.thz = item.生产中数;

From 744f78b6217e8143c38f36a85ef6901c918b97db Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Sep 2024 15:28:35 +0800
Subject: [PATCH 07/16] =?UTF-8?q?fix:=E5=B7=A5=E6=AE=B5=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E5=BA=93=E5=AD=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 77 ++++++++++++++++++++---------------
 src/views/wpm_gx/inm.vue      | 21 +++++++---
 2 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 66749295..58af3668 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -75,21 +75,19 @@
 				<el-table-column type="expand">
 						<template #default="props">
 							<div style="padding-left: 50px">
-								<el-descriptions :column="2">
-									<template v-for="item in props.row.handoverb" :key="item.id">
-										<el-descriptions :column="3">
-											<el-descriptions-item label="批次">
-												{{props.row.batch}}
-											</el-descriptions-item>
-											<el-descriptions-item label="数量">
-												{{props.row.count}}
-											</el-descriptions-item>
-											<el-descriptions-item label="不合格标记" v-if="props.row.notok_sign_name!==null">
-												{{props.row.notok_sign_name}}
-											</el-descriptions-item>
-										</el-descriptions>
-									</template>
-								</el-descriptions>
+								<template v-for="item in props.row.handoverb" :key="item.id">
+									<el-descriptions :column="3">
+										<el-descriptions-item label="批次">
+											{{item.batch}}
+										</el-descriptions-item>
+										<el-descriptions-item label="数量">
+											{{item.count}}
+										</el-descriptions-item>
+										<el-descriptions-item label="不合格标记" v-if="item.notok_sign_name!==null">
+											{{item.notok_sign_name}}
+										</el-descriptions-item>
+									</el-descriptions>
+								</template>
 							</div>
 						</template>
 					</el-table-column>
@@ -105,18 +103,13 @@
 				</el-table-column>
 				<el-table-column label="数量" prop="count" width="80"></el-table-column>
 				<el-table-column label="交接类型" prop="type" width="100">
-					<template #default="scope">
-						<el-text
-							v-if="scope.row.send_mgroup == mgroupId"
-							type="primary"
-							>交送</el-text
-						>
-						<span style="width: 4px;"></span>
-						<el-text
-							v-if="scope.row.recive_mgroup == mgroupId"
-							type="success"
-							>接收</el-text
-						>
+					<template #default="scope" v-if="mgroupName=='size'||mgroupName=='facade'">
+						<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
+						<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
+					</template>
+					<template #default="scope" v-else>
+						<el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
+						<el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
 					</template>
 				</el-table-column>
 				<el-table-column label="交接类别" prop="type" width="80">
@@ -127,9 +120,12 @@
 						<el-tag v-if="scope.row.type == 20" type="warning"
 							>返工</el-tag
 						>
-						<el-tag v-if="scope.row.type == 30" type="warning"
+						<el-tag v-if="scope.row.type == 30" type="primary"
 							>检验</el-tag
 						>
+						<el-tag v-if="scope.row.type == 40" type="danger"
+							>报废</el-tag
+						>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -275,8 +271,10 @@ export default {
 			selection: [],
 			handoverItem: {},
 			values: "交送",
+			deptId:'',
 			mtask: "",
 			mlogId: "",
+			mgroupId: "",
 			processId: "",
 			processCate: "",
 			printer_name: "",
@@ -285,12 +283,27 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		console.log('that.mgroupName',that.mgroupName);
 		if(that.mgroupName=="size"){//尺寸检验
-			that.params.material__process__name="一次超洗";
-			that.apiObj = that.$API.wpm.handover.list;
+			// that.params.material__process__name="一次超洗";
+			that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
+			    if(res.length>0){
+					that.deptId = res[0].id;
+					that.params.dept=res[0].id;
+					console.log('that.deptId',that.deptId);
+				}
+				that.apiObj = that.$API.wpm.handover.list;
+			})
 		}else if(that.mgroupName=="facade"){//外观检验
-			that.params.material__process__name="二次超洗";
-			that.apiObj = that.$API.wpm.handover.list;
+			// that.params.material__process__name="二次超洗";
+			that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
+			    if(res.length>0){
+					that.deptId = res[0].id;
+					that.params.dept=res[0].id;
+					console.log('that.deptId',that.deptId);
+				}
+				that.apiObj = that.$API.wpm.handover.list;
+			})
 		}else{//工段交接
 			that.printer_name = localStorage.getItem("printer_name");
 			that.$API.mtm.mgroup.list
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 13ef1dfb..dc5f440f 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -34,7 +34,6 @@
 				ref="table"
 				:apiObj="apiObj"
 				row-key="id"
-				hidePagination
 				:params="params"
 				:query="query"
 			>
@@ -182,6 +181,7 @@ export default {
 			apiObj: null,
 			params: {
 				mgroupx: "",
+				belong_dept:''
 			},
 			query: {},
 			dialog: {
@@ -202,11 +202,21 @@ export default {
 	mounted() {
 		let that = this;
 		if(that.mgroupName=="size"){
-			that.params.material__process__name = "一次超洗";
-			that.apiObj = that.$API.wpm.wmaterial.list;
+			// that.params.material__process__name = "一次超洗";
+			that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
+				if(res.length>0){
+					that.params.belong_dept=res[0].id;
+				}
+				that.apiObj = that.$API.wpm.wmaterial.list;
+			})
 		}else if(that.mgroupName=="facade"){
-			that.params.material__process__name = "二次超洗";
-			that.apiObj = that.$API.wpm.wmaterial.list;
+			// that.params.material__process__name = "二次超洗";
+			that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
+				if(res.length>0){
+					that.params.belong_dept=res[0].id;
+				}
+				that.apiObj = that.$API.wpm.wmaterial.list;
+			})
 		}else{
 			that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
@@ -218,6 +228,7 @@ export default {
 				that.mgroupId = res[0].id;
 				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
 				that.params.mgroupx = res[0].id;
+				that.params.belong_dept = res[0].belong_dept;
 				that.apiObj = that.$API.wpm.wmaterial.list;
 			});
 		}

From 2d5bbca57806138a90c8032891e94c262660f491 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Sep 2024 15:46:40 +0800
Subject: [PATCH 08/16] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8F=AD=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/products_form.vue | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/views/qm/products_form.vue b/src/views/qm/products_form.vue
index 6daa1c6e..e78535c8 100644
--- a/src/views/qm/products_form.vue
+++ b/src/views/qm/products_form.vue
@@ -106,6 +106,25 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="班次">
+								<el-select
+									v-model="form.shift"
+									placeholder="班次"
+									clearable
+									filterable
+									style="width: 100%;"
+								>
+									<el-option
+										v-for="item in shiftOtions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 					</el-row>
 					<el-divider style="margin-top:0"></el-divider>
 					<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'||mode=='sizeShow'">
@@ -458,12 +477,14 @@ export default {
 			isSaveing: false,
 			options: [],
 			userList:[],
+			shiftOtions:[],
 			selectionFilters: [],
 			setFiltersVisible: false,
 		};
 	},
 	mounted() {
 		this.getUsers();
+		this.getShift();
 	},
 	methods: {
 		//显示
@@ -473,6 +494,12 @@ export default {
 			this.getMaterialBatch();
 			return this;
 		},
+		getShift(){
+			let that = this;
+			that.$API.mtm.shift.list.req({ page: 0 }).then((res) => {
+				that.shiftOtions = res;
+			});
+		},
 		getUsers(){
 			let that = this;
 			let userList = [];

From 8a1cf4a25bcf3d45f03f60558ab5f0483201f601 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Sep 2024 16:47:01 +0800
Subject: [PATCH 09/16] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=B8=AD=E4=BA=A4=E6=8E=A5=E8=AE=B0=E5=BD=95=E7=9A=84=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 58af3668..ae24d515 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -406,14 +406,26 @@ export default {
 		searchTypeQuery() {
 			let that = this;
 			if (that.searchType == "send") {
-				that.query.send_mgroup = that.mgroupId;
-				that.query.recive_mgroup = "";
+				if(that.mgroupName=="size"||that.mgroupName=="facade"){
+					that.query.send_dept = that.deptId;
+					that.query.recive_dept = "";
+				}else{
+					that.query.send_mgroup = that.mgroupId;
+					that.query.recive_mgroup = "";
+				}
 			} else if (that.searchType == "recive") {
-				that.query.recive_mgroup = that.mgroupId;
-				that.query.send_mgroup = "";
+				if(that.mgroupName=="size"||that.mgroupName=="facade"){
+					that.query.send_dept = "";
+					that.query.recive_dept =that.deptId;
+				}else{
+					that.query.recive_mgroup = that.mgroupId;
+					that.query.send_mgroup = "";
+				}
 			} else {
 				that.query.send_mgroup = "";
 				that.query.recive_mgroup = "";
+				that.query.recive_dept = "";
+				that.query.send_dept = "";
 			}
 			console.log(that.query);
 			this.$refs.table.queryData(that.query);

From 1cb2c30d3ec6f22373ec4880bed92d5671d5d858 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Sep 2024 16:56:19 +0800
Subject: [PATCH 10/16] =?UTF-8?q?fix:=E5=90=88=E6=A0=BC=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=AF=8F=E4=B8=AA=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/pass_num_gx.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue
index 61daef0a..e96a1879 100644
--- a/src/views/statistics/pass_num_gx.vue
+++ b/src/views/statistics/pass_num_gx.vue
@@ -923,6 +923,7 @@ export default {
 			let option = deepCopy(that.basicOption);
 			let query = deepCopy(that.query);
 			query.mgroup_name = mgroup_name;
+			option.title.text = mgroup_name+"合格数统计";
 			let obj = {};
 			obj.query = query;
 			that.$API.bi.dataset.exec.req('lineDay_m', obj).then((res) => {
@@ -934,7 +935,6 @@ export default {
 					tableData.forEach((ite) => {
 						if (nameList.indexOf(ite.物料名) > -1) {} else {
 							nameList.push(ite.物料名);
-							
 							dataList.push([])
 							datas.push([0,0,0,0,0,0,0]);
 							let obj = {
@@ -947,24 +947,20 @@ export default {
 							option.series.push(obj)
 						}
 					});
-					console.log('nameList',nameList);
 					that.nameList = nameList;
 					tableData.forEach((item) => {
 						let indexX = nameList.indexOf(item.物料名);
 						dataList[indexX].push(item);
 					});
-					console.log('dataList',dataList)
 					for(let i = 0;i<dataList.length;i++){
 						for(let j = 0;j<dataList[i].length;j++){
 							let index = that.weekDateList.indexOf(dataList[i][j].日);
 							datas[i][index] = dataList[i][j].合格数; //将当前日期对应的合格数添加到datas中
 						}
 					}
-					console.log('datas',datas);
 					for(let n=0;n<nameList.length;n++){
 						option.series[n].data = datas[n];
 					}
-					console.log('option',option);
 					let chartId = 'bachart'+mgroup_index;
 					that.setChart(chartId, option);
 				} else {

From 4382057684dd99b4b8bcf8d40f9778cc61d436f4 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 10:03:05 +0800
Subject: [PATCH 11/16] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E2=80=94=E4=BB=BB=E5=8A=A1=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/task_rate_gx.vue | 646 +++++++++++++++++++++++---
 1 file changed, 589 insertions(+), 57 deletions(-)

diff --git a/src/views/statistics/task_rate_gx.vue b/src/views/statistics/task_rate_gx.vue
index 9bd3be5c..07aa0d32 100644
--- a/src/views/statistics/task_rate_gx.vue
+++ b/src/views/statistics/task_rate_gx.vue
@@ -2,7 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-select v-model="mgroupId" 
+				<!-- <el-select v-model="mgroupId" 
 				placeholder="请选择工段" 
 				@change="mgroupChange">
 					<el-option
@@ -12,7 +12,7 @@
 						:value="item.id"
 					>
 					</el-option>
-				</el-select>
+				</el-select> -->
 				<el-date-picker
 					v-model="searchDate"
 					type="month"
@@ -29,31 +29,25 @@
 			</div>
 		</el-header>
 		<el-main id="elMain">
-			<el-row :gutter="10" id="elCol">
-				<el-col :lg="10">
-					<el-card shadow="never">
-						<scEcharts height="500px" :option="option"></scEcharts>
-					</el-card>
-				</el-col>
-				<el-col :lg="14">
-					<el-card shadow="never" style="position: relative">
+			<!-- 0 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart0"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
 						<el-button
-							@click="handleExport('7')"
+							@click="handleExport(0)"
 							class="tables"
 							type="primary"
 							>导出</el-button
 						>
-						<el-table
-							:data="tableData1"
-							id="exportDiv7"
-							height="500px"
-						>
+						<el-table :data="tableData0" id="exportDiv0" :height="300">
 							<el-table-column type="index" width="50" />
-							<el-table-column
-								label="任务编号"
-								prop="number"
-								min-width="100px"
-							>
+							<el-table-column label="任务编号" prop="number" min-width="100px">
 							</el-table-column>
 							<el-table-column label="计划数" prop="count">
 							</el-table-column>
@@ -63,13 +57,490 @@
 							</el-table-column>
 						</el-table>
 					</el-card>
-				</el-col>
-			</el-row>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 1 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart1"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(1)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table
+								:data="tableData1"
+								id="exportDiv1"
+								:height="300"
+							>
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 2 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart2"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(2)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData2" id="exportDiv2" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 3 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart3"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(3)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData3" id="exportDiv3" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 4 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart4"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(4)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData4" id="exportDiv4" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 5 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart5"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(5)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData5" id="exportDiv5" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 6 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart6"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(6)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData6" id="exportDiv6" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 7 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart7"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(7)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData7" id="exportDiv7" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 8 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart8"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(8)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData8" id="exportDiv8" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 9 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart9"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(9)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData9" id="exportDiv9" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 10 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart10"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(10)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData10" id="exportDiv10" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 11 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart11"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(11)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData11" id="exportDiv11" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 12 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart12"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(12)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData12" id="exportDiv12" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 13 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart13"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(13)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData13" id="exportDiv13" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 14 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart14"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(14)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData14" id="exportDiv14" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
+			<!-- 15 -->
+			<el-card shadow="never" style="margin-bottom: 8px">
+				<el-row :gutter="10">
+					<el-col :lg="12">
+						<el-card shadow="never">
+							<div id="linechart15"></div>
+						</el-card>
+					</el-col>
+					<el-col :lg="12">
+						<el-card shadow="never" style="position: relative">
+							<el-button
+								@click="handleExport(15)"
+								class="tables"
+								type="primary"
+								>导出</el-button
+							>
+							<el-table :data="tableData15" id="exportDiv15" :height="300">
+								<el-table-column type="index" width="50" />
+								<el-table-column label="任务编号" prop="number" min-width="100px">
+								</el-table-column>
+								<el-table-column label="计划数" prop="count">
+								</el-table-column>
+								<el-table-column label="完成数" prop="count_ok">
+								</el-table-column>
+								<el-table-column label="完成率" prop="rate">
+								</el-table-column>
+							</el-table>
+						</el-card>
+					</el-col>
+				</el-row>
+			</el-card>
 		</el-main>
 	</el-container>
 </template>
 <script>
+import * as echarts from "echarts";
+import T from "@/components/scEcharts/echarts-theme-T.js";
+echarts.registerTheme("T", T);
 import scEcharts from "@/components/scEcharts";
+function deepCopy(obj) {
+	return JSON.parse(JSON.stringify(obj));
+}
+const ondDayTime = 86400000;
 export default {
 	name: "chart",
 	components: {
@@ -90,8 +561,7 @@ export default {
 			currentDate: "",
 			searchDate:'',
 			options:[],
-			tableData1: [],
-			option: {
+			basicOption: {
 				title: {
 					text: "",
 				},
@@ -104,7 +574,7 @@ export default {
 				},
 				color: ["rgb(64,158,255)", "orange"],
 				series: {
-					name: "7车间完成率",
+					name: "任务进度",
 					type: "pie",
 					radius: ["40%", "70%"],
 					center: ["50%", "60%"],
@@ -119,63 +589,119 @@ export default {
 					],
 				},
 			},
+			tableData0: [],
+			tableData1: [],
+			tableData2: [],
+			tableData3: [],
+			tableData4: [],
+			tableData5: [],
+			tableData6: [],
+			tableData7: [],
+			tableData8: [],
+			tableData9: [],
+			tableData10: [],
+			tableData11: [],
+			tableData12: [],
+			tableData13: [],
+			tableData14: [],
+			tableData15: [],
 		};
 	},
 	mounted() {
 		let that = this;
-		let date = new Date();
-		let year = date.getFullYear();
-		let month = date.getMonth() + 1;
-		month = month < 10 ? "0" + month : month;
-		that.currentDate = that.searchDate = year + "-" + month;
-		let days = new Date(year, month, 0).getDate();
-		let start_date = year + "-" + month + "-01";
-		let end_date = year + "-" + month + "-"+days;
-		that.start_date = that.query.querys[0][0].value = start_date;
-		that.end_date = that.query.querys[1][0].value = end_date;
-		let height = document.getElementById("elCol").clientHeight;
-		let chartheight = height+'px';
-		that.tableHeight = height-20;
+		let nowDate = new Date();
 		that.getMgroup();
 	},
 	methods: {
+		getWeekDate(dates){
+			let that = this;
+			dates = new Date(dates);
+			let week =dates.getDay(); //当前时间的week数
+			let weekFirst = 0, weekLast = 0; 
+			if (week == 0) {
+				weekFirst = 6;
+				weekLast = 0; //周日特殊处理
+			} else {
+				weekFirst = week - 1;
+				weekLast = 7 - week;
+			}
+			let first = new Date(dates.getTime() - weekFirst * ondDayTime); //本周周一
+			let last = new Date(new Date(dates.getTime() + weekLast * ondDayTime)); //本周周日
+			let dateArr = [];
+			for (let i = 0; i < 7; i++) {
+				let itemDate = new Date(first.getTime() + i * ondDayTime);
+				let item = itemDate.getDate();
+				dateArr.push(item);
+			}
+			that.weekDateList = dateArr;
+			that.query.start_date = that.query.querys[0][0].value = first.toISOString().split('T')[0];
+			that.query.end_date = that.query.querys[1][0].value = last.toISOString().split('T')[0];
+			that.options.forEach((item,index)=>{
+				that.getData(item.id,item.name,index);
+			})
+			
+		},
 		getMgroup(){
 			let that = this;
 			that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
 				that.options = res;
+				let nowDate = new Date();
+				that.getWeekDate(nowDate);
 			});
 		},
-		getData() {
+		setChart(name, option = null) {
+			// 根据name 渲染数据, option需填写，否则option为模拟数据
+			var myChart = echarts.getInstanceByDom(
+				document.getElementById(name)
+			);
+			if (myChart == undefined) {
+				myChart = echarts.init(document.getElementById(name), "T");
+			}
+			if (option == null) {
+				option = Object.assign({}, this.basicOption);
+			}
+			setTimeout(() => {
+				try {
+					myChart.setOption(option);
+				} catch (error) {}
+			}, 500);
+		},
+		getData(mgroup_id,mgroup_name,mgroup_index) {
 			let that = this;
 			that.tableData1 = [];
-			that.option.series.data[0].value = 0;
-			that.option.series.data[1].value = 0;
+			let option = deepCopy(that.basicOption);
+			option.title.text = mgroup_name+"任务进度";
+			option.series.data[0].value = 0;
+			option.series.data[1].value = 0;
+			
+			that.query.querys[0][1].value = mgroup_id;
+			that.query.querys[1][1].value = mgroup_id;
 			that.$API.pm.mtask.cquery.req(that.query).then((res) => {
-				let data = [];
+				let names = 'tableData'+mgroup_index;
+				that[names] = res;
+				console.log('names',names);
+				console.log('that[names]',that[names]);
 				let count_ok1 = 0;
 				let count_notok1 = 0;
 				if (res.length > 0) {
 					res.forEach((item) => {
-						let obj = item;
-						obj.rate = Math.round((item.count_ok / item.count) * 100).toFixed(2) + "%";
 						if (item.count_ok >= item.count) {
 							count_ok1++;
 						} else {
 							count_notok1++;
 						}
-						data.push(obj);
 					});
-					that.tableData1 = data;
+					option.series.data[0].value = count_ok1;
+					option.series.data[1].value = count_notok1;
+					let chartId = 'linechart'+mgroup_index;
+					that.setChart(chartId, option);
+				}else{
+					let chartId = 'linechart'+mgroup_index;
+					that.setChart(chartId, option);
 				}
-				that.option.series.data[0].value = count_ok1;
-				that.option.series.data[1].value = count_notok1;
+				
 			});
 		},
-		mgroupChange(){
-			let that = this;
-			that.query.querys[0][1].value = that.mgroupId;
-			that.query.querys[1][1].value = that.mgroupId;
-		},
 		handleQuery(){
 			let that = this;
 			if(this.searchDate!==''&&this.searchDate!==null){
@@ -191,7 +717,9 @@ export default {
 				that.query.querys[0][0].value = that.start_date;
 				that.query.querys[1][0].value = that.end_date;
 			}
-			that.getData();
+			that.options.forEach((item,index)=>{
+				that.getData(item.id,item.name,index);
+			})
 		},
 		handleExport(val) {
 			this.exportLoading = true;
@@ -205,8 +733,12 @@ export default {
 </script>
 
 <style scoped>
-#elCol{
-	height:100%;
+#linechart1,#linechart2,#linechart3,#linechart4,
+#linechart5,#linechart6,#linechart7,#linechart8,
+#linechart9,#linechart10,#linechart11,#linechart12,
+#linechart13,#linechart14,#linechart15,#linechart0{
+	width: 100%;
+	height: 300px;
 }
 .tables {
 	position: absolute;

From 714e18e1685da261b676e69c6a62cb3fb4fdaf24 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 10:43:46 +0800
Subject: [PATCH 12/16] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E9=83=A8=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover_form.vue | 42 +++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index f90e5f62..46a6e9d8 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -281,7 +281,6 @@ export default {
 		let day = date.getDate();
 		that.form.handle_date = year + "-" + month + "-" + day;
 		that.form.send_mgroup = that.mgroupId;
-		console.log('mgroupName',that.mgroupName)
 		if(that.mgroupName=="size"||that.mgroupName=="facade"){//检验部交接
 			that.$API.system.user.list
 				.req({ page: 0, posts__code__contains: "check" })
@@ -321,18 +320,45 @@ export default {
 		getMaterial() {
 			let that = this;
 			var req = {
-				mgroupx: that.mgroupId,
 				page: 0,
 				notok_sign__isnull : 1,
 				count_xtest__isnull:1
 			};
 			if(that.mgroupName=="size"){
-				req.material__process__name="一次超洗";
-			}else if(that.mgroupName=="facade"){
-				req.material__process__name="二次超洗";
-			}
+			that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
+				if(res.length>0){
+					req.belong_dept=res[0].id;
+					this.$API.wpm.wmaterial.list.req(req).then((res) => {
+						let arr = [];
+						res.forEach(item=>{
+							let obj = {};
+							Object.assign(obj,item);
+							obj.label = item.batch;
+							arr.push(obj);
+						})
+						that.materialOptions = arr;
+					});
+				}
+			})
+		}else if(that.mgroupName=="facade"){
+			that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
+				if(res.length>0){
+					req.belong_dept=res[0].id;
+					this.$API.wpm.wmaterial.list.req(req).then((res) => {
+						let arr = [];
+						res.forEach(item=>{
+							let obj = {};
+							Object.assign(obj,item);
+							obj.label = item.batch;
+							arr.push(obj);
+						})
+						that.materialOptions = arr;
+					});
+				}
+			})
+		}else{
+			req.mgroupx = that.mgroupId;
 			this.$API.wpm.wmaterial.list.req(req).then((res) => {
-				// that.materialOptions = res;
 				let arr = [];
 				res.forEach(item=>{
 					let obj = {};
@@ -342,6 +368,8 @@ export default {
 				})
 				that.materialOptions = arr;
 			});
+		}
+			
 		},
 		//获取车间不合格物料
 		getMaterialNotok() {

From 7316da4504e65e0ec68f30d8aa5d1e7793deca16 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 10:44:54 +0800
Subject: [PATCH 13/16] =?UTF-8?q?fix:coding#4811.2=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                      |  8 ++++----
 src/views/statistics/task_rate_gx.vue | 17 +++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 0f8b0cf5..347d9a1e 100644
--- a/.env.development
+++ b/.env.development
@@ -16,14 +16,14 @@ VUE_APP_PJ = ''
 # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
 
 #测试环境
- VUE_APP_API_BASEURL = http://10.50.211.228:2250/api
+#  VUE_APP_API_BASEURL = http://10.50.211.228:2250/api
 #VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
- VUE_APP_BASEURL = http://10.50.211.228:2250
+#  VUE_APP_BASEURL = http://10.50.211.228:2250
 #VUE_APP_BASEURL = http://127.0.0.1:2226
 
 # #光子
-# VUE_APP_API_BASEURL = http://49.232.14.174:2250/api
-# VUE_APP_BASEURL = http://49.232.14.174:2250
+VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+VUE_APP_BASEURL = http://49.232.14.174:2226
 
 # 本地端口
 VUE_APP_PORT = 2800
diff --git a/src/views/statistics/task_rate_gx.vue b/src/views/statistics/task_rate_gx.vue
index 07aa0d32..ee355c27 100644
--- a/src/views/statistics/task_rate_gx.vue
+++ b/src/views/statistics/task_rate_gx.vue
@@ -584,7 +584,7 @@ export default {
 						formatter: "{b} : {c} ({d}%)",
 					},
 					data: [
-						{ value: 0, name: "已完成" },
+						{ value: 0, name: "合格数" },
 						{ value: 0, name: "未完成" },
 					],
 				},
@@ -681,18 +681,15 @@ export default {
 				that[names] = res;
 				console.log('names',names);
 				console.log('that[names]',that[names]);
-				let count_ok1 = 0;
-				let count_notok1 = 0;
+				let count_jh = 0,count_ok = 0,count_diff = 0;
 				if (res.length > 0) {
 					res.forEach((item) => {
-						if (item.count_ok >= item.count) {
-							count_ok1++;
-						} else {
-							count_notok1++;
-						}
+						count_jh+=item.count;
+						count_ok+=item.count_ok;
 					});
-					option.series.data[0].value = count_ok1;
-					option.series.data[1].value = count_notok1;
+					count_diff = count_jh - count_ok;
+					option.series.data[0].value = count_ok;
+					option.series.data[1].value = count_diff;
 					let chartId = 'linechart'+mgroup_index;
 					that.setChart(chartId, option);
 				}else{

From ff9f751fefd30224b28183dbeccfca3cdc5fd30c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 11:23:14 +0800
Subject: [PATCH 14/16] =?UTF-8?q?fix:coding#481=EF=BC=9A=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/pass_num_gx.vue | 277 ++++++++++++++++++++-------
 1 file changed, 212 insertions(+), 65 deletions(-)

diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue
index e96a1879..3e7784e0 100644
--- a/src/views/statistics/pass_num_gx.vue
+++ b/src/views/statistics/pass_num_gx.vue
@@ -31,12 +31,12 @@
 			<!-- 0 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart0"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(0)"
@@ -52,6 +52,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -63,11 +65,22 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<el-table-column label="前道不良" prop="加工前不良">
+								</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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -78,12 +91,12 @@
 			<!-- 1 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart1"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(1)"
@@ -110,11 +123,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -125,12 +147,12 @@
 			<!-- 2 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart2"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(2)"
@@ -157,11 +179,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -172,12 +203,12 @@
 			<!-- 3 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart3"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(3)"
@@ -204,11 +235,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -219,12 +259,12 @@
 			<!-- 4 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart4"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(4)"
@@ -251,11 +291,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -266,12 +315,12 @@
 			<!-- 5 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart5"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(5)"
@@ -298,11 +347,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -313,12 +371,12 @@
 			<!-- 6 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart6"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(6)"
@@ -345,11 +403,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -360,12 +427,12 @@
 			<!-- 7 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart7"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(7)"
@@ -392,11 +459,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -407,12 +483,12 @@
 			<!-- 8 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart8"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(8)"
@@ -439,11 +515,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -454,12 +539,12 @@
 			<!-- 9 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart9"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(9)"
@@ -486,11 +571,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -501,12 +595,12 @@
 			<!-- 10 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart10"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(10)"
@@ -533,11 +627,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -548,12 +651,12 @@
 			<!-- 11 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart11"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(11)"
@@ -580,11 +683,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -595,12 +707,12 @@
 			<!-- 12 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart12"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(12)"
@@ -627,11 +739,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -642,12 +763,12 @@
 			<!-- 13 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart13"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(13)"
@@ -674,11 +795,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -689,12 +819,12 @@
 			<!-- 14 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart14"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(14)"
@@ -721,11 +851,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -736,12 +875,12 @@
 			<!-- 15 -->
 			<el-card shadow="never" style="margin-bottom: 8px">
 				<el-row :gutter="10">
-					<el-col :lg="12">
+					<el-col :lg="10">
 						<el-card shadow="never">
 							<div id="bachart15"></div>
 						</el-card>
 					</el-col>
-					<el-col :lg="12">
+					<el-col :lg="14">
 						<el-card shadow="never" style="position: relative">
 							<el-button
 								@click="handleExport(15)"
@@ -768,11 +907,20 @@
 								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
-								<el-table-column label="不合格数" prop="不合格数">
+								<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="合格率">
 									<template #default="scope">
-										{{ Math.round(scope.row.合格率) }}%
+										{{ (scope.row.合格率).toFixed(2) }}%
 									</template>
 								</el-table-column>
 							</el-table>
@@ -780,7 +928,6 @@
 					</el-col>
 				</el-row>
 			</el-card>
-			
 		</el-main>
 	</el-container>
 </template>

From a0013e00cc8d1aaeca817f10fd67b6b8f66cd5f9 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 11:25:58 +0800
Subject: [PATCH 15/16] =?UTF-8?q?fix:coding#481=EF=BC=9A=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/pass_num_gx.vue | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue
index 3e7784e0..a30fe78d 100644
--- a/src/views/statistics/pass_num_gx.vue
+++ b/src/views/statistics/pass_num_gx.vue
@@ -112,6 +112,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -168,6 +170,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -224,6 +228,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -280,6 +286,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -336,6 +344,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -392,6 +402,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -448,6 +460,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -504,6 +518,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -560,6 +576,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -616,6 +634,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -672,6 +692,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -728,6 +750,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -784,6 +808,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -840,6 +866,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
@@ -896,6 +924,8 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名" min-width="100">
 								</el-table-column>
+								<el-table-column label="设备名称" prop="设备名称" min-width="100">
+								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
 										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}

From 58bf615de3d025b2406dbb982938cf0e3f259576 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 15:28:29 +0800
Subject: [PATCH 16/16] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E7=89=A9=E6=96=99/?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue      | 12 +++---------
 src/views/wpm_gx/handover_form.vue |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index ae24d515..99f86c3c 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -163,20 +163,14 @@
 							size="small"
 							@click="table_receive(scope.row)"
 							type="success"
-							v-if="
-								scope.row.recive_mgroup == mgroupId &&
-								scope.row.submit_time == null
-							"
-							>接收</el-button
-						>
+							v-if="(scope.row.recive_mgroup == mgroupId||scope.row.recive_dept == deptId)&&scope.row.submit_time == null"
+						>接收</el-button>
 						<el-button
 							link
 							size="small"
 							@click="table_show(scope.row)"
 							type="success"
-							v-if="scope.row.recive_mgroup == mgroupId &&scope.row.submit_time == null"
-							>查看</el-button
-						>
+						>查看</el-button>
 						<el-button
 							link
 							size="small"
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 46a6e9d8..675e0371 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -291,7 +291,7 @@ export default {
 			that.deptID = that.$TOOL.data.get('gx_deptID');
 			that.getUserList();
 		}
-		if(that.type==40){
+		if(that.type==20||that.type==40){
 			that.getMaterialNotok();
 		}else{
 			that.getMaterial();