diff --git a/src/components/SimpleKeyboard.vue b/src/components/SimpleKeyboard.vue index 7928b15..2b1b797 100644 --- a/src/components/SimpleKeyboard.vue +++ b/src/components/SimpleKeyboard.vue @@ -28,7 +28,7 @@ export default { '{enter}': 'Enter', '{tab}': 'Tab', '{shift}': 'Shift', - '{change}': '中文/En', + '{change}': 'En/中文', '{space}': ' ', '{clear}': 'Clear', '{close}': 'Close' @@ -72,7 +72,8 @@ export default { this.keyboard = new Keyboard(this.keyboardClass, { onChange: this.onChange, onKeyPress: this.onKeyPress, - layoutCandidates: layout.layoutCandidates, + // layoutCandidates: layout.layoutCandidates, + layoutCandidates: null, layout: { // 默认布局 default: [ diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 524c5e1..f4b1333 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -56,17 +56,17 @@ module.exports = { coordinate: 'coordinate', headingangle: 'Heading angle', steeringwheelangle: 'Steering wheel angle', - issuancespeed: 'Issuance speed', + distributionspeed: 'Distribution speed', actualspeed: 'Actual speed', lateraldeviation: 'Lateral deviation', - headingdeviation: 'Heading deviation', - workstatus: 'Work status', + coursedeviation: 'Course deviation', + workingstatus: 'Working status', sensorstatus: 'Sensor status', emergencystop: 'Emergency stop', - avoidancemoderate: 'Avoidance moderate', + obstacleavoidancedeceleration: 'Obstacle avoidance deceleration', resetbutton: 'Reset button', - avoidanceparking: 'Avoidance parking', - Safetyedge: 'Safety edge', + obstacleavoidanceparking: 'Obstacle avoidance parking', + safetyedgesensor: 'Safety edge sensor', run: 'Run', abnormal: 'Abnormal' }, @@ -75,11 +75,19 @@ module.exports = { Status: 'Status', Control: 'Control', control: ' control', - deviatestatus: 'Deviate status', + deviationstate: 'Deviation state', updatestatus: 'Update status', - monitorcontrol: 'Monitor control', + displaycontrol: 'Display control', initializecoordinates: 'Initialize coordinates', - coordinateinformation: 'Coordinate information' + coordinateinformation: 'Coordinate information', + skipthestart: 'Skip the start', + initializecoordinate: 'Initialize coordinate', + fullscreen: 'Full screen', + quit: 'Quit', + poweroff: 'Power Off', + softwarerestart: 'Software restart', + restart: 'Restart', + skipdetection: 'Skip detection' }, button: { cancel: 'Cancel', diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index bc55667..d200a02 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -56,17 +56,17 @@ module.exports = { coordinate: '坐标', headingangle: '航向角', steeringwheelangle: '舵轮角度', - issuancespeed: '下发速度', + distributionspeed: '下发速度', actualspeed: '实际速度', lateraldeviation: '横向偏差', - headingdeviation: '航向偏差', - workstatus: '工作状态', + coursedeviation: '航向偏差', + workingstatus: '工作状态', sensorstatus: '传感器状态', emergencystop: '急停按钮', - avoidancemoderate: '避障减速', + obstacleavoidancedeceleration: '避障减速', resetbutton: '复位按钮', - avoidanceparking: '避障停车', - Safetyedge: '安全触边', + obstacleavoidanceparking: '避障停车', + safetyedgesensor: '安全触边', run: '运行', abnormal: '异常' }, @@ -75,11 +75,19 @@ module.exports = { Status: '状态', Control: '控制', control: '控制', - deviatestatus: '偏离状态', + deviationstate: '偏离状态', updatestatus: '更新状态', - monitorcontrol: '显示屏', + displaycontrol: '显示屏控制', initializecoordinates: '初始化坐标', - coordinateinformation: '坐标信息' + coordinateinformation: '坐标信息', + skipthestart: '跳过起点', + initializecoordinate: '初始化坐标', + fullscreen: '全屏', + quit: '退出', + poweroff: '关机', + softwarerestart: '软启动', + restart: '重启', + skipdetection: '跳过检测' }, button: { cancel: '取消', diff --git a/src/pages/modules/systemmanage/developer.vue b/src/pages/modules/systemmanage/developer.vue index 6b7b612..7f17ee4 100644 --- a/src/pages/modules/systemmanage/developer.vue +++ b/src/pages/modules/systemmanage/developer.vue @@ -51,7 +51,7 @@ export default { tabs () { let arr = [{id: '1', label: 'ifconfig'}, {id: '2', label: '日志列表'}, {id: '3', label: 'ROS运行列表'}, {id: '4', label: '芯片温度/主频'}, {id: '5', label: '调试信息'}, {id: '6', label: '软/硬件版本'}] if (this.$i18n.locale === 'en-us') { - arr = [{id: '1', label: 'ifconfig'}, {id: '2', label: 'Log list'}, {id: '3', label: 'ROS run list'}, {id: '4', label: 'Chip TEMP/main frequency'}, {id: '5', label: 'Debug information'}, {id: '6', label: 'Software/Hardware Version'}] + arr = [{id: '1', label: 'ifconfig'}, {id: '2', label: 'Log list'}, {id: '3', label: 'ROS run list'}, {id: '4', label: 'Chip temperature/main frequency'}, {id: '5', label: 'Debugging information'}, {id: '6', label: 'Software/Hardware Version'}] } return arr } @@ -197,6 +197,6 @@ export default { display: flex; align-items: center; justify-content: center; - font-size 18px + font-size 16px line-height 18px diff --git a/src/pages/modules/vehicleinformation/vehiclecontrol.vue b/src/pages/modules/vehicleinformation/vehiclecontrol.vue index 836be10..dd99eee 100644 --- a/src/pages/modules/vehicleinformation/vehiclecontrol.vue +++ b/src/pages/modules/vehicleinformation/vehiclecontrol.vue @@ -11,7 +11,7 @@