From fd321fdfd5d3d09b104203931b610f4ecdcdab70 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 30 Nov 2023 09:16:57 +0800
Subject: [PATCH 1/3] lang

---
 src/i18n/langs/en.js | 26 +++++++++++++++++---------
 src/i18n/langs/zh.js | 26 +++++++++++++++++---------
 2 files changed, 34 insertions(+), 18 deletions(-)

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: '取消',

From fa3a371caf9f2413292b003cf08461d66ee30f34 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 30 Nov 2023 09:22:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/systemmanage/developer.vue       |  4 ++--
 .../modules/vehicleinformation/vehiclecontrol.vue  |  8 ++++----
 .../modules/vehicleinformation/vehiclestatus.vue   | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

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
 </style>
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 @@
         </div>
         <div class="state_wrap">
           <div class="state_item_wrap">
-            <div class="state_item_label">{{ $t('vehiclecontrol.deviatestatus') }}:</div>
+            <div class="state_item_label">{{ $t('vehiclecontrol.deviationstate') }}:</div>
             <div class="state_item_val" :class="{'state_item_val_disabled': status.inLineStatus === '1'}">{{status.inLineStatus_name}}</div>
           </div>
           <div class="state_item_wrap">
@@ -45,7 +45,7 @@
         </div>
         <div class="control_wrap">
           <div class="control_item">
-            <div class="control_label">{{ $t('vehiclecontrol.monitorcontrol') }}</div>
+            <div class="control_label">{{ $t('vehiclecontrol.displaycontrol') }}</div>
             <div class="control_val">
               <button class="state_item_switch" :class="{'is-checked': switch1 === '1'}" :disabled="disabled" @click="switchDown('2', switch1)">
                 <input type="checkbox" class="switch__input">
@@ -266,11 +266,11 @@ export default {
   width 50%
   _fj(flex-start)
 .state_item_label
-  width 190px
+  width 196px
   _font(36px, 56px, #B4C1D8, 500,)
   font-family: SourceHanSansCN-Medium;
 .state_item_val
-  width calc(100% - 190px)
+  width calc(100% - 196px)
   _font(36px, 56px, #fff, 500,)
   font-family: SourceHanSansCN-Medium;
   padding-left 66px
diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue
index 89ac32f..6a6d9f6 100644
--- a/src/pages/modules/vehicleinformation/vehiclestatus.vue
+++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue
@@ -27,7 +27,7 @@
             <div class="agv_item_val">{{result.carrier}}</div>
           </div>
           <div class="agv_item_wrap">
-            <div class="agv_item_label">{{ $t('vehiclestatus.issuancespeed') }}:</div>
+            <div class="agv_item_label">{{ $t('vehiclestatus.distributionspeed') }}:</div>
             <div class="agv_item_val">{{result.send_speed}}</div>
           </div>
           <div class="agv_item_wrap">
@@ -39,7 +39,7 @@
             <div class="agv_item_val">{{result.landscape_deviation}}</div>
           </div>
           <div class="agv_item_wrap">
-            <div class="agv_item_label">{{ $t('vehiclestatus.headingdeviation') }}:</div>
+            <div class="agv_item_label">{{ $t('vehiclestatus.coursedeviation') }}:</div>
             <div class="agv_item_val">{{result.course_deviation}}</div>
           </div>
         </div>
@@ -54,7 +54,7 @@
               <div class="agv_item_val agv_item_val_1" :class="{'state_item_val_disabled': result.vehicle_status !== '运行'}">{{result.vehicle_status}}</div>
             </div>
             <div class="state_item_wrap">
-              <div class="agv_item_label">{{ $t('vehiclestatus.workstatus') }}:</div>
+              <div class="agv_item_label">{{ $t('vehiclestatus.workingstatus') }}:</div>
               <div class="agv_item_val agv_item_val_1" :class="{'state_item_val_disabled': result.working_status !== '正常'}">{{result.working_status}}</div>
             </div>
           </div>
@@ -63,10 +63,10 @@
             <div class="state_item_label">{{ $t('vehiclestatus.sensorstatus') }}:</div>
             <div class="state_item_val_wrap">
               <div class="state_item_val" :class="{'state_item_val_disabled': result1.stopButton_status === '1'}">{{ $t('vehiclestatus.emergencystop') }}</div>
-              <div class="state_item_val" :class="{'state_item_val_disabled': result1.speedReduction_status === '1'}">{{ $t('vehiclestatus.avoidancemoderate') }}</div>
+              <div class="state_item_val" :class="{'state_item_val_disabled': result1.speedReduction_status === '1'}">{{ $t('vehiclestatus.obstacleavoidancedeceleration') }}</div>
               <div class="state_item_val" :class="{'state_item_val_disabled': result1.resetButton_status === '1'}">{{ $t('vehiclestatus.resetbutton') }}</div>
-              <div class="state_item_val" :class="{'state_item_val_disabled': result1.speedStop_status === '1'}">{{ $t('vehiclestatus.avoidanceparking') }}</div>
-              <div class="state_item_val" :class="{'state_item_val_disabled': result1.securityTentacle_status === '1'}">{{ $t('vehiclestatus.Safetyedge') }}</div>
+              <div class="state_item_val" :class="{'state_item_val_disabled': result1.speedStop_status === '1'}">{{ $t('vehiclestatus.obstacleavoidanceparking') }}</div>
+              <div class="state_item_val" :class="{'state_item_val_disabled': result1.securityTentacle_status === '1'}">{{ $t('vehiclestatus.safetyedgesensor') }}</div>
             </div>
           </div>
         </div>
@@ -157,7 +157,7 @@ export default {
 .state_wrap
   width 100%
   _fj(,flex-start)
-  padding 47px 30px 10px 30px
+  padding 27px 30px 10px 30px
 .state_left_wrap
   width 412px
 .state_item_wrap

From 26e01537af58102466d4b3dc7c6d8a2c953da3a1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 30 Nov 2023 09:26:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=94=AE=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleKeyboard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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}': '中文<span class="font-s">/En</span>',
+      '{change}': 'En<span class="font-s">/中文</span>',
       '{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: [