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.cloud.tencent.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
fan 2019-10-22 17:24:51 +08:00
commit 6760cdc7e3
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
View File

@ -57,6 +57,7 @@
:id="domIdTrainNumber"
v-model="formModel.category"
filterable
:disabled="true"
>
<el-option
v-for="item in categoryList"
@ -98,9 +99,7 @@ export default {
return {
trainList: [],
categoryList: [
{ name: 'MM', value: '01' },
{ name: 'BB', value: '02' },
{ name: 'AA', value: '03' }
{ name: 'MM', value: '01' }
],
formModel: {
tripNumber: '',
@ -262,7 +261,8 @@ export default {
tripNumber: val,
trainType: this.formModel.trainType,
serviceNumber: '',
targetCode: ''
targetCode: '',
category: 'MM'
};
}
}
@ -293,7 +293,8 @@ export default {
tripNumber: `${model.directionCode}${model.tripNumber}`,
trainType: model.type,
serviceNumber: model.serviceNumber,
targetCode: model.targetCode
targetCode: model.targetCode,
category: 'MM'
};
/** 加载列车数据*/
@ -369,7 +370,8 @@ export default {
tripNumber: tripNumber,
trainType: this.formModel.trainType,
serviceNumber: response.data.serviceNumber,
targetCode: response.data.targetCode
targetCode: response.data.targetCode,
category: 'MM'
};
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
@ -378,7 +380,8 @@ export default {
tripNumber: tripNumber,
trainType: this.formModel.trainType,
serviceNumber: '',
targetCode: ''
targetCode: '',
category: 'MM'
};
}
}

5
src/views/planMonitor/detail.vue
View File

@ -1,6 +1,6 @@
<template>
<el-card :style="{height: height+'px'}">
<div class="runPlanHeader">
<div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
<div class="runPlanList">{{$t('planMonitor.openRunPlan.runPlanList')}}</div>
<el-button size="small" type="primary" @click="handleCreate" class="createRunPlan" v-if="isCreate">{{$t('planMonitor.createRunningDiagram')}}</el-button>
</div>
@ -8,7 +8,7 @@
border
style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
<el-table-column prop="name" :label="this.$t('planMonitor.runGraphName')" />
<el-table-column :label="this.$t('global.status')">
<el-table-column :label="this.$t('global.status')" v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))">
<template slot-scope="scope">
<el-tag>{{handlerStatus(scope.row)}}</el-tag>
</template>
@ -16,6 +16,7 @@
<el-table-column
prop="explanation"
show-overflow-tooltip
v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))"
:label="this.$t('planMonitor.explanation')">
</el-table-column>
<el-table-column :label="this.$t('planMonitor.creationDate')">