diff --git a/manifest.json b/manifest.json index adae54d..64b5808 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.2.9", - "versionCode" : 129, + "versionName" : "1.3.0", + "versionCode" : 130, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 7372152..2e8a189 100644 --- a/pages.json +++ b/pages.json @@ -678,14 +678,6 @@ "navigationStyle": "custom" } - } - ,{ - "path" : "pages/SecondPhase/slitting/EmptyAxisBind", - "style" : - { - "navigationStyle": "custom" - } - } ,{ "path" : "pages/SecondPhase/slitting/EmptyAxisReturn", diff --git a/pages/SecondPhase/slitting/EmptyAxisBind.vue b/pages/SecondPhase/slitting/EmptyAxisBind.vue deleted file mode 100644 index 8e71a4d..0000000 --- a/pages/SecondPhase/slitting/EmptyAxisBind.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - \ No newline at end of file diff --git a/pages/SecondPhase/slitting/EmptyAxisReturn.vue b/pages/SecondPhase/slitting/EmptyAxisReturn.vue index 7c8e948..3dda2c6 100644 --- a/pages/SecondPhase/slitting/EmptyAxisReturn.vue +++ b/pages/SecondPhase/slitting/EmptyAxisReturn.vue @@ -16,6 +16,22 @@ + + + 暂存A位 + + + + + + + + 暂存B位 + + + + + 暂存A位:{{obj.a_point}} 暂存B位:{{obj.b_point}} 状态:{{obj.status}} @@ -23,7 +39,7 @@ - + @@ -45,6 +61,9 @@ options2: [], index2: '', obj: {a_point: '-', b_point: '-', status: '-'}, + options1: [{text: '3寸4代', value: '3-4'}, {text: '3寸5代', value: '3-5'}, {text: '6寸5代', value: '6-5'}], + size1: '', + size2: '', disabled: false }; }, @@ -102,9 +121,15 @@ this.options = [...res] this.newoptions = [...res] }, + sizeChange1(e) { + this.size1 = e + }, + sizeChange2(e) { + this.size2 = e + }, toSure () { this.disabled = true - if (!this.index) { + if (!this.index || !this.size1 || !this.size2) { this.disabled = false return } @@ -123,7 +148,7 @@ }, async _returnShaft () { try { - let res = await returnShaft(this.index) + let res = await returnShaft(this.index, this.size1, this.size2) uni.showToast({ title: res.message, icon: 'none' @@ -136,6 +161,8 @@ clearUp () { this.index = '' this.index2 = '' + this.size1 = '' + this.size2 = '' this.options = [] this.obj = {a_point: '-', b_point: '-', status: '-'} }, diff --git a/utils/getData3.js b/utils/getData3.js index 1fbf74f..7cf508c 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -531,16 +531,9 @@ export const boxReturn = (code, box) => request({ /** * 空轴退回 */ -export const returnShaft = (code) => request({ +export const returnShaft = (code, size1, size2) => request({ url:'api/pda/slitter/returnShaft', - data: {point_code: code} -}) -/** - * 空轴绑定 - */ -export const slitterShaftBinding = (code, size) => request({ - url:'api/pda/slitter/ShaftBinding', - data: {point_code: code, size: size} + data: {point_code: code, size1: size1, size2: size2} }) /** * 饵料下卷