From b4b1f92c9ade5248fecf8ef02069c4c17e9e3033 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Wed, 15 Oct 2025 13:15:30 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=E6=A3=80=E9=AA=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=BB=98=E8=AE=A4=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f968b951f4d64afb0b8c27d2c4d23e9a79648c58.
---
 src/views/wpm_bx/mlogbw_check_table.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue
index f5b9712a..e3a4b48e 100644
--- a/src/views/wpm_bx/mlogbw_check_table.vue
+++ b/src/views/wpm_bx/mlogbw_check_table.vue
@@ -503,10 +503,8 @@ export default {
 		},
 		getEquipments(){
 			let that = this;
-			let eqId = localStorage.getItem("bxerpChenckEquipmentId");
 			that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => {
 				that.equipmentOptions = res;
-				that.form.equipment = eqId;
 			})
 		},
 		getdefects(){
@@ -753,6 +751,11 @@ export default {
 				if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
 					let str = item.rule_expression.replace(/`/g, '');
 					str = str.replace(/\${(.*?)}/g, 'row.\$1');
+					// if(str.indexOf('row.剪切值18mm')>-1){
+					// 	if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){
+					// 		str = str.split('||')[0];
+					// 	}
+					// }
 					let judge = false;
 					try {
 					    judge = eval(str);
@@ -806,7 +809,6 @@ export default {
 		},
 		equipmentChange(){
 			let that = this;
-			localStorage.setItem("bxerpChenckEquipmentId",that.form.equipment);
 			that.equipmentOptions.forEach(item => {
 				if(item.id == that.form.equipment){
 					that.form.equipment_name = item.name;