diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 7058c3c..d43c9bf 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -100,5 +100,10 @@ module.exports = { PicturesTexts: 'Illustration with Pictures and Texts', VideoInstructions: 'Video Instructions', Handmethod: 'Handling method', - stationnotcommas: 'The station name cannot contain English commas.' + stationnotcommas: 'The station name cannot contain English commas.', + ErrorPrompt: 'Error Prompt', + Aresuremap: 'Are you sure to synchronize the map?', + Mapbeencancel: 'Map synchronization has been cancelled', + Aresureshutrestart: 'Are you sure you want to shut down and restart?', + shutrestartcancel: 'The operation of shutting down and restarting has been cancelled.' } diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index d165637..d98b51f 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -100,5 +100,10 @@ module.exports = { PicturesTexts: '图文说明', VideoInstructions: '视频说明', Handmethod: '处理方法', - stationnotcommas: '站点名称不能包含英文逗号' + stationnotcommas: '站点名称不能包含英文逗号', + ErrorPrompt: '错误提示', + Aresuremap: '是否确定同步地图?', + Mapbeencancel: '已取消同步地图', + Aresureshutrestart: '是否确定关机重启?', + shutrestartcancel: '已取消关机重启' } diff --git a/src/pages/shells/config-modal.vue b/src/pages/shells/config-modal.vue index 05ef15c..9b3d5e9 100644 --- a/src/pages/shells/config-modal.vue +++ b/src/pages/shells/config-modal.vue @@ -114,7 +114,7 @@ export default { done() }, toReboot () { - this.$confirm('是否确定关机重启?', this.$t('Prompt'), { + this.$confirm(this.$t('Aresureshutrestart'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), cancelButtonText: this.$t('Cancel'), type: 'warning' @@ -123,7 +123,7 @@ export default { }).catch(() => { this.$message({ type: 'info', - message: '已取消关机重启' + message: this.$t('shutrestartcancel') }) }) }, @@ -152,7 +152,7 @@ export default { a.click() }, synchronizedMapConfirm () { - this.$confirm('是否确定同步地图?', this.$t('Prompt'), { + this.$confirm(this.$t('Aresuremap'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), cancelButtonText: this.$t('Cancel'), type: 'warning' @@ -161,7 +161,7 @@ export default { }).catch(() => { this.$message({ type: 'info', - message: '已取消同步地图' + message: this.$t('Mapbeencancel') }) }) }, diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue index 7ae103b..a419b3b 100644 --- a/src/pages/shells/index.vue +++ b/src/pages/shells/index.vue @@ -27,7 +27,7 @@
-
错误提示：{{ exception }}
+
{{$t('ErrorPrompt')}}：{{ exception }}
@@ -63,51 +63,51 @@ export default { websocket: null, // WebSocket实例 reconnectTimer: null, // 重连计时器 topInfo: {}, - topInfo1: { - batteryPower: -1.0, - exceptionInfo: { - exception: ['重定位失败,检查环境或标记是否有变化.', '定位超时，尝试移动小车位置后重试.', '定位超时，尝试移动小车位置后重试.', '定位超时，尝试移动小车位置后重试.'], - exceptionCodes: [1, 17179869185, 1335734829057] - }, - id: '1', // 车号ID - ip: '192.168.100.82', // 车辆IP - isManual: false, // 是否是手动，true是手动,false是自动 - mapId: 39, // 地图ID - mapName: 'apt_map_1753078481180', // 地图名称 - name: 'V1', // 车辆名称 - state: '未知状态', // 车辆状态 - stateId: 7, // 车辆状态ID - theta: 0.9073792099952698, // 车辆航向角 - x: 0.004027, // 车辆x坐标 - y: -0.001812, // 车辆y坐标 - task_seq: '点位1,点位2,work point 3,顶地方的方法顶顶顶点位3', - task_point: '点位2', - anomalyLevel: 1, - errorData: [ - { - "error_id": "1", - "error_name": "导航定位失败", - "zh_error_name": '错误1', - "en_error_name": 'error1', - "error_code": "1", - "error_category": 1, - "error_description": "出现了定位切换失败", - "zh_error_description": '说明', - "en_error_description": 'en_error_description', - "error_type": 1}, - { - "error_id": "2", - "error_name": "重定位超时", - "zh_error_name": '重定位超时', - "en_error_name": '重定位超时error', - "error_code": "2", - "error_category": 1, - "error_description": "出现了重定位超时", - "zh_error_description": null, - "en_error_description": null, - "error_type": 1} - ] - }, + // topInfo: { + // batteryPower: -1.0, + // exceptionInfo: { + // exception: ['重定位失败,检查环境或标记是否有变化.', '定位超时，尝试移动小车位置后重试.', '定位超时，尝试移动小车位置后重试.', '定位超时，尝试移动小车位置后重试.'], + // exceptionCodes: [1, 17179869185, 1335734829057] + // }, + // id: '1', // 车号ID + // ip: '192.168.100.82', // 车辆IP + // isManual: false, // 是否是手动，true是手动,false是自动 + // mapId: 39, // 地图ID + // mapName: 'apt_map_1753078481180', // 地图名称 + // name: 'V1', // 车辆名称 + // state: 'Unknown State', // 车辆状态 + // stateId: 7, // 车辆状态ID + // theta: 0.9073792099952698, // 车辆航向角 + // x: 0.004027, // 车辆x坐标 + // y: -0.001812, // 车辆y坐标 + // task_seq: '点位1,点位2,work point 3,顶地方的方法顶顶顶点位3', + // task_point: '点位2', + // anomalyLevel: 1, + // errorData: [ + // { + // "error_id": "1", + // "error_name": "导航定位失败", + // "zh_error_name": '错误1', + // "en_error_name": 'error1', + // "error_code": "1", + // "error_category": 1, + // "error_description": "出现了定位切换失败", + // "zh_error_description": '说明', + // "en_error_description": 'en_error_description', + // "error_type": 1}, + // { + // "error_id": "2", + // "error_name": "重定位超时", + // "zh_error_name": '重定位超时', + // "en_error_name": '重定位超时error', + // "error_code": "2", + // "error_category": 1, + // "error_description": "出现了重定位超时", + // "zh_error_description": null, + // "en_error_description": null, + // "error_type": 1} + // ] + // }, taskSeq: [], currentStep: null, loginVisible: false, @@ -254,6 +254,9 @@ export default { margin-right .08rem background center / 100% 100% url(../../images/new/state-item_bg.png) no-repeat box-shadow inset 0px 0px 3px 2px rgb(149, 221, 253, 70%) + overflow hidden + text-overflow: ellipsis; + white-space: nowrap; .elec-qty-wrap _wh(.6rem, .3rem) margin-right .08rem