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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-02-02 14:10:06 +08:00
commit 1abd14d7e9
5 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/components/menus/dialog/standStopTime.vue
View File

@ -147,7 +147,7 @@ export default {
this.stationName = station.name;
}
}
this.control = selected.parkingTime == 0 ? '01' : '02';
this.control = selected.parkingTime <= 0 ? '01' : '02';
this.time = selected.parkingTime ? Number(selected.parkingTime) : 30;
this.effective = selected.parkingAlwaysValid == '1';
}

68
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -114,21 +114,21 @@ export default {
{ deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Park_Time',
skinCode: '06',
trainingName: '设置停站时间({10}-{12}站台)',
trainingRemark: '设置停站时间(自动, 一直有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' },
{ deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Park_Time',
// skinCode: '06',
// trainingName: '设置停站时间({10}-{12}站台)',
// trainingRemark: '设置停站时间(自动, 一直有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
// { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' },
// { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
{
maxDuration: 15,
minDuration: 8,
@ -142,7 +142,8 @@ export default {
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
{ deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
{ deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
{ deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
},
{
@ -158,8 +159,7 @@ export default {
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
{ deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
{ deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
{ deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
},
{
@ -179,22 +179,22 @@ export default {
{ deviceType: '06', orderNum: 5, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Run_Time',
skinCode: '06',
trainingName: '设置运行等级({10}-{12} 站台)',
trainingRemark: '设置运行等级(设置区间 运行等级自动，一直有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
{ deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【自动】', val: '0' },
{ deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
{ deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Run_Time',
// skinCode: '06',
// trainingName: '设置运行等级({10}-{12} 站台)',
// trainingRemark: '设置运行等级(设置区间 运行等级自动，一直有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
// { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【自动】', val: '0' },
// { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
// { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
{
maxDuration: 15,
minDuration: 8,

2
src/scripts/ProjectConfig.js
View File

@ -207,7 +207,7 @@ export const loginInfo = {
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemTYpe: '011'
systemType: '011'
},
heb: {
title: '城市轨道交通综合行车模拟仿真系统V1.0',

9
src/views/lesson/trainingRule/list.vue
View File

@ -5,11 +5,6 @@
<training-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
<add-batch ref="addBatch" @reloadTable="reloadTable" />
<save-as ref="saveAs" @reloadTable="reloadTable" />
<div class="draft">
<el-button-group>
<el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
</el-button-group>
</div>
</div>
</template>
@ -42,6 +37,7 @@ export default {
queryForm: {
labelWidth: '140px',
reset: true,
leftSpan: 16,
queryObject: {
trainingType: {
type: 'select',
@ -145,7 +141,8 @@ export default {
],
actions: [
{ text: this.$t('global.add'), handler: this.handleAdd },
{ text: this.$t('lesson.generation'), handler: this.handleBatchAdd}
{ text: this.$t('lesson.generation'), handler: this.handleBatchAdd},
{ text: this.$t('global.back'), handler: this.turnback }
]
},
currentModel: {}

20
src/views/lesson/trainingmanage/index.vue
View File

@ -1,11 +1,6 @@
<template>
<div style="height: 100%; overflow-y: auto;">
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
<div class="draft">
<el-button-group>
<el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
</el-button-group>
</div>
</div>
</template>
@ -136,7 +131,8 @@ export default {
}
],
actions: [
{ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging }
{ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging },
{ text: this.$t('global.back'), handler: this.turnback }
]
},
@ -189,14 +185,14 @@ export default {
interCheckGenerateStatus() {
createAllTrainingList(this.$route.query.mapId, false).then((data)=>{
if (data.data) {
this.queryList.actions.pop();
this.queryList.actions.push({ text: this.$t('lesson.trainingGenerating'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:true });
this.queryList.actions.shift();
this.queryList.actions.unshift({ text: this.$t('lesson.trainingGenerating'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:true });
this.isInGennerate = true;
this.queryList.data = [];
this.queryList.total = 0;
} else {
this.queryList.actions.pop();
this.queryList.actions.push({ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:false });
this.queryList.actions.shift();
this.queryList.actions.unshift({ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:false });
if (this.isInGennerate) {
this.isInGennerate = false;
this.reloadTable();
@ -293,8 +289,8 @@ export default {
if (action === 'confirm') {
instance.confirmButtonLoading = true;
// instance.confirmButtonText = '生成中...';
this.queryList.actions.pop();
this.queryList.actions.push({ text: this.$t('lesson.trainingGenerating'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:true });
this.queryList.actions.shift();
this.queryList.actions.unshift({ text: this.$t('lesson.trainingGenerating'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:true });
try {
const data = await createAllTrainingList(this.$route.query.mapId, true);
this.isInGennerate = true;