设备运行跟踪优化

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1532,22 +1532,22 @@
 			  <el-row :gutter="30">
 			    <el-col :span="5">
 			      <el-form-item label="装版总工时:" prop="flatFeed" class="mab">
-			  				  <el-input v-model="formdata3.value.装版工时" id="装版总工时" @keydown="ent1($event)" :clearable="true" style="width: 200px;" />
+			  				  <el-input v-model="formdata3.value.装版总工时" id="装版总工时" @keydown="ent1($event)" :clearable="true" style="width: 200px;" />
 			      </el-form-item>
 			    </el-col>
 			    <el-col :span="5">
 			      <el-form-item label="装版补产工时:" prop="flatFeed" class="mab" >
-			      <el-input v-model="formdata3.value.装版补产工时" id="装版补产工时"  @keydown="ent1($event)" :clearable="true" style="width: 100px; margin-right: 30px;" />
+			      <el-input v-model="formdata3.value.装版工时" id="装版补产工时"  @keydown="ent1($event)" :clearable="true" style="width: 100px; margin-right: 30px;" />
 			  				  </el-form-item>
 			    </el-col>
 				<el-col :span="5">
 				  <el-form-item label="打样总工时:" prop="flatFeed" class="mab">
-				   <el-input v-model="formdata3.value.打样工时" id="打样工时"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />
+				   <el-input v-model="formdata3.value.打样总工时" id="打样总工时"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />
 				  </el-form-item>
 				</el-col>
 				<el-col :span="5">
 				  <el-form-item label="打样补产工时:" prop="flatFeed" class="mab">
-				  <el-input v-model="formdata3.value.打样补产工时" id="打样补产工时"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />
+				  <el-input v-model="formdata3.value.打样工时" id="打样补产工时"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />
 				  </el-form-item>
 				</el-col>
 				<el-col :span="4">
@@ -1721,7 +1721,7 @@
 				  <el-input v-model="JPformdata['工序名称']" readonly style="width: 300px;" id="工序名称" />
 				</el-form-item>
 				<el-form-item label="检验类别:" prop="customerCode" class="mab" label-width="90">
-					<el-input v-model="JPformdata['检验类别']"  placeholder="Enter回车" style="width: 100px;" id="检验类别" @keydown="JPent($event)"/>
+					<el-input v-model="JPformdata['检验类别']" readonly placeholder="Enter回车" style="width: 100px;" id="检验类别" @keydown="JPent($event)"/>
 				</el-form-item>
 				<el-form-item label="废品率系数:" prop="customerCode" class="mab" label-width="100">
 					<el-input v-model="JPformdata['废品率系数']" style="width: 100px;" id="废品率系数" @keydown="JPent($event)"/>
@@ -1966,7 +1966,7 @@
 				    <el-input v-model="JPformdataedit['工序名称']" readonly style="width: 520px;" id="工序名称" />
 				  </el-form-item>
 				<el-form-item label="检验类别:" prop="customerCode" class="mab" label-width="100">
-				  <el-input v-model="JPformdataedit['检验类别']" style="width: 110px;" id="检验类别" @keydown="JPentedit($event)"/>
+				  <el-input v-model="JPformdataedit['检验类别']" readonly style="width: 110px;" id="检验类别" @keydown="JPentedit($event)"/>
 				</el-form-item>
 				<el-form-item label="废品率系数:" prop="customerCode" class="mab" label-width="100">
 				  <el-input v-model="JPformdataedit['废品率系数']" style="width: 110px;" id="废品率系数" @keydown="JPentedit($event)"/>
@@ -2569,26 +2569,36 @@ const JPmachineDetails = async (jt, riqi) => {
 	delete JPmachineDetail_data.data.totalA
 	delete JPmachineDetail_data.data.totalB
 	JPgytableData.value = Object.values(JPmachineDetail_data.data)
-	console.log(totalA)
-	console.log(totalB)
+	// 遍历 totalA 和 totalB 数组，将每个元素添加到新的行中
 	if(totalA.length != 0){
 		if(totalA){
 			let rowA = {
-				工单编号: 'A班产量:',
-				yjno: totalA[0].检验类型+ ':' +totalA[0].箱数,
-			}
-			JPgytableData.value.push(rowA)
+			工单编号: 'A班产量' 
+		};
+	const keys = ['yjno', '产品名称', 'gxmc']; // 定义字段名数组
+	totalA.forEach((item, index) => {
+		if (index < keys.length) {
+		// 使用模板字符串动态生成字段名和对应的值
+		rowA[keys[index]] = `${item.检验类型}: ${item.箱数}`;
 		}
+	});
+		JPgytableData.value.push(rowA);
+	}
 	}
 	if(totalB.length != 0){
 		if(totalB){
 			let rowB = {
-				工单编号: 'B班产量:',
-				yjno: totalB[0].检验类型+ ':' +totalB[0].箱数,
-				产品名称: totalB[1].检验类型+ ':' +totalB[1].箱数,
-			}
-			JPgytableData.value.push(rowB)
+			工单编号: 'B班产量' 
+		};
+	const keys = ['yjno', '产品名称', 'gxmc']; // 定义字段名数组
+	totalB.forEach((item, index) => {
+		if (index < keys.length) {
+		// 使用模板字符串动态生成字段名和对应的值
+		rowB[keys[index]] = `${item.检验类型}: ${item.箱数}`;
 		}
+	});
+		JPgytableData.value.push(rowB);
+	}
 	}
 	
 	// return require(`@/assets/${machineData.状态}.png`);
@@ -3892,7 +3902,7 @@ const onADD = async() => {
 	  gdzl_MachineList({address:CJMC.value}).then( MachineList_jitai =>{
 	  	gdzl_MachineList_address.data = MachineList_jitai.data;
 	  });
-	  
+	  console.log('点击新增')
 	  //打开新增按钮获取
 	  	qita_jitaidata();
 	  	
@@ -5911,10 +5921,10 @@ const initfordata3 = () => {
 		'前工序废':'',
 		'来料异常':'',
 		'换型类型':'',
+		'装版总工时':'',
 		'装版工时':'',
-		'装版补产工时':'',
+		'打样总工时':'',
 		'打样工时':'',
-		'打样补产工时':'',
 		'保养工时':'',
 		'异常总工时':'',
 		'异常类型':'',
@@ -6746,8 +6756,8 @@ const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组
 	码开始行:formdata3.value.码开始行,
 	码结束行:formdata3.value.码结束行,
 	sys_id:sys_id,
-	sczl_装版工时:formdata3.value.装版补产工时,
-	sczl_打样工时:formdata3.value.打样补产工时,
+	sczl_装版工时:formdata3.value.装版工时,
+	sczl_打样工时:formdata3.value.打样工时,
 	sczl_异常类型1:formdata3.value.异常类型,
 	sczl_异常停机工时:formdata3.value.异常总工时,
 	sczl_异常工时1:formdata3.value.异常补时,
@@ -6762,8 +6772,8 @@ const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组
  	sczl_来料少数: formdata3.value.来料异常,
  	sczl_ls: formdata3.value.联数,
  	sczl_ms: formdata3.value.色度数,
- 	sczl_装版总工时: formdata3.value.装版工时,
- 	sczl_打样总工时: formdata3.value.打样工时,
+ 	sczl_装版总工时: formdata3.value.装版总工时,
+ 	sczl_打样总工时: formdata3.value.打样总工时,
  	sczl_设备运行工时: formdata3.value.通电工时,
  	码包: formdata3.value.码包,
  	辅电表: formdata3.value.辅电表,
@@ -6830,8 +6840,8 @@ const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组
     码开始行:formdata3.value.码开始行,
     码结束行:formdata3.value.码结束行,
     sys_id:sys_id,
-    sczl_装版工时:formdata3.value.装版补产工时,
-    sczl_打样工时:formdata3.value.打样补产工时,
+    sczl_装版工时:formdata3.value.装版工时,
+    sczl_打样工时:formdata3.value.打样工时,
     sczl_异常类型1:formdata3.value.异常类型,
     sczl_异常停机工时:formdata3.value.异常总工时,
     sczl_异常工时1:formdata3.value.异常补时,
@@ -6848,8 +6858,8 @@ const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组
     sczl_来料少数: formdata3.value.来料异常,
     sczl_ls: formdata3.value.联数,
     sczl_ms: formdata3.value.色度数,
-    sczl_装版总工时: formdata3.value.装版工时,
-    sczl_打样总工时: formdata3.value.打样工时,
+    sczl_装版总工时: formdata3.value.装版总工时,
+    sczl_打样总工时: formdata3.value.打样总工时,
     sczl_设备运行工时: formdata3.value.通电工时,
     码包: formdata3.value.码包,
     辅电表: formdata3.value.辅电表,