From ccfb7956f4b98353042d1b26ba5c3f1ba07acd98 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 22 Aug 2025 13:38:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8B=E6=96=992?= =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecondPhase/slitting/SlittingCutting2.vue | 112 +++++++++++++++--- utils/getData3.js | 6 + utils/mork2.js | 4 + 3 files changed, 104 insertions(+), 18 deletions(-) diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue index dde62f8..a29da43 100644 --- a/pages/SecondPhase/slitting/SlittingCutting2.vue +++ b/pages/SecondPhase/slitting/SlittingCutting2.vue @@ -43,25 +43,29 @@ - + - + - - - + + + + + + + - +
子卷号轴位置操作子卷号壁厚管芯长度轴位置操作
{{e.container_name}}{{e.bh}}{{e.length}} {{ options1 | findByValue(e.site)}}
@@ -70,8 +74,20 @@ - + + + 提示 + + {{i+1}}.{{e}} + {{e}} + + + + + + + @@ -79,7 +95,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import {queryProductArea} from '@/utils/getData2.js' - import {slitterDevices, downRolls2} from '@/utils/getData3.js' + import {getTubeLength, slitterDevices, downRolls2} from '@/utils/getData3.js' export default { components: { NavBar, @@ -97,7 +113,11 @@ current: 0, val1: '', dataList: [], - disabled: false + disabled: false, + disabled1: false, + modalShow: false, + htmlContent1: [], + htmlContent2: [] }; }, onLoad (options) { @@ -130,26 +150,78 @@ radioChange (e) { this.index1 = e.detail.value }, - handleAdd () { + async _getTubeLength () { + this.disabled1 = true if (!this.val1.trim()) { + this.disabled1 = false return } - const index = this.dataList.findIndex(item => item === this.val1) - if (index !== -1) { - this.dataList.splice(index, 1) + try { + let res = await getTubeLength(this.val1) + if (res.status === 200) { + const index = this.dataList.findIndex(item => item.container_name === this.val1) + if (index !== -1) { + this.dataList.splice(index, 1) + } + this.dataList.push({container_name: this.val1, site: this.index1, bh: res.data.bh, length: res.data.length}) + this.val1 = '' + } else { + uni.showToast({ + title: res.message, + icon: 'none' + }) + } + this.disabled1 = false + } catch (e) { + this.disabled1 = false } - this.dataList.push({container_name: this.val1, site: this.index1}) - this.val1 = '' }, handleDelete (index) { this.dataList.splice(index, 1) }, - async _downRolls2 () { - this.disabled = true + downRolls2Confirm () { + this.htmlContent1 = [] + this.htmlContent2 = [] if (!this.index || !this.dataList.length) { - this.disabled = false return } + if (this.dataList.length === 1) { + 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}`] + } 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}`] + } + } else if (this.dataList.length === 2) { + if (this.dataList[0].site === this.dataList[1].site) { + 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}`] + } 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}`] + } + } + + } else if (this.dataList.length > 2) { + this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm', '管芯到管芯的间距>=50mm'] + this.dataList.map(e => { + this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`) + }) + } + this.modalShow = true + }, + modalSure () { + this._downRolls2() + }, + async _downRolls2 () { + this.disabled = true try { let res = await downRolls2(this.index, this.dataList) if (res) { @@ -160,8 +232,10 @@ this.dataList = [] } this.disabled = false + this.modalShow = false } catch (e) { this.disabled = false + this.modalShow = false } }, clearUp () { @@ -170,6 +244,8 @@ this.options = [] this.val1 = '' this.dataList = [] + this.disabled = false + this.disabled1 = false } } } diff --git a/utils/getData3.js b/utils/getData3.js index 6a7ff79..8a3c284 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -481,6 +481,12 @@ export const remainShaftBack = (code, size, ge, flag) => request({ /** * 分切下料2(二期分切管理) */ +export const getTubeLength = (code) => request({ + url:'api/pda/slitter/getTubeLength', + data: { + container_name: code + } +}) export const downRolls2 = (device, code) => request({ url:'api/pda/slitter/downRolls2', data: { diff --git a/utils/mork2.js b/utils/mork2.js index 38a89dc..d7a616f 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -290,4 +290,8 @@ export const showManualView = (code) => { export const doCallTubeShaftShow = () => { let res = [{"workorder_id":"1850909252072378369","resource_name":"B50FQ00001","container_name":"BB3X2410280807A2","parent_container_name":"BB3X24102809","split_group":"A","up_or_down":"2","status":"0","qzz_size":"6","tube":"玻璃纤维及其制品|FRP管|6英寸|15|1700|阶梯","qzz_generation":"4","start_time":"","is_paper_ok":"1","qzzno":"","manufacture_sort":"P1"}] return res +} +export const getTubeLength = (code) => { + let res = {"data":{"bh":"15","length":"1700"},"message":"获取信息成功!","status":200} + return res } \ No newline at end of file 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 2/3] =?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 From d1f8099adab8a26573e438a9d2fa9dae1bd83b95 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 22 Aug 2025 14:32:30 +0800 Subject: [PATCH 3/3] 140 --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 2701b4c..6a0e9a4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.3.9", - "versionCode" : 139, + "versionName" : "1.4.0", + "versionCode" : 140, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : {