退出计划调整为初始化,并不限制点击

This commit is contained in:
fan 2020-06-15 13:34:24 +08:00
parent 3f978a2aa8
commit a381bfdcd8
9 changed files with 10 additions and 6 deletions

View File

@ -50,6 +50,7 @@ export default {
exitScript: 'Exit Script', exitScript: 'Exit Script',
drivingByPlan: 'Driving By Plan', drivingByPlan: 'Driving By Plan',
exitPlan: 'Exit Plan', exitPlan: 'Exit Plan',
initialize: 'initialize',
back: 'Back', back: 'Back',
threeDimensionalView: 'Three-Dimensional View', threeDimensionalView: 'Three-Dimensional View',
threeDimensionalStation: 'Three-Dimensional Station', threeDimensionalStation: 'Three-Dimensional Station',

View File

@ -15,6 +15,7 @@ export default {
driverPerspective: 'Driver perspective', driverPerspective: 'Driver perspective',
drivingByPlan: 'Driving by plan', drivingByPlan: 'Driving by plan',
exitPlan: 'Exit plan', exitPlan: 'Exit plan',
initialize: 'initialize',
runGraphPreview: 'Run graph preview', runGraphPreview: 'Run graph preview',
runGraphLoading: 'Run graph loading', runGraphLoading: 'Run graph loading',
faultSetting: 'Fault setting', faultSetting: 'Fault setting',

View File

@ -50,6 +50,7 @@ export default {
exitScript: '退出剧本', exitScript: '退出剧本',
drivingByPlan: '按计划行车', drivingByPlan: '按计划行车',
exitPlan: '退出计划', exitPlan: '退出计划',
initialize: '初始化',
back: '返回', back: '返回',
threeDimensionalView: '三维视图', threeDimensionalView: '三维视图',
threeDimensionalStation: '三维车站', threeDimensionalStation: '三维车站',

View File

@ -15,6 +15,7 @@ export default {
driverPerspective: '司机视角', driverPerspective: '司机视角',
drivingByPlan: '按计划行车', drivingByPlan: '按计划行车',
exitPlan: '退出计划', exitPlan: '退出计划',
initialize: '初始化',
runGraphPreview: '运行图预览', runGraphPreview: '运行图预览',
runGraphLoading: '运行图加载', runGraphLoading: '运行图加载',
faultSetting: '故障设置', faultSetting: '故障设置',

View File

@ -162,7 +162,7 @@ export default {
}; };
this.loading = true; this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false; this.loading = false;
if (valid) { if (valid) {
this.doClose(); this.doClose();
@ -182,7 +182,7 @@ export default {
}; };
this.loading = true; this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false; this.loading = false;
if (valid) { if (valid) {
this.doClose(); this.doClose();

View File

@ -19,7 +19,7 @@
</template> </template>
<template v-else> <template v-else>
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button> <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
<el-button type="danger" :disabled="!isDisable || dataError" @click="end">{{ $t('display.demon.exitPlan') }}</el-button> <el-button type="danger" :disabled="dataError" @click="end">{{ $t('display.demon.initialize') }}</el-button>
</template> </template>
<el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button> <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
</el-button-group> </el-button-group>

View File

@ -13,7 +13,7 @@
<!-- v-if="!isScriptCommand" --> <!-- v-if="!isScriptCommand" -->
<!-- v-if="!isScriptCommand" --> <!-- v-if="!isScriptCommand" -->
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">按计划行车</el-button> <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">按计划行车</el-button>
<el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button> <el-button type="danger" :disabled="dataError" @click="end">初始化</el-button>
<el-button type="primary" @click="back">返回</el-button> <el-button type="primary" @click="back">返回</el-button>
</el-button-group> </el-button-group>
</div> </div>

View File

@ -8,7 +8,7 @@
</el-button-group> --> </el-button-group> -->
<el-button-group> <el-button-group>
<el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button> <el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
<el-button v-if="!isScriptCommand" type="danger" :disabled="!isDisable" @click="end">退出计划</el-button> <el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button>
<el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button> <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
</el-button-group> </el-button-group>
</div> </div>

View File

@ -8,7 +8,7 @@
<el-button v-if="isStationSupervisor && !dataError" type="jmap3dcctv" @click="jlmap3dcctv">cctv</el-button> <el-button v-if="isStationSupervisor && !dataError" type="jmap3dcctv" @click="jlmap3dcctv">cctv</el-button>
<template v-if="isAdmin && project != 'refereeJsxt'"> <template v-if="isAdmin && project != 'refereeJsxt'">
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button> <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
<el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button> <el-button type="danger" :disabled="dataError" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
</template> </template>
<!-- <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button> --> <!-- <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button> -->
</el-button-group> </el-button-group>