From cd14660a59ce86c849dc3f27aff1de6fc57c96df Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 22 Aug 2025 14:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecondPhase/slitting/SlittingCutting2.vue | 20 +++++++++++--------
 utils/mork2.js                                |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue
index a29da43..6e367f8 100644
--- a/pages/SecondPhase/slitting/SlittingCutting2.vue
+++ b/pages/SecondPhase/slitting/SlittingCutting2.vue
@@ -187,30 +187,34 @@
 				}
 				if (this.dataList.length === 1) {
 					if (Number(this.dataList[0].length) >= 350 && Number(this.dataList[0].length) < 1600) {
-						this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm']
+						this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面≥160mm', '三个轴承端面到管芯端面距离≥140mm', '管芯端面到缠绕膜边缘距离≥25mm']
 						this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
 					} else if (Number(this.dataList[0].length) >= 1600 && Number(this.dataList[0].length) <= 1700) {
-						this.htmlContent1 = ['85mm<=两个轴承端面到管芯端面距离<=120mm', '管芯端面到缠绕膜边缘距离>=25mm']
+						this.htmlContent1 = ['85mm≤两个轴承端面到管芯端面距离≤120mm', '管芯端面到缠绕膜边缘距离≥25mm']
 						this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
 					}
 				} else if (this.dataList.length === 2) {
 					if (this.dataList[0].site === this.dataList[1].site) {
-						this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm', '管芯到管芯的间距>=50mm']
+						this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面≥160mm', '三个轴承端面到管芯端面距离≥140mm', '管芯端面到缠绕膜边缘距离≥25mm', '管芯到管芯的间距≥50mm']
 						this.dataList.map(e => {
 							this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`)
 						})
 					} else {
 						if (Number(this.dataList[0].length) >= 350 && Number(this.dataList[0].length) < 1600) {
-							this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm']
-							this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
+							this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面≥160mm', '三个轴承端面到管芯端面距离≥140mm', '管芯端面到缠绕膜边缘距离≥25mm']
+							this.dataList.map(e => {
+								this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`)
+							})
 						} else if (Number(this.dataList[0].length) >= 1600 && Number(this.dataList[0].length) <= 1700) {
-							this.htmlContent1 = ['85mm<=两个轴承端面到管芯端面距离<=120mm', '管芯端面到缠绕膜边缘距离>=25mm']
-							this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
+							this.htmlContent1 = ['85mm≤两个轴承端面到管芯端面距离≤120mm', '管芯端面到缠绕膜边缘距离≥25mm']
+							this.dataList.map(e => {
+								this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`)
+							})
 						}
 					}
 					
 				} else if (this.dataList.length > 2) {
-					this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm', '管芯到管芯的间距>=50mm']
+					this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面≥160mm', '三个轴承端面到管芯端面距离≥140mm', '管芯端面到缠绕膜边缘距离≥25mm', '管芯到管芯的间距≥50mm']
 					this.dataList.map(e => {
 						this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`)
 					})
diff --git a/utils/mork2.js b/utils/mork2.js
index d7a616f..b743eef 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -292,6 +292,6 @@ export const doCallTubeShaftShow = () => {
 	return res
 }
 export const getTubeLength = (code) => {
-	let res = {"data":{"bh":"15","length":"1700"},"message":"获取信息成功!","status":200}
+	let res = {"data":{"bh":"15","length":"1500"},"message":"获取信息成功!","status":200}
 	return res
 }
\ No newline at end of file