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

实训管理调整

Browse Source
This commit is contained in:
fan 2019-10-17 17:56:25 +08:00
parent 534fa388e8
commit ab815ec493
6 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/i18n/langs/en/planMonitor.js
View File

@ -230,5 +230,8 @@ export default {
runGraphName: 'Run graph name', runGraphName: 'Run graph name',
tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】', tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】',
serverTrainNum: '表号车次号', serverTrainNum: '表号车次号',
explanation: 'Explanation' explanation: 'Explanation',
creationDate: 'Creation date',
load: 'Load',
modifyName: 'Modify name'
}; };

3
src/i18n/langs/zh/planMonitor.js
View File

@ -234,4 +234,7 @@ export default {
tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】', tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】',
serverTrainNum: '表号车次号', serverTrainNum: '表号车次号',
explanation: '驳回说明', explanation: '驳回说明',
creationDate: '创建日期',
load: '加载',
modifyName: '修改名称'
}; };

6
src/views/lesson/trainingmanage/draft.vue
View File

@ -2,7 +2,7 @@
<el-dialog v-dialogDrag :title="operation.title" :visible.sync="dialogShow" width="500px" :before-close="close"> <el-dialog v-dialogDrag :title="operation.title" :visible.sync="dialogShow" width="500px" :before-close="close">
<el-form ref="form" :model="operateModel" label-width="auto" :rules="rules" size="mini" label-position="right" class="dialog-form"> <el-form ref="form" :model="operateModel" label-width="auto" :rules="rules" size="mini" label-position="right" class="dialog-form">
<el-form-item :label="this.$t('lesson.skinType') + ':'" prop="skinCode"> <el-form-item :label="this.$t('lesson.skinType') + ':'" prop="skinCode">
<el-select v-model="operateModel.skinCode" disabled="true" @change="skinCodeChoose"> <el-select v-model="operateModel.skinCode" :disabled="this.disable" @change="skinCodeChoose">
<el-option <el-option
v-for="option in skinCodeList" v-for="option in skinCodeList"
:key="option.code" :key="option.code"
@ -77,7 +77,8 @@ export default {
trainingOperateTypeMap: { trainingOperateTypeMap: {
type: Object, type: Object,
required: true required: true
} },
}, },
data() { data() {
var minDurations = (rule, value, callback) => { var minDurations = (rule, value, callback) => {
@ -128,6 +129,7 @@ export default {
return { return {
dialogShow: false, dialogShow: false,
disable: true,
productTypesList: [], productTypesList: [],
trainTypesList: [], trainTypesList: [],
productList: [], productList: [],

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

@ -140,7 +140,7 @@ export default {
type: '' type: ''
}, },
{ {
name: this.$t('lesson.trainingRecord'), name: '实训录制',
handleClick: this.trainingRecord, handleClick: this.trainingRecord,
type: '' type: ''
} }
@ -148,9 +148,10 @@ export default {
} }
], ],
actions: [ actions: [
{ text: this.$t('lesson.generateTraining'), btnCode: 'employee_insert', handler: this.autoMaticTrainging }, { text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging },
{ text: this.$t('lesson.updateTraining'), btnCode: 'employee_insert', handler: this.editTrainingByType, type: 'warning'}, { text: this.$t('lesson.updateTraining'), btnCode: 'employee_edit', handler: this.editTrainingByType, type: 'warning'},
{ text: this.$t('lesson.deleteTraining'), btnCode: 'employee_insert', handler: this.delAutoMaticTrainging, type: 'danger'} { text: this.$t('lesson.deleteTraining'), btnCode: 'employee_delete', handler: this.delAutoMaticTrainging, type: 'danger'},
{ text: '添加实训', btnCode: 'employee_add', handler:this.addTraining, type: 'primary' }
] ]
}, },
@ -269,6 +270,9 @@ export default {
queryFunction(params) { queryFunction(params) {
params['mapId'] = this.$route.query.mapId; params['mapId'] = this.$route.query.mapId;
return pageQueryTraining(params); return pageQueryTraining(params);
},
addTraining() {
} }
} }
}; };

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

@ -8,7 +8,7 @@
border border
style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;"> 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 prop="name" :label="this.$t('planMonitor.runGraphName')" />
<el-table-column :label="this.$('global.status')"> <el-table-column :label="this.$t('global.status')">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{handlerStatus(scope.row)}}</span> <span>{{handlerStatus(scope.row)}}</span>
</template> </template>
@ -16,19 +16,19 @@
<el-table-column <el-table-column
prop="explanation" prop="explanation"
show-overflow-tooltip show-overflow-tooltip
label="驳回说明"> :label="this.$t('planMonitor.explanation')">
</el-table-column> </el-table-column>
<el-table-column label="创建日期"> <el-table-column :label="this.$t('planMonitor.creationDate')">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{handleTime(scope.row.createTime)}}</span> <span>{{handleTime(scope.row.createTime)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="500"> <el-table-column :label="this.$t('global.operate')" width="500">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" class="button_box" @click="handleConfirm(scope.row)" v-if="scope.row.status !=='1'">加载</el-button> <el-button size="mini" class="button_box" @click="handleConfirm(scope.row)" v-if="scope.row.status !=='1'">{{$t('planMonitor.load')}}</el-button>
<el-button size="mini" class="button_box" @click="handleEdit(scope.row)" v-if="isCreate && scope.row.status !=='1'">修改名称</el-button> <el-button size="mini" class="button_box" @click="handleEdit(scope.row)" v-if="isCreate && scope.row.status !=='1'">{{$t('planMonitor.modifyName')}}</el-button>
<el-button size="mini" class="button_box" type="danger" @click="handleDelete(scope.row)" v-if="isCreate && scope.row.status !=='1'">删除</el-button> <el-button size="mini" class="button_box" type="danger" @click="handleDelete(scope.row)" v-if="isCreate && scope.row.status !=='1'">{{$t('global.delete')}}</el-button>
<el-button size="mini" class="button_box" type="primary" @click="handlePublish(scope.row)" v-if="isCreate && scope.row.status ==='0'">{{hasRelease?'发布':'申请发布'}}</el-button> <el-button size="mini" class="button_box" type="primary" @click="handlePublish(scope.row)" v-if="isCreate && scope.row.status ==='0'">{{hasRelease?$t('global.release'):'申请发布'}}</el-button>
<el-button size="mini" class="button_box" type="primary" @click="handlePreview(scope.row)" v-if="scope.row.status === '1'">预览</el-button> <el-button size="mini" class="button_box" type="primary" @click="handlePreview(scope.row)" v-if="scope.row.status === '1'">预览</el-button>
<el-button size="mini" class="button_box" type="danger" @click="handelRevert(scope.row)" v-if="scope.row.status === '1'" >撤销</el-button> <el-button size="mini" class="button_box" type="danger" @click="handelRevert(scope.row)" v-if="scope.row.status === '1'" >撤销</el-button>
</template> </template>

2
src/views/systemGenerate/index.vue
View File

@ -4,7 +4,7 @@
<b>地图子系统生成</b> <b>地图子系统生成</b>
</div> </div>
<div style="margin:50px" :style="{ height: height - 160 +'px' }"> <div style="margin:50px" :style="{ height: height - 160 +'px' }">
<el-select v-model="mapId" clearable placeholder="请选择"> <el-select v-model="mapId" clearable placeholder="请选择地图">
<el-option <el-option
v-for="item in mapList" v-for="item in mapList"
:key="item.value" :key="item.value"