From 45f60763cc5be0f7486182eca6f5a2f8d0ba20cf Mon Sep 17 00:00:00 2001 From: xiangxy Date: Mon, 13 May 2024 11:05:18 +0800 Subject: [PATCH] change --- src/i18n/langs/en.js | 1 + src/i18n/langs/zh.js | 1 + src/pages/modules/taskmanage/CarryPoint.vue | 241 +++++++++++--------- src/style/common.styl | 2 +- 4 files changed, 135 insertions(+), 110 deletions(-) diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 3526f8a..dcb87ea 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -24,6 +24,7 @@ module.exports = { dialogtip: 'If Select Return Site', returnsite: 'Return Site', pointcode: 'Point Code', + returnsitecode: 'Return Code', button1: 'Auto Pickup', button2: 'Auto Release', button3: 'Input Target Position', diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index cf9f793..cd1bb9b 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -24,6 +24,7 @@ module.exports = { dialogtip: '是否选择返回点', returnsite: '返回点', pointcode: '点位编码', + returnsitecode: '返回编码', button1: '自动取货', button2: '自动放货', button3: '输入点位', diff --git a/src/pages/modules/taskmanage/CarryPoint.vue b/src/pages/modules/taskmanage/CarryPoint.vue index 8a030f8..08d1720 100644 --- a/src/pages/modules/taskmanage/CarryPoint.vue +++ b/src/pages/modules/taskmanage/CarryPoint.vue @@ -41,6 +41,19 @@ > +
+
{{ $t('carrypoint.returnsitecode') }}
+
+ + +
+
@@ -81,6 +94,7 @@ export default { type: '', title: '', pointcode: '', + returnsitecode: '', unclick: false, disabled: false, visible: false, @@ -94,114 +108,114 @@ export default { pkId: '', selectObj: {}, value: '', - dataList: [] - // dataList: [ - // { - // point_code: '01', - // code_name: '18-一线起升电机', - // en_code_name: 'english-test' - // }, - // { - // point_code: '02', - // code_name: 'A-ZD102' - // }, - // { - // point_code: '3', - // code_name: 'A-ZD103' - // }, - // { - // point_code: '4', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '5', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '6', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '7', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '8', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '9', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '10', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '11', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '12', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '13', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '14', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '15', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '16', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '17', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '18', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '19', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '20', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '21', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '22', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '23', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '24', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '25', - // code_name: 'A-ZD101' - // }, - // { - // point_code: '26', - // code_name: 'A-ZD101' - // } - // ] + // dataList: [] + dataList: [ + { + point_code: '01', + code_name: '18-一线起升电机', + en_code_name: 'english-test' + }, + { + point_code: '02', + code_name: 'A-ZD102' + }, + { + point_code: '3', + code_name: 'A-ZD103' + }, + { + point_code: '4', + code_name: 'A-ZD101' + }, + { + point_code: '5', + code_name: 'A-ZD101' + }, + { + point_code: '6', + code_name: 'A-ZD101' + }, + { + point_code: '7', + code_name: 'A-ZD101' + }, + { + point_code: '8', + code_name: 'A-ZD101' + }, + { + point_code: '9', + code_name: 'A-ZD101' + }, + { + point_code: '10', + code_name: 'A-ZD101' + }, + { + point_code: '11', + code_name: 'A-ZD101' + }, + { + point_code: '12', + code_name: 'A-ZD101' + }, + { + point_code: '13', + code_name: 'A-ZD101' + }, + { + point_code: '14', + code_name: 'A-ZD101' + }, + { + point_code: '15', + code_name: 'A-ZD101' + }, + { + point_code: '16', + code_name: 'A-ZD101' + }, + { + point_code: '17', + code_name: 'A-ZD101' + }, + { + point_code: '18', + code_name: 'A-ZD101' + }, + { + point_code: '19', + code_name: 'A-ZD101' + }, + { + point_code: '20', + code_name: 'A-ZD101' + }, + { + point_code: '21', + code_name: 'A-ZD101' + }, + { + point_code: '22', + code_name: 'A-ZD101' + }, + { + point_code: '23', + code_name: 'A-ZD101' + }, + { + point_code: '24', + code_name: 'A-ZD101' + }, + { + point_code: '25', + code_name: 'A-ZD101' + }, + { + point_code: '26', + code_name: 'A-ZD101' + } + ] } }, created () { @@ -214,6 +228,7 @@ export default { switch (type) { case '1': this.pointcode = '' + this.returnsitecode = '' this.unclick = true break case '2': @@ -225,7 +240,8 @@ export default { toSureDialog (type) { switch (type) { case '1': - this.confirmPoint(this.pointcode, '1') + this.confirmPoint(this.pointcode, '1', this.returnsitecode) + this.$refs.child.active = false break case '2': if (this.value) { @@ -249,6 +265,9 @@ export default { inputFocus () { this.visible = false }, + inputFocus2 () { + this.visible = false + }, hide () { this.visible = false }, @@ -257,6 +276,9 @@ export default { // 限制只能输入数字,后端校验 // this.pointcode = val.replace(/[^\d]/g, '') }, + inputChange2 (val) { + this.returnsitecode = val + }, // 这个接口需要放到agv上去才行 async initData () { let res = await queryPoint() @@ -280,6 +302,7 @@ export default { toRadio (e) { this.pkId = this.pkId === e.point_code ? '' : e.point_code this.selectObj = e + this.toast('终点已选中') }, toSure (pcode, type) { this.confirmPoint(pcode, type) diff --git a/src/style/common.styl b/src/style/common.styl index 4239bdf..976b342 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -665,7 +665,7 @@ .grid_wrapper table th font-size 28px .form_item__label - font-size 25px + font-size 24px .button_control p font-size 34px .title_wrap h2