joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
zyy 2019-09-16 17:31:17 +08:00
commit 607024c551
6 changed files with 72 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/langs/en/global.js
View File

@ -110,6 +110,8 @@ export default {
orderCode: 'Order Code: ', orderCode: 'Order Code: ',
creationTime: 'Create Time: ', creationTime: 'Create Time: ',
amountPayable: 'Amounts Payable: ', amountPayable: 'Amounts Payable: ',
screenName: 'Screen Name',
timeUnitPrice: 'Screen Unit Price',
buyProject: 'The products you will purchase are virtual content services. After purchase, you will not be able to return, transfer or exchange. Please confirm.', buyProject: 'The products you will purchase are virtual content services. After purchase, you will not be able to return, transfer or exchange. Please confirm.',
relatedServices: 'You can view and use the related services in the “Permissions Details” area after purchase.', relatedServices: 'You can view and use the related services in the “Permissions Details” area after purchase.',

23
src/i18n/langs/en/menu.js
View File

@ -202,7 +202,7 @@ export default {
}, },
menuDialog: { menuDialog: {
versionName: 'ControlMonitor 1.3.5.0', versionName: 'ControlMonitor 1.3.5.0',
confirm: 'confirm', confirm: 'Confirm',
copyright: 'Copyright (C) 2010-2011 Beijing Jiu Lian Technology Co., Ltd.', copyright: 'Copyright (C) 2010-2011 Beijing Jiu Lian Technology Co., Ltd.',
moduleName: 'Module Name', moduleName: 'Module Name',
version: 'Version', version: 'Version',
@ -210,7 +210,7 @@ export default {
mainProgramVersion: 'Main Program Version:', mainProgramVersion: 'Main Program Version:',
about: 'About ControlMonitor', about: 'About ControlMonitor',
userList: 'userList', userList: 'User List',
jobNumber: 'JobNumber', jobNumber: 'JobNumber',
userName: 'UserName', userName: 'UserName',
refresh: 'Refresh', refresh: 'Refresh',
@ -231,7 +231,24 @@ export default {
password: 'Password', password: 'Password',
back: 'Back', back: 'Back',
clear: 'Clear', clear: 'Clear',
IncorrectPassword: 'Incorrect Password!' IncorrectPassword: 'Incorrect Password!',
addLocation: 'Add Location',
terminalOne: 'Terminal:',
pleaseSelect: 'please select',
frontTrainNumber: 'Front TrainNumber:',
addTrainNumber: 'Add TrainNumber:',
inputTrainNumber: 'Please input train number',
selectTerminal: 'Please select terminal',
addPlanTrain: 'Add Plan Train',
terminalTwo: 'Terminal:',
trainNumber: 'TrainNumber:',
deletePlanTrain: 'Delete Plan Train',
purpose: 'Purpose',
inputFrontNumber: 'Please input front train number',
panPlanCar: 'Pan Plan Car'
}, },
platform: 'Platform', platform: 'Platform',
arrivalTime: 'Arrival time', arrivalTime: 'Arrival time',

47
src/i18n/langs/zh/menu.js
View File

@ -225,10 +225,10 @@ export default {
passwordBox: '密码框', passwordBox: '密码框',
userNameLabel: '用户名：', userNameLabel: '用户名：',
password: '密 码：', password: '密 码：',
back: '回退', back: '回退',
clear: '清空', clear: '清空',
IncorrectPassword: '密码输入错误！' IncorrectPassword: '密码输入错误！',
// 控制模式转换 // 控制模式转换
// 选择 // 选择
@ -256,37 +256,22 @@ export default {
// 确认将如下操作区域的控制模式由站控转为中控: // 确认将如下操作区域的控制模式由站控转为中控:
// 操作区域 // 操作区域
// 添加位置 addLocation: '添加位置',
// 终   端: terminalOne: '终 端:',
// 请选择 pleaseSelect: '请选择',
// 前车车次号: frontTrainNumber: '前车车次号:',
// 添加车次号: addTrainNumber: '添加车次号:',
// 确定 inputTrainNumber: '请输入车次号',
// 取 消 selectTerminal: '请选择终端',
// 请输入车次号 addPlanTrain: '添加计划车',
// 请选择终端
// 添加计划车
// 终  端: terminalTwo: '终 端:',
// 请选择 trainNumber: '车 次 号:',
// 车 次 号: deletePlanTrain: '删除计划车',
// 确定
// 取 消
// 请输入车次号
// 请选择终端
// 删除计划车
// 车 次 号: purpose: '目的',
// 目的 inputFrontNumber: '请输入前车车次号',
// 终  端: panPlanCar: '平移计划车'
// 请选择
// 车 次 号:
// 确定
// 取 消
// 请输入车次号
// 请输入前车车次号
// 请选择终端
// 平移计划车
}, },
platform: '站台', platform: '站台',
arrivalTime: '到点', arrivalTime: '到点',

25
src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
View File

@ -3,31 +3,32 @@
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag> :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
<el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form"> <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
<div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;"> <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
<span class="base-label">添加位置</span> <span class="base-label">{{$t('menu.menuDialog.addLocation')}}</span>
<div style="position: relative; top:-10px;"> <div style="position: relative; top:-10px;">
<el-form-item prop="stationStandCode"> <el-form-item prop="stationStandCode">
<span slot="label">终&emsp;&emsp;&emsp;端:</span> <span slot="label">{{$t('menu.menuDialog.terminalOne')}}</span>
<el-select v-model="addModel.stationStandCode" filterable placeholder="请选择"> <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
<el-option v-for="item in stationStandList" :key="item.code" :label="item.name" <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="前车车次号:" prop="trainNumberLimber"> <el-form-item prop="trainNumberLimber">
<span slot="label" id="frontTrainNumber">{{$t('menu.menuDialog.frontTrainNumber')}}</span>
<el-input v-model="addModel.trainNumberLimber"></el-input> <el-input v-model="addModel.trainNumberLimber"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<el-form-item label="添加车次号:" label-width="115px" prop="groupNumber"> <el-form-item :label="$t('menu.menuDialog.addTrainNumber')" label-width="115px" prop="groupNumber">
<el-input v-model="addModel.groupNumber"></el-input> <el-input v-model="addModel.groupNumber"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="10" :offset="2"> <el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{$t('menu.menuDialog.confirm')}}</el-button>
</el-col> </el-col>
<el-col :span="8" :offset="4"> <el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button> <el-button :id="domIdCancel" @click="cancel">{{$t('menu.menuDialog.cancel')}}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-dialog> </el-dialog>
@ -52,13 +53,13 @@
rules: { rules: {
groupNumber: [ groupNumber: [
{ required: true, message: '请输入车次号', trigger: 'blur' } { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
], ],
// trainNumberLimber: [ // trainNumberLimber: [
// { required: true, message: '请输入前车车次号', trigger: 'blur' } // { required: true, message: '请输入前车车次号', trigger: 'blur' }
// ], // ],
stationStandCode: [ stationStandCode: [
{ required: true, message: '请选择终端', trigger: 'change' } { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
], ],
}, },
operation: null, operation: null,
@ -80,7 +81,7 @@
return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : ''; return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
}, },
title() { title() {
return '添加计划车' return this.$t('menu.menuDialog.addPlanTrain')
} }
}, },
mounted() { mounted() {
@ -159,4 +160,8 @@
padding: 0 5px; padding: 0 5px;
background-color: #F0F0F0; background-color: #F0F0F0;
} }
#frontTrainNumber{
line-height: 100%;
display: inline-block;
}
</style> </style>

16
src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
View File

@ -3,22 +3,22 @@
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag> :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
<el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form"> <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
<el-form-item prop="stationStandCode"> <el-form-item prop="stationStandCode">
<span slot="label">终&emsp;&emsp;端:</span> <span slot="label">{{$t('menu.menuDialog.terminalTwo')}}</span>
<el-select v-model="addModel.stationStandCode" filterable placeholder="请选择"> <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
<el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code"> <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车 次 号:" prop="groupNumber"> <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="groupNumber">
<el-input v-model="addModel.groupNumber"></el-input> <el-input v-model="addModel.groupNumber"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="10" :offset="2"> <el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{$t('menu.menuDialog.confirm')}}</el-button>
</el-col> </el-col>
<el-col :span="8" :offset="4"> <el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button> <el-button :id="domIdCancel" @click="cancel">{{$t('menu.menuDialog.cancel')}}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-dialog> </el-dialog>
@ -42,10 +42,10 @@
rules: { rules: {
groupNumber: [ groupNumber: [
{ required: true, message: '请输入车次号', trigger: 'blur' } { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
], ],
stationStandCode: [ stationStandCode: [
{ required: true, message: '请选择终端', trigger: 'change' } { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
], ],
}, },
operation: null, operation: null,
@ -67,7 +67,7 @@
return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : ''; return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
}, },
title() { title() {
return '删除计划车' return this.$t('menu.menuDialog.deletePlanTrain')
} }
}, },
mounted() { mounted() {

22
src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
View File

@ -2,21 +2,21 @@
<el-dialog class="fuzhou-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px" <el-dialog class="fuzhou-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag> :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
<el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form"> <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
<el-form-item label="车 次 号:" label-width="115px" prop="groupNumber"> <el-form-item :label="$t('menu.menuDialog.trainNumber')" label-width="115px" prop="groupNumber">
<el-input v-model="addModel.groupNumber"></el-input> <el-input v-model="addModel.groupNumber"></el-input>
</el-form-item> </el-form-item>
<div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;"> <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
<span class="base-label">目的</span> <span class="base-label">{{$t('menu.menuDialog.purpose')}}</span>
<div style="position: relative; top:-10px;"> <div style="position: relative; top:-10px;">
<el-form-item prop="stationStandCode"> <el-form-item prop="stationStandCode">
<span slot="label">终&emsp;&emsp;端:</span> <span slot="label">{{$t('menu.menuDialog.terminalTwo')}}</span>
<el-select v-model="addModel.stationStandCode" filterable placeholder="请选择"> <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
<el-option v-for="item in stationStandList" :key="item.code" :label="item.name" <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车 次 号:" prop="trainNumberLimber"> <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="trainNumberLimber">
<el-input v-model="addModel.trainNumberLimber"></el-input> <el-input v-model="addModel.trainNumberLimber"></el-input>
</el-form-item> </el-form-item>
</div> </div>
@ -24,10 +24,10 @@
</el-form> </el-form>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="10" :offset="2"> <el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{$t('menu.menuDialog.confirm')}}</el-button>
</el-col> </el-col>
<el-col :span="8" :offset="4"> <el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button> <el-button :id="domIdCancel" @click="cancel">{{$t('menu.menuDialog.cancel')}}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-dialog> </el-dialog>
@ -52,13 +52,13 @@
rules: { rules: {
groupNumber: [ groupNumber: [
{ required: true, message: '请输入车次号', trigger: 'blur' } { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
], ],
trainNumberLimber: [ trainNumberLimber: [
{ required: true, message: '请输入前车车次号', trigger: 'blur' } { required: true, message: this.$t('menu.menuDialog.inputFrontNumber'), trigger: 'blur' }
], ],
stationStandCode: [ stationStandCode: [
{ required: true, message: '请选择终端', trigger: 'change' } { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
], ],
}, },
operation: null, operation: null,
@ -80,7 +80,7 @@
return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : ''; return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
}, },
title() { title() {
return '平移计划车' return this.$t('menu.menuDialog.panPlanCar')
} }
}, },
mounted() { mounted() {