diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js index 23bc029bf..b6fd48228 100644 --- a/src/i18n/langs/en/index.js +++ b/src/i18n/langs/en/index.js @@ -32,7 +32,7 @@ import trainingManage from './trainingManage'; import newRouter from './newRouter'; export default { - enLocale, + ...enLocale, map, global, router, diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 34f98aaed..56d9ebfda 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -445,28 +445,28 @@ class SkinCode extends defaultStyle { }, veryControl: { show: true, - offset: { x: 0, y: 0 }, + offset: { x: 50, y: 0 }, lightColor: '#f00', defaultColor: '#7F7F7F', - text: '非常站控' + text: 'Very station controlled' }, selfDiscipline: { show: true, - offset: { x: 0, y: 0 }, - text: '允许自律', + offset: { x: -140, y: 0 }, + text: 'Self-regulation allowed', defaultColor: '#7F7F7F', lightColor: '#ff0' }, selfDisciplineControl: { show: true, - offset: { x: 0, y: 0 }, + offset: { x: -50, y: 0 }, lightColor: '#0f0', defaultColor: '#7F7F7F', - text: '自律控制' + text: 'Self-discipline control' }, veryControlButton: { - offset: { x: 0, y: 0 }, - text: '非常站控', + offset: { x: 140, y: 0 }, + text: 'Very station controlled', lightColor: '#ff0', border:true, // 有边框 borderLine:1, diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index c63fe76c8..2a51a7314 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -635,7 +635,7 @@ export default class Station extends Group { _subType: 'veryControlButtonText', position: [0, 0], style: { - x: computedControlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.veryControlButton.offset.y, + x: computedControlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.veryControlButton.offset.x, y: computedControlModePoint.y + this.style.Station.StationControl.veryControlButton.offset.y + this.style.Station.StationControl.lamp.radiusR + this.style.Station.StationControl.text.distance, fontWeight: this.style.Station.StationControl.text.fontWeight, fontSize: this.style.Station.StationControl.text.fontSize, diff --git a/src/main.js b/src/main.js index e7ada36b6..409e750bd 100644 --- a/src/main.js +++ b/src/main.js @@ -13,6 +13,7 @@ import VueI18n from 'vue-i18n'; import store from './store/index'; import router from './router/index'; import CancelMouseState from '@/mixin/CancelMouseState.js'; +import ElementLocale from 'element-ui/lib/locale'; Vue.mixin(CancelMouseState); import '@/icons'; // icon @@ -37,6 +38,7 @@ export const i18n = new VueI18n({ locale: LangStorage.getLang('zh'), messages }); +ElementLocale.i18n((key, value) => i18n.t(key, value)); Vue.use(ElementUI, {i18n: (key, value) => i18n.t(key, value)}); new Vue({ diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js index 0ac2dfb63..e36f57011 100644 --- a/src/scripts/ConstDic.js +++ b/src/scripts/ConstDic.js @@ -292,27 +292,27 @@ export function getTrainingOperateTypeMap() { } export const transfiniteList = [ - {name:'不超限', code:'NO'}, - {name:'一级超限', code:'TRANSFINITE_ONE_LEVEL'}, - {name:'二级超限', code:'TRANSFINITE_TWO_LEVEL'}, - {name:'超级超限', code:'TRANSFINITE_SUPER'} + {name:'No overrun', code:'NO'}, + {name:'First class overrun', code:'TRANSFINITE_ONE_LEVEL'}, + {name:'Class II Overrun', code:'TRANSFINITE_TWO_LEVEL'}, + {name:'Super Overrun', code:'TRANSFINITE_SUPER'} ]; export const trainTypeList = [ // 管内列车 - {name:'管内特快旅客列车', code:'LOCAL_EXPRESS_PASSENGER_TRAIN' }, - {name:'管内快速旅客列车', code:'LOCAL_FAST_PASSENGER_TRAIN' }, - {name:'管内普通旅客快车', code:'LOCAL_PASSENGER_TRAIN' }, - {name:'管内普通旅客慢车', code:'LOCAL_SLOW_PASSENGER_TRAIN' }, - {name:'管内临时旅客列车', code:'LOCAL_TEMPORARY_PASSENGER_TRAIN' }, - {name:'管内临时旅游列车', code:'LOCAL_TEMPORARY_TOURIST_TRAIN' }, + {name:'Limited Express Passenger Trains', code:'LOCAL_EXPRESS_PASSENGER_TRAIN' }, + {name:'Fast Passenger Train', code:'LOCAL_FAST_PASSENGER_TRAIN' }, + {name:'Ordinary passenger express', code:'LOCAL_PASSENGER_TRAIN' }, + {name:'Ordinary Passenger Slow Train', code:'LOCAL_SLOW_PASSENGER_TRAIN' }, + {name:'Temporary Passenger Train', code:'LOCAL_TEMPORARY_PASSENGER_TRAIN' }, + {name:'Temporary Tourist Trains', code:'LOCAL_TEMPORARY_TOURIST_TRAIN' }, // 跨局列车 - {name:'跨局快速旅客列车', code:'FAST_PASSENGER_TRAIN' }, - {name:'跨局临时旅游列车', code:'TEMPORARY_TOURIST_TRAIN' }, - {name:'跨两局普通旅客快车', code:'TWO_PASSENGER_TRAIN' }, - {name:'跨两局普通旅客慢车', code:'TWO_SLOW_PASSENGER_TRAIN' }, - {name:'跨两局临时旅客列车', code:'TWO_TEMPORARY_PASSENGER_TRAIN' }, - {name:'跨三局及其以上普通旅客快车', code:'MORE_PASSENGER_TRAIN' }, + {name:'Inter-bureau Express Passenger Trains', code:'FAST_PASSENGER_TRAIN' }, + {name:'Inter-bureau Temporary Tourist Trains', code:'TEMPORARY_TOURIST_TRAIN' }, + {name:'Inter-bureau Ordinary Fast Passenger Train', code:'TWO_PASSENGER_TRAIN' }, + {name:'Inter-bureau Ordinary Passenger Slow Train', code:'TWO_SLOW_PASSENGER_TRAIN' }, + {name:'Inter-bureau temporary passenger trains', code:'TWO_TEMPORARY_PASSENGER_TRAIN' }, + {name:'Inter-bureau ordinary passenger express trains of three or more bureaux', code:'MORE_PASSENGER_TRAIN' }, // 其他列车 {name:'回送出入厂客车底列车', code:'BACK_FACTORY_PASSENGER_TRAIN' }, {name:'因故折返旅客列车', code:'FAULT_TRUE_BACK_PASSENGER_TRAIN' } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9554aeded..ea2c8e430 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -13,11 +13,11 @@
-
- - {{ language }} - -
+ + + + +
diff --git a/src/views/login/normalLogin.vue b/src/views/login/normalLogin.vue index 92871abf9..f36a5c924 100644 --- a/src/views/login/normalLogin.vue +++ b/src/views/login/normalLogin.vue @@ -100,7 +100,7 @@ export default { if (value) { callback(); } else { - callback(new Error('请输入用户名')); + callback(new Error('Please enter the user name')); } }; const validatePass = (rule, value, callback) => { diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue index e749a3526..6f1f44b37 100644 --- a/src/views/newMap/display/memberManage/membersManage.vue +++ b/src/views/newMap/display/memberManage/membersManage.vue @@ -202,7 +202,7 @@ export default { const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); switch (item.type) { case 'NCC_DISPATCHER': - this.memberData[item.id].labelName = 'NCC调度' + (item.name || ''); + this.memberData[item.id].labelName = 'NCC_DISPATCHER' + (item.name || ''); nccDispatcherList.push(this.memberData[item.id]); break; case 'OCC_DISPATCHER': @@ -278,7 +278,7 @@ export default { this.memberData[item.id].labelName = 'PARENT_DEPARTMENT' + (item.name ? `-${item.name }` : ''); break; case 'STATION_ELECTRIC_WORKER': - this.memberData[item.id].labelName = '电力工务' + (item.name || ''); + this.memberData[item.id].labelName = 'STATION_ELECTRIC_WORKER' + (item.name || ''); stationElectricWorkerList.push(this.memberData[item.id]); break; // DEVICE_MANAGER:'设备管理员' deviceManager @@ -366,7 +366,7 @@ export default { children: trainMasterList }, { - labelName: '电力工务 ', + labelName: 'STATION_ELECTRIC_WORKER ', id: 'stationElectricWorker', children: stationElectricWorkerList } @@ -402,6 +402,7 @@ export default { doShow() { this.show = true; this.memberData = this.$store.state.training.memberData; + console.log(this.memberData, '*********'); this.simulationUserList = this.$store.state.training.simulationUserList; this.$nextTick(() => { if (this.$refs.tree) { diff --git a/src/views/newMap/display/newChat/chatDialog.vue b/src/views/newMap/display/newChat/chatDialog.vue index cfac4c989..7eef63f86 100644 --- a/src/views/newMap/display/newChat/chatDialog.vue +++ b/src/views/newMap/display/newChat/chatDialog.vue @@ -425,7 +425,7 @@ export default { const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); switch (item.type) { case 'NCC_DISPATCHER': - this.memberData[item.id].labelName = 'NCC调度' + (item.name || ''); + this.memberData[item.id].labelName = 'NCC_DISPATCHER' + (item.name || ''); nccDispatcherList.push(this.memberData[item.id]); break; case 'OCC_DISPATCHER': @@ -433,161 +433,161 @@ export default { occDispatcherList.push(this.memberData[item.id]); break; case 'DISPATCHER': - this.memberData[item.id].labelName = '行调' + (item.name || ''); + this.memberData[item.id].labelName = 'DISPATCHER' + (item.name || ''); dispatcherList.push(this.memberData[item.id]); break; case 'ELECTRIC_DISPATCHER': - this.memberData[item.id].labelName = '电力调度' + (item.name || ''); + this.memberData[item.id].labelName = 'ELECTRIC_DISPATCHER' + (item.name || ''); electricDispatcherList.push(this.memberData[item.id]); break; case 'DEPOT_DISPATCHER': - this.memberData[item.id].labelName = '信号楼-' + `${ device ? device.name : '' }` + (item.name || ''); + this.memberData[item.id].labelName = 'DEPOT_DISPATCHER-' + `${ device ? device.name : '' }` + (item.name || ''); depotDispatcherList.push(this.memberData[item.id]); break; case 'STATION_SUPERVISOR': - this.memberData[item.id].labelName = '值班员-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_SUPERVISOR-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationSupervisorList.push(this.memberData[item.id]); break; case 'DRIVER': - this.memberData[item.id].labelName = '司机-列车' + item.deviceCode; + this.memberData[item.id].labelName = 'DRIVER-TRAIN' + item.deviceCode; driverList.push(this.memberData[item.id]); break; case 'MAINTAINER': - this.memberData[item.id].labelName = '通号' + (item.name || ''); + this.memberData[item.id].labelName = 'MAINTAINER' + (item.name || ''); maintainerList.push(this.memberData[item.id]); break; case 'RAIL_CTC': - this.memberData[item.id].labelName = 'CTC操作员' + `${ device ? device.name : '' }`; + this.memberData[item.id].labelName = 'RAIL_CTC' + `${ device ? device.name : '' }`; ctcOperatorList.push(this.memberData[item.id]); break; case 'STATION_ASSISTANT': - this.memberData[item.id].labelName = '车站助理-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_ASSISTANT-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationAssistantList.push(this.memberData[item.id]); break; case 'STATION_MASTER': - this.memberData[item.id].labelName = '车站站长-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_MASTER-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationMasterList.push(this.memberData[item.id]); break; case 'STATION_SIGNALER': - this.memberData[item.id].labelName = '车站信号员-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_SIGNALER-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationSignalerList.push(this.memberData[item.id]); break; case 'STATION_PASSENGER': - this.memberData[item.id].labelName = '车站客运员-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_PASSENGER-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationPassengerList.push(this.memberData[item.id]); break; case 'STATION_SWITCH_MAN': - this.memberData[item.id].labelName = '车站扳道员-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_SWITCH_MAN-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationSwitchManList.push(this.memberData[item.id]); break; case 'STATION_FACILITATOR': - this.memberData[item.id].labelName = '车站引导员-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_FACILITATOR-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationFacilitatorList.push(this.memberData[item.id]); break; case 'STATION_WORKER': - this.memberData[item.id].labelName = '车站工务工-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'STATION_WORKER-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); stationWorkerList.push(this.memberData[item.id]); break; case 'DEVICE_MANAGER': - this.memberData[item.id].labelName = '设备管理员-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'DEVICE_MANAGER-' + `${ device ? device.name : '' }` + (item.name ? `-${item.name }` : ''); deviceManagerList.push(this.memberData[item.id]); break; case 'TRAIN_MASTER': - this.memberData[item.id].labelName = '车务段段长-' + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'TRAIN_MASTER-' + (item.name ? `-${item.name }` : ''); trainMasterList.push(this.memberData[item.id]); break; case 'PARENT_DEPARTMENT': - this.memberData[item.id].labelName = '上级部门' + (item.name ? `-${item.name }` : ''); + this.memberData[item.id].labelName = 'PARENT_DEPARTMENT' + (item.name ? `-${item.name }` : ''); break; case 'STATION_ELECTRIC_WORKER': - this.memberData[item.id].labelName = '电力工务' + (item.name || ''); + this.memberData[item.id].labelName = 'STATION_ELECTRIC_WORKER' + (item.name || ''); stationElectricWorkerList.push(this.memberData[item.id]); break; } }); this.memberTreeData = [{ - labelName: 'NCC调度', + labelName: 'NCC_DISPATCHER', id: 'nccDispatcher', children: nccDispatcherList }, { - labelName: '信息调度', + labelName: 'OCC_DISPATCHER', id: 'occDispatcher', children: occDispatcherList }, { - labelName: '行调', + labelName: 'DISPATCHER', id: 'dispatcher', children: dispatcherList }, { - labelName: '车站值班员', + labelName: 'STATION_SUPERVISOR', id: 'stationSupervisor', children: stationSupervisorList }, { - labelName: '司机', + labelName: 'DRIVER', id: 'driver', children: driverList }, { - labelName: '通号', + labelName: 'MAINTAINER', id: 'maintainer', children: maintainerList }, { - labelName: '车辆段信号楼', + labelName: 'DEPOT_DISPATCHER', id: 'depotDispatcher', children: depotDispatcherList }, { - labelName: '电力调度', + labelName: 'ELECTRIC_DISPATCHER', id: 'electricDispatcher', children: electricDispatcherList }, { - labelName: 'CTC操作员', + labelName: 'RAIL_CTC', id: 'ctcOperator', children: ctcOperatorList }, { - labelName: '车站助理', + labelName: 'STATION_ASSISTANT', id: 'stationAssistant', children: stationAssistantList }, { - labelName: '车站站长', + labelName: 'STATION_MASTER', id: 'stationMaster', children: stationMasterList }, { - labelName: '车站信号员', + labelName: 'STATION_SIGNALER', id: 'stationSignaler', children: stationSignalerList }, { - labelName: '车站客运员', + labelName: 'STATION_PASSENGER', id: 'stationPassenger', children: stationPassengerList }, { - labelName: '车站扳道员', + labelName: 'STATION_SWITCH_MAN', id: 'stationSwitchMan', children: stationSwitchManList }, { - labelName: '车站引导员', + labelName: 'STATION_FACILITATOR', id: 'stationFacilitator', children: stationFacilitatorList }, { - labelName: '车站工务工', + labelName: 'STATION_WORKER', id: 'stationWorker', children: stationWorkerList }, { - labelName: '设备管理员', + labelName: 'DEVICE_MANAGER', id: 'deviceManager', children: deviceManagerList }, { - labelName: '车务段段长 ', + labelName: 'TRAIN_MASTER ', id: 'trainMaster', children: trainMasterList }, { - labelName: '电力工务 ', + labelName: 'STATION_ELECTRIC_WORKER ', id: 'stationElectricWorker', children: stationElectricWorkerList } diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue index 8e4c4ad43..fad0161cd 100644 --- a/src/views/newMap/display/simulationMenu/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue @@ -94,7 +94,7 @@ export default { if (this.$store.state.training.simulationCreator) { return; } - this.$alert('您所在仿真已被销毁', 'Hint', { + this.$alert('The simulation you are in has been destroyed', 'Hint', { confirmButtonText: 'Confirm', showClose: false, callback: action => { diff --git a/src/views/newMap/display/terminals/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue index 88f520134..22b28b231 100644 --- a/src/views/newMap/display/terminals/dispatchCmd.vue +++ b/src/views/newMap/display/terminals/dispatchCmd.vue @@ -248,17 +248,17 @@
- + - + - + @@ -307,7 +307,7 @@ - + @@ -339,7 +339,7 @@ - + - +
- Signed on behalf of + Signed on behalf of placed Cache
@@ -422,14 +422,14 @@
- + - + - +
- 查找机车 + Locomotive search
@@ -457,7 +457,7 @@
- + @@ -477,7 +477,7 @@ {{ getCurrentState(scope.row).time || '' }} - + @@ -526,11 +526,11 @@ export default { }, signedStatusObj: { Cache: 'Cache', - Sent: '已发送', - SrmReceived: '自律机接收', - Received: '已接收', - Signed: '已签收', - Reject: '已拒签' + Sent: 'Sent', + SrmReceived: 'Self-regulating machines receive', + Received: 'Received', + Signed: 'Signed for', + Reject: 'Rejected' }, command: { cmdId: '', @@ -565,11 +565,11 @@ export default { }, rules: { title: [ - { required: true, message: '命令标题不能为空', trigger: 'blur' }, + { required: true, message: 'Command title cannot be empty', trigger: 'blur' }, { min: 1, max: 20, message: 'The value contains 1 to 20 characters', trigger: 'blur' } ], cmdCode: [ - { required: true, message: '命令号不能为空', trigger: 'blur' }, + { required: true, message: 'Order number must not be empty', trigger: 'blur' }, { min: 1, max: 7, message: 'The value contains 1 to 7 characters', trigger: 'blur' } ] }, @@ -607,8 +607,8 @@ export default { searchTable: [], searchSignedOption: [ { value: '', label: 'All'}, - { value: true, label: '只显示签收完成的'}, - { value: false, label: '只显示未签收完成的'} + { value: true, label: 'Show only signed for'}, + { value: false, label: 'Show only uncompleted'} ], wirelessObj: { type: 'dispatchCmd', @@ -674,9 +674,9 @@ export default { let s = ' '; let h = tArr[0]; if (this.numTime != 24) { - s = '上午'; + s = 'AM'; if (h > 12) { - s = '下午'; + s = 'PM'; h = h - 12; } } @@ -760,13 +760,13 @@ export default { methods:{ trainAllographCmd() { if (!this.trainRow) { return; } - const test = `将为【${this.trainRow.trainNum}】次列车，代签 无线调度命令`; + const test = `Will sign on behalf of train [${this.trainRow.trainNum}] Wireless dispatch order`; const messageData = [test]; const h = this.$createElement; - messageData.push(h('p', null, '代签之前，请务必与本次列车司机联系确认！')); - messageData.push(h('p', null, '您确定要进行【无线调度命令 代签】操作吗？')); + messageData.push(h('p', null, 'Please check with the driver of this train before you sign for it!')); + messageData.push(h('p', null, 'Are you sure you want to do the [Wireless Dispatch Order Substitute]?')); this.$confirm('Hint', { - title: '无线代签操作提示', + title: 'Tips for Wireless Substitute Operation', message: h('div', null, messageData), confirmButtonText: 'Confirm', cancelButtonText: 'Cancel', @@ -782,11 +782,11 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', params).then((res) => { - this.$message.success('无线受令代签成功！'); + this.$message.success('Wireless order to sign for you is successful!'); this.searchCmd(); this.initData(); }).catch(error => { - this.$messageBox('无线受令代签令失败!'); + this.$messageBox('Wireless dispatch order failed!'); }); } }); @@ -844,7 +844,7 @@ export default { }, findTrainToTable() { if (!this.wirelessObj.trainNum) { - this.$messageBox('请选择车次号'); + this.$messageBox('Please select the train number!'); return; } const operate = { @@ -883,7 +883,7 @@ export default { this.command.rcvCompanies.push(obj); } }).catch(error => { - this.$messageBox('查找机车失败!'); + this.$messageBox('Locomotive search failed!'); }); } }); @@ -1207,7 +1207,7 @@ export default { }); new Promise((resolve, reject) => { if (findDiff) { - this.$confirm('当前调度命令已经被编辑修改过了，你要放弃所有的修改吗？', 'Hint', { + this.$confirm('The current dispatch order has already been edited and modified, do you want to abandon all changes?', 'Hint', { confirmButtonText: 'Confirm', cancelButtonText: 'Cancel' }).then(() => { @@ -1230,7 +1230,7 @@ export default { this.command.cmdCode = res.data.cmdCode; this.command.cmdId = res.data.cmdId; }).catch(error => { - this.$messageBox('新建调度命令号失败!'); + this.$messageBox('Failed to create a new dispatch order number!'); }); }).catch(() => { console.log('取消新建调度命令!'); @@ -1342,11 +1342,11 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { if (!this.command.content) { - this.$messageBox('请选择填写命令正文'); + this.$messageBox('Please select to fill in the body of the order'); return; } if (!this.command.rcvCompanies.length) { - this.$messageBox('请选择受令单位'); + this.$messageBox('Please select the unit to be ordered'); return; } const params = Object.assign({}, this.command); @@ -1375,10 +1375,10 @@ export default { }); data.sendCompany.id = idList[idList.length - 1]; sendCommandNew(this.group, 'CTC_SAVE_DIS_COMMAND', data).then((res) => { - showMsg && this.$message.success('缓存调度命令成功！'); + showMsg && this.$message.success('Cache dispatch command successful!'); resolve(); }).catch(error => { - showMsg && this.$messageBox('缓存调度命令失败!'); + showMsg && this.$messageBox('Cache scheduling command failed!'); reject(error.message); }); }); @@ -1388,7 +1388,7 @@ export default { const findCode = this.command.rcvCompanies.find(item => { return item.code == row.code; }); - if (this.currentStatus == '已发送' && findCode && sArr.includes(row.state)) { + if (this.currentStatus == 'Send' && findCode && sArr.includes(row.state)) { this.allographRow = row; } else { this.allographRow = null; @@ -1396,13 +1396,13 @@ export default { }, allographCmd() { if (!this.allographRow) { return; } - const test = `当前操作者：【${this.getActiveSender.labelName || ''}】，为【${this.command.cmdCode}】号调度命令的受令单位【${this.allographRow.name}】`; + const test = `Current operator: [${this.getActiveSender.labelName || ''}], for [${this.command.cmdCode}], the dispatcher of dispatch order number [${this.allographRow.name}]`; const messageData = [test]; const h = this.$createElement; - messageData.push(h('p', null, '进行代签操作前，请您与受令单位进行联络确认。')); - messageData.push(h('p', null, '您确定要进行代签操作吗？')); + messageData.push(h('p', null, 'Please check with the recipient before proceeding with the substitution.')); + messageData.push(h('p', null, 'Are you sure you want to perform a substitution operation?')); this.$confirm('Hint', { - title: '代签操作提示', + title: 'Signing agent prompt', message: h('div', null, messageData), confirmButtonText: 'Confirm', cancelButtonText: 'Cancel', @@ -1418,11 +1418,11 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', params).then((res) => { - this.$message.success('代签成功！'); + this.$message.success('Substitution successful!'); this.searchCmd(); this.initData(); }).catch(error => { - this.$messageBox('代签失败!'); + this.$messageBox('Failed!'); }); } }); @@ -1431,7 +1431,7 @@ export default { }); }, sendCmd() { - const test = `【${this.command.cmdCode}】号调度命令下达到以下受令人：`; + const test = `The dispatching order [${this.command.cmdCode}] is sent to the following recipients：`; const messageData = [test]; const h = this.$createElement; this.command.rcvCompanies.forEach((item, index) => { @@ -1449,11 +1449,11 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { if (!this.command.content) { - this.$messageBox('请选择填写命令正文'); + this.$messageBox('Please fill in the text of the order'); return; } if (!this.command.rcvCompanies.length) { - this.$messageBox('请选择受令单位'); + this.$messageBox('Please select the unit to be dispatched'); return; } const params = Object.assign({}, this.command); @@ -1466,11 +1466,11 @@ export default { if (valid) { this.cacheCmd().then(suc => { sendCommandNew(this.group, 'CTC_SEND_DIS_COMMAND', params).then((res) => { - this.$message.success('发送调度命令成功！'); + this.$message.success('Dispatch order sent successfully!'); this.searchCmd(); this.initData(); }).catch(error => { - this.$messageBox('发送调度命令失败!'); + this.$messageBox('Failed to send dispatch order!'); }); }).catch(err => { console.error('缓存调度命令失败', err); @@ -1487,7 +1487,7 @@ export default { this.queryResData = res.data || {}; resolve(); }).catch(error => { - this.$messageBox('查询调度命令失败!'); + this.$messageBox('Failed to query dispatch order!'); reject(error.message); }); }); diff --git a/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue b/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue index 59c9dbf49..0cba43601 100644 --- a/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue +++ b/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue @@ -4,14 +4,14 @@ class="chengdou-03__systerm train-set-plan" :title="title" :visible.sync="show" - width="670px" + width="770px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false" > - - + + - + - + - + - + - + - + - + - + - + - 始发 + Departure - + - 终到 + Arrival - 电力 + Electricity - 办理客运 + Passenger handling @@ -116,11 +116,12 @@
- - 运行股道与基本径路不一致 + + Operating stock path and the basic path does not coincide - - 出入口与基本径路不一致 +
+ + The entrance and exit are not consistent with the basic route @@ -131,10 +132,10 @@ - 确定 + Confirm - 取 消 + Cancel @@ -152,12 +153,12 @@ export default { const judge = /^[a-zA-Z0-9]*[\d]$/.test(value); if (judge) { if (value.toString().length > 6 || value.toString().length < 2) { - callback('车次长度2-6位'); + callback('TripNumber lengths of 2-6 seats'); } else { callback(); } } else { - callback('字母+数字,最后一位数字'); + callback('Alphabet + number, last digit'); } } else { // callback('请输入车次'); @@ -175,7 +176,7 @@ export default { filterSectionList:[], trainTypeList:trainTypeList, runTypeList:[ - {name:'快速旅客列车', code:'FAST_PASSENGER_TRAIN' } + {name:'Fast Passenger Train', code:'FAST_PASSENGER_TRAIN' } ], transfiniteList:transfiniteList, model:{ @@ -212,8 +213,8 @@ export default { }, rules: { stationCode:[ - { required: true, message: '请选择车站', trigger: 'blur' }, - { required: true, message: '请选择车站', trigger: 'change' } + { required: true, message: 'Please select the station', trigger: 'blur' }, + { required: true, message: 'Please select the station', trigger: 'change' } ], arriveTripNumber:[ { required: true, validator: validateTripNumber, trigger: 'blur' } @@ -238,7 +239,7 @@ export default { return this.dialogShow ? OperationEvent.CTCCommand.addDispatcherLogerRp.menu.domId : ''; }, title() { - return '增加阶段计划车次'; + return 'Adding phase plan trips'; } }, methods: { diff --git a/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue b/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue index 7beb4c842..f67c7ad18 100644 --- a/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue +++ b/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue @@ -11,14 +11,14 @@ :close-on-click-modal="false" >
- 确定删除该条行车计划？ + Confirm the deletion of the schedule?
- 确定 + Confirm - 取 消 + Cancel diff --git a/src/views/newMap/display/terminals/dispatcherLoger/index.vue b/src/views/newMap/display/terminals/dispatcherLoger/index.vue index 65fcfc714..498e4e1f7 100644 --- a/src/views/newMap/display/terminals/dispatcherLoger/index.vue +++ b/src/views/newMap/display/terminals/dispatcherLoger/index.vue @@ -3,9 +3,9 @@
-
添加
-
删除
-
发送计划
+
Add
+
Delete
+
Send Plan
- + --> - + - + - + - + - + --> - + - + - +