diff --git a/src/config/getData.js b/src/config/getData.js index 44a2bd7..9ce63eb 100644 --- a/src/config/getData.js +++ b/src/config/getData.js @@ -48,4 +48,4 @@ export const synchronizedMap = () => post('mapInfo/synchronizedMap', {}) // 错误 export const queryErrorDataByCode = (code) => post('anomalyInfo/queryErrorDataByCode?code=' + code, {}) // 叉间状态 -export const backIoStatus = (type) => post('vehicle/backIoStatus?backIoStatus=' + type, {}) \ No newline at end of file +export const backIoStatus = (type) => post('vehicle/setForkLegsObstacles?backIoStatus=' + type, {}) \ No newline at end of file diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 1307fa8..5c3b208 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -109,6 +109,6 @@ module.exports = { shutrestartcancel: 'The operation of shutting down and restarting has been cancelled.', Systemsettings: 'System settings', Control: 'Control', - Workshopstatus: 'Workshop status', + Obstacleforklifts: 'Obstacle avoidance between forklifts', Syncsuccessfully: 'Sync successfully' } diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index df067d2..96f122f 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -109,6 +109,6 @@ module.exports = { shutrestartcancel: '已取消关机重启', Systemsettings: '系统设置', Control: '控制', - Workshopstatus: '叉间状态', + Obstacleforklifts: '叉间避障', Syncsuccessfully: '同步成功' } diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue index 309ea91..0cd9c2f 100644 --- a/src/pages/modules/building.vue +++ b/src/pages/modules/building.vue @@ -18,7 +18,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" width="55%"> - + @@ -257,6 +257,13 @@ export default { this.dataForm.stationCode = 'B' + (this.keyPoints.length + 1) const na = this.$i18n.locale === 'en-us' ? 'Work point ' : '工作点' this.dataForm.stationName = `${na}${this.keyPoints.length + 1}` + + this.$nextTick(() => { + const input = document.getElementById('stationName'); + if (input) { + input.focus(); + } + }) }, // 打点->保存 stationConfirm () { diff --git a/src/pages/shells/config-modal.vue b/src/pages/shells/config-modal.vue index 9946e83..6a1121b 100644 --- a/src/pages/shells/config-modal.vue +++ b/src/pages/shells/config-modal.vue @@ -51,8 +51,8 @@
{{$t('Control')}}
-

{{$t('Workshopstatus')}}

-
+

{{$t('Obstacleforklifts')}}

+
diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue index e434d8c..5feb9d9 100644 --- a/src/pages/shells/index.vue +++ b/src/pages/shells/index.vue @@ -106,7 +106,8 @@ export default { // "zh_error_description": null, // "en_error_description": null, // "error_type": 1} - // ] + // ], + // forkTipObstacles: '1' // }, taskSeq: [], currentStep: null, diff --git a/src/vuex/modules/data.js b/src/vuex/modules/data.js index 92db8f1..8e9f5e1 100644 --- a/src/vuex/modules/data.js +++ b/src/vuex/modules/data.js @@ -4,7 +4,7 @@ const state = { carPosition: {x: '', y: '', angle: ''}, isTop: false, errorData: [], - backIoStatus: false + backIoStatus: '0' } const getters = { @@ -34,8 +34,8 @@ const mutations = { if (Object.prototype.hasOwnProperty.call(data, 'errorData')) { state.errorData = data.errorData } - if (Object.prototype.hasOwnProperty.call(data, 'back_io_status')) { - state.backIoStatus = data.back_io_status + if (Object.prototype.hasOwnProperty.call(data, 'forkTipObstacles')) { + state.backIoStatus = data.forkTipObstacles } } }