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-10-30 10:15:24 +08:00
commit 850f492b45
12 changed files with 1227 additions and 1229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ export default {
endTime: 'End',
isForever: 'Timelimit',
remains: 'Remaining',
hasPermissionTip: 'Public permission is {0}, private permission is {1}',
hasPermissionTip: 'Public permission {0}, private permission {1}',
create: 'Create',
update: 'Update',
return: 'Return',

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

@ -228,10 +228,13 @@ export default {
endTime: 'End time',
editPlanningTrain: 'Edit planning train',
runGraphName: 'Run graph name',
tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】',
serverTrainNum: '表号车次号',
tipOperationTime: 'Please set the running time between the stations, [File] -> [Modify the running time between stations]',
serverTrainNum: ' service trip Number',
explanation: 'Explanation',
creationDate: 'Creation date',
load: 'Load',
modifyName: 'Modify name'
modifyName: 'Modify name',
applyRelease:'Apply for release',
preview:'Preview',
revoke:'Revoke'
};

11
src/i18n/langs/en/tip.js
View File

@ -206,5 +206,14 @@ export default {
rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!',
rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!',
duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1',
createSwitchPortion: 'The relevant turnout is not formed'
createSwitchPortion: 'The relevant turnout is not formed',
publishRunPlanTips:'This action will publish run plan, whether to continue?',
applyRunPlanTips:'This action will initiate a run plan release request，whether to continue?',
publishRunPlanSuccess:'Publish run plan success!',
publishRunPlanFail:'Publish run plan fail!',
applyRunPlanSuccess:'Submit run plan to publish success!',
applyRunPlanFail:'Submit run plan to publish fail!',
cancelRunPlanTips:'This action will revoke the run plan request, whether to continue?',
cancelRunPlanSuccess:'Revoke run plan success!',
cancelRunPlanFail:'Revoke run plan fail!'
};

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

@ -236,5 +236,8 @@ export default {
explanation: '驳回说明',
creationDate: '创建日期',
load: '加载',
modifyName: '修改名称'
modifyName: '修改名称',
applyRelease:'申请发布',
preview:'预览',
revoke:'撤回'
};

11
src/i18n/langs/zh/tip.js
View File

@ -206,5 +206,14 @@ export default {
rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功！',
rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败！',
duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1',
createSwitchPortion: '相关道岔未生成'
createSwitchPortion: '相关道岔未生成',
publishRunPlanTips:'此操作将发布运行图，是否继续？',
applyRunPlanTips:'此操作将发起运行图发布申请，是否继续？',
publishRunPlanSuccess:'发布运行图成功！',
publishRunPlanFail:'发布运行图失败！',
applyRunPlanSuccess:'提交运行图发布申请成功！',
applyRunPlanFail:'提交运行图发布申请失败！',
cancelRunPlanTips:'此操作将撤销发布运行图申请，是否继续？',
cancelRunPlanSuccess:'撤销运行图发布申请成功！',
cancelRunPlanFail:'撤销运行图发布申请失败！'
};

2
src/styles/element-ui.scss
View File

@ -60,3 +60,5 @@
.el-radio{
margin-right: 20px;
}
.el-tooltip__popper{max-width:40%;line-height:160%;}

1
src/views/lesson/lessoncategory/edit/chapter/index.vue
View File

@ -222,6 +222,7 @@ export default {
.card-box {
padding-top: 20px;
height: 100%;
margin: 0 auto;
}
.steps {

1
src/views/lesson/lessoncategory/edit/lesson/index.vue
View File

@ -196,6 +196,7 @@ export default {
.card-box {
padding-top: 20px;
height: 100%;
margin: 0 auto;
}
.steps {

2
src/views/lesson/lessoncategory/index.vue
View File

@ -144,6 +144,8 @@ export default {
overflow-y: auto;
.box{
height: 100%;
display: -webkit-box;
width: 100%;
}
}
</style>

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

@ -29,9 +29,9 @@
<el-button size="mini" class="button_box" type="success" @click="handleConfirm(scope.row)" v-if="scope.row.status !=='1'">{{$t('planMonitor.load')}}</el-button>
<el-button size="mini" class="button_box" type="primary" @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'">{{$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?$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="danger" @click="handelRevert(scope.row)" v-if="scope.row.status === '1'" >撤销</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'):$t('planMonitor.applyRelease')}}</el-button>
<el-button size="mini" class="button_box" type="primary" @click="handlePreview(scope.row)" v-if="scope.row.status === '1'">{{$t('planMonitor.preview')}}</el-button>
<el-button size="mini" class="button_box" type="danger" @click="handelRevert(scope.row)" v-if="scope.row.status === '1'" >{{$t('planMonitor.revoke')}}</el-button>
</template>
</el-table-column>
</el-table>
@ -185,41 +185,41 @@ export default {
}).catch(() => { });
},
handlePublish(row) {
this.$confirm(this.hasRelease? '此操作将发布运行图，是否继续？':'此操作将发起运行图发布申请，是否继续？',this.$t('tip.hint'),{
this.$confirm(this.hasRelease? this.$t('tip.publishRunPlanTips'):this.$t('tip.applyRunPlanTips'),this.$t('tip.hint'),{
confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
if (this.hasRelease){
publishRunPlan(row.id,{runPlanName: name}).then(resp => {
this.$message.success('发布运行图成功！');
this.$message.success(this.$t('tip.publishRunPlanSuccess'));
this.refresh();
}).catch(() => {
this.$messageBox('发布运行图失败！');
this.$messageBox(this.$t('tip.publishRunPlanFail'));
this.refresh();
})
} else {
releaseOrCancelRunPlan(row.id, '1').then(resp => {
this.$message.success('提交运行图发布申请成功！');
this.$message.success(this.$t('tip.applyRunPlanSuccess'));
this.refresh();
}).catch(() => {
this.$messageBox('提交运行图发布申请失败！');
this.$messageBox(this.$t('tip.applyRunPlanFail'));
this.refresh();
})
}
});
},
handelRevert(row) {
this.$confirm('此操作将撤销发布运行图申请，是否继续？',this.$t('tip.hint'),{
this.$confirm(this.$t('tip.cancelRunPlanTips'),this.$t('tip.hint'),{
confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'),
type:'warning'
}).then(() => {
releaseOrCancelRunPlan(row.id,'0').then(resp=> {
this.$message.success('撤销运行图发布申请成功！');
this.$message.success(this.$t('tip.cancelRunPlanSuccess'));
this.refresh();
}).catch(() => {
this.$messageBox('撤销运行图发布申请失败！')
this.$messageBox(this.$t('tip.cancelRunPlanFail'))
this.refresh();
})
})
@ -243,8 +243,7 @@ export default {
return lessonStatus;
},
handleTime(time) {
let timeList = time.split("T");
return timeList[0] + ' ' +timeList[1];
return time.replace("T"," ");
},
handlePreview(row){
previewRunPlan(row.id).then(resp => {
@ -269,41 +268,10 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped>
@import "src/styles/mixin.scss";
// .title {
// font-weight: bold
// }
// .time-item {
// font-size: 24px;
// color: black !important;
// }
// .time-label {
// display: -moz-inline-box;
// display: inline-block;
// text-align: right;
// margin-left: 14px;
// }
// .time-elem {
// color: rgb(90, 89, 89) !important;
// }
// .list-item {
// font-size: 16px;
// margin-bottom: 20px;
// }
// .list-label {
// display: -moz-inline-box;
// display: inline-block;
// text-align: right;
// /* width: 160px; */
// }
// .list-elem {
// color: #808080 !important;
// }
.el-button+.el-button{
margin-top:5px;
margin-left: 0px;
}
.createRunPlan{
display:inline-block;float:right;margin-right:20px;