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-12 18:43:41 +08:00
parent 5af0c7e4c9
commit 38f4dc1093
13 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/i18n/langs/en/approval.js
View File

@ -25,5 +25,10 @@ export default {
passedRunPlan: 'Passed Run Plan', passedRunPlan: 'Passed Run Plan',
rejectRunPlan: 'Reject Run Plan', rejectRunPlan: 'Reject Run Plan',
runPlanPreview: 'RunPlan Preview', runPlanPreview: 'RunPlan Preview',
inputRunPlanName: 'Please input run plan name' inputRunPlanName: 'Please input run plan name',
courseDescription: 'Course description',
lookOver: 'Look over',
courseDetails: 'Course details',
instructions: 'Instructions',
chapterTrainingName:'Chapter/training name'
}; };

3
src/i18n/langs/en/error.js
View File

@ -92,5 +92,6 @@ export default {
getStationListFail: 'Failed to get station list', getStationListFail: 'Failed to get station list',
obtainTrainGroupNumberFailed: 'Failed to obtain train group number', obtainTrainGroupNumberFailed: 'Failed to obtain train group number',
getTrainListFailed: 'Failed to get train list', getTrainListFailed: 'Failed to get train list',
getDraftCourseDataFailed: 'Failed to get draft course data!' getDraftCourseDataFailed: 'Failed to get draft course data!',
failedToGetCourseData: 'Failed to get course data!'
}; };

3
src/i18n/langs/en/lesson.js
View File

@ -110,5 +110,6 @@ export default {
notRelease: 'Not release', notRelease: 'Not release',
pendingReview: 'Pending review', pendingReview: 'Pending review',
published: 'Published', published: 'Published',
rejected: 'Rejected' rejected: 'Rejected',
review: 'Review'
}; };

3
src/i18n/langs/en/rules.js
View File

@ -301,5 +301,6 @@ export default {
enterTheElevatorCode: 'Please enter the elevator code', enterTheElevatorCode: 'Please enter the elevator code',
enterTheElevatorWidth: 'Please enter the elevator width', enterTheElevatorWidth: 'Please enter the elevator width',
enterTheElevatorHeight: 'Please enter the elevator height', enterTheElevatorHeight: 'Please enter the elevator height',
enterTheElevatorColor: 'Please enter the elevator color' enterTheElevatorColor: 'Please enter the elevator color',
enterRejectReason: 'Please enter reject reason'
}; };

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

@ -201,5 +201,8 @@ export default {
createPlanFailed: 'Failed to create plan!', createPlanFailed: 'Failed to create plan!',
cancelCoursePublicationHint: 'This action will cancel the course publication application, is it OK?', cancelCoursePublicationHint: 'This action will cancel the course publication application, is it OK?',
cancelTheSuccessfulApplicationOfTheCourseRelease: 'Cancel the successful application of the course release!', cancelTheSuccessfulApplicationOfTheCourseRelease: 'Cancel the successful application of the course release!',
cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!' cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!',
publishTheCourseHint: 'This operation will publish the course. Are you sure?',
rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!',
rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!'
}; };

7
src/i18n/langs/zh/approval.js
View File

@ -25,5 +25,10 @@ export default {
passedRunPlan: '通过运行图', passedRunPlan: '通过运行图',
rejectRunPlan: '驳回运行图', rejectRunPlan: '驳回运行图',
runPlanPreview: '预览', runPlanPreview: '预览',
inputRunPlanName: '请输入运行图名称' inputRunPlanName: '请输入运行图名称',
courseDescription: '课程说明',
lookOver: '查看',
courseDetails: '课程详情',
instructions: '说明',
chapterTrainingName: '章节/课程名称'
}; };

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

@ -92,5 +92,6 @@ export default {
getStationListFail: '获取车站列表失败', getStationListFail: '获取车站列表失败',
obtainTrainGroupNumberFailed: '获取列车车组号失败', obtainTrainGroupNumberFailed: '获取列车车组号失败',
getTrainListFailed: '获取列车列表失败', getTrainListFailed: '获取列车列表失败',
getDraftCourseDataFailed: '获取草稿课程数据失败！' getDraftCourseDataFailed: '获取草稿课程数据失败！',
failedToGetCourseData: '获取课程数据失败！'
}; };

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

@ -109,6 +109,7 @@ export default {
notRelease: '未发布', notRelease: '未发布',
pendingReview: '待审核', pendingReview: '待审核',
published: '已发布', published: '已发布',
rejected: '已驳回' rejected: '已驳回',
review: '查看'
}; };

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

@ -303,5 +303,6 @@ export default {
enterTheElevatorCode: '请输入电梯编号', enterTheElevatorCode: '请输入电梯编号',
enterTheElevatorWidth: '请输入电梯宽度', enterTheElevatorWidth: '请输入电梯宽度',
enterTheElevatorHeight: '请输入电梯高度', enterTheElevatorHeight: '请输入电梯高度',
enterTheElevatorColor: '请输入电梯颜色' enterTheElevatorColor: '请输入电梯颜色',
enterRejectReason: '请输入驳回说明'
}; };

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

@ -201,5 +201,8 @@ export default {
createPlanFailed: '创建计划失败！', createPlanFailed: '创建计划失败！',
cancelCoursePublicationHint: '此操作将撤销课程发布申请，是否确定？', cancelCoursePublicationHint: '此操作将撤销课程发布申请，是否确定？',
cancelTheSuccessfulApplicationOfTheCourseRelease: '撤销课程发布申请成功！', cancelTheSuccessfulApplicationOfTheCourseRelease: '撤销课程发布申请成功！',
cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败！' cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败！',
publishTheCourseHint: '此操作将发布课程，是否确定？',
rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功！',
rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败！'
}; };

11
src/views/approval/lesson/detail.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<el-dialog <el-dialog
:title="课程详情" :title="this.$t('approval.courseDetails')"
:visible.sync="showDetail" :visible.sync="showDetail"
top="20px" top="20px"
width="90%" width="90%"
@ -13,7 +13,7 @@
<b>{{ $t('global.courseName') }}: {{ lessonName }}</b> <b>{{ $t('global.courseName') }}: {{ lessonName }}</b>
</div> </div>
<div style="margin:50px"> <div style="margin:50px">
<p style="font-size: 14px; margin-bottom: 20px"> 课程说明: <p style="font-size: 14px; margin-bottom: 20px"> {{ $t('approval.courseDescription')}}:
<span style="color: #808080 !important;">{{ lessonRemark }}</span> <span style="color: #808080 !important;">{{ lessonRemark }}</span>
</p> </p>
</div> </div>
@ -29,12 +29,12 @@
<el-table-column <el-table-column
prop="name" prop="name"
border border
label="章节/实训名称"> :label="this.$t('approval.chapterTrainingName')">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="remarks" prop="remarks"
border border
label="说明"> :label="this.$t('approval.instructions')">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-scrollbar> </el-scrollbar>
@ -90,11 +90,10 @@
this.lessonRemark = response.data[0].remarks; this.lessonRemark = response.data[0].remarks;
this.loading = false; this.loading = false;
}).catch(error=>{ }).catch(error=>{
this.$messageBox('获取课程数据失败！') this.$messageBox(this.$t('approval.failedToGetCourseData'))
}); });
}, },
doClose() { doClose() {
// this.showDetail = false;
} }
} }
} }

37
src/views/approval/lesson/index.vue
View File

@ -1,17 +1,17 @@
<template> <template>
<div> <div>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList"></QueryListPage> <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList"></QueryListPage>
<el-dialog title="驳回原因" :visible.sync="dialogFormVisible"> <el-dialog :title="this.$t('approval.explanation')" :visible.sync="dialogFormVisible">
<el-input type="textarea" <el-input type="textarea"
:rows="2" :rows="2"
placeholder="请输入驳回原因" :placeholder="this.$t('rules.enterRejectReason')"
@focus="inputFocus" @focus="inputFocus"
@blur="inputBlur" @blur="inputBlur"
v-model="textarea"></el-input> v-model="textarea"></el-input>
<span v-show="needReason" style="color: red">*请输入驳回原因</span> <span v-show="needReason" style="color: red">{{'*'+$t('rules.enterRejectReason')}}</span>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="rejectCancel">取 消</el-button> <el-button @click="rejectCancel">{{$t('global.cancel')}}</el-button>
<el-button type="primary" @click="rejectConfirm">确 定</el-button> <el-button type="primary" @click="rejectConfirm">{{$t('global.confirm')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<lesson-detail ref="lessonDetail"></lesson-detail> <lesson-detail ref="lessonDetail"></lesson-detail>
@ -50,7 +50,7 @@
queryObject: { queryObject: {
mapId: { mapId: {
type: 'select', type: 'select',
label: '地图:', label: this.$t('approval.map')+this.$t('global.colon'),
config: { config: {
data: [] data: []
} }
@ -61,7 +61,7 @@
}, },
userName: { userName: {
type: 'text', type: 'text',
label: '申请人:' label: this.$t('approval.applicant')+this.$t('global.colon'),
} }
} }
}, },
@ -75,22 +75,22 @@
prop: 'name' prop: 'name'
}, },
{ {
title: '地图', title: this.$t('approval.map'),
prop: 'mapId ', prop: 'mapId ',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId , this.mapList, ['value', 'label']); }, columnValue: (row) => { return this.$convertField(row.mapId , this.mapList, ['value', 'label']); },
tagType: (row) => { return ''; } tagType: (row) => { return ''; }
}, },
{ {
title: '课程说明', title: this.$t('approval.courseDescription'),
prop: 'remarks' prop: 'remarks'
}, },
{ {
title: '申请人', title: this.$t('approval.applicant'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: '申请时间', title: this.$t('approval.applyTime'),
prop: 'uploadTime', prop: 'uploadTime',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.handleTime(row.uploadTime)}, columnValue: (row) => { return this.handleTime(row.uploadTime)},
@ -102,17 +102,17 @@
width: '250', width: '250',
buttons: [ buttons: [
{ {
name: '查看', name: this.$t('approval.lookOver'),
handleClick: this.goDetail, handleClick: this.goDetail,
type: '' type: ''
}, },
{ {
name: '通过', name: this.$t('approval.applyPassed'),
handleClick: this.pass, handleClick: this.pass,
type: '' type: ''
}, },
{ {
name: '驳回', name: this.$t('approval.applyReject'),
handleClick: this.noPass, handleClick: this.noPass,
type: '' type: ''
} }
@ -141,13 +141,10 @@
}, },
methods: { methods: {
goDetail(index,row) { goDetail(index,row) {
console.log(this.$refs.lessonDetail,this.$refs);
// this.$router.push({path:`/apply/lesson/detail/${row.id}`});
this.$refs.lessonDetail.show(row.id); this.$refs.lessonDetail.show(row.id);
}, },
pass(index,row) { pass(index,row) {
this.$confirm('此操作将发布课程，是否确定？', this.$t('global.tips'), { this.$confirm(this.$t('tip.publishTheCourseHint'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'), confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'), cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
@ -189,14 +186,14 @@
if (this.rejectId){ if (this.rejectId){
rejectedLessonRelease({explanation:this.textarea},this.rejectId).then(rep =>{ rejectedLessonRelease({explanation:this.textarea},this.rejectId).then(rep =>{
this.loading = false; this.loading = false;
this.$message.success('驳回课程成功！'); this.$message.success(this.$t('tip.rejectedCourseReleaseApplicationSuccessful'));
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.rejectId = ''; this.rejectId = '';
this.textarea = ''; this.textarea = '';
this.doClose(); this.doClose();
}).catch(error => { }).catch(error => {
this.loading = false; this.loading = false;
this.$messageBox('驳回课程失败！'); this.$messageBox(this.$t('tip.rejectedCourseReleaseApplicationSuccessful'));
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.rejectId = ''; this.rejectId = '';
this.textarea = ''; this.textarea = '';

28
src/views/lesson/home.vue
View File

@ -28,11 +28,11 @@
<span>{{handlerStatus(scope.row)}}</span> <span>{{handlerStatus(scope.row)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!--<el-table-column-->
prop="explanation" <!--prop="explanation"-->
:label="this.$t('lesson.rejectReason')" <!--:label="this.$t('lesson.rejectReason')"-->
> <!--&gt;-->
</el-table-column> <!--</el-table-column>-->
<el-table-column <el-table-column
width="500" width="500"
:label="this.$t('global.operate')"> :label="this.$t('global.operate')">
@ -43,6 +43,14 @@
v-if="scope.row.status!=='1'" v-if="scope.row.status!=='1'"
@click="createChapter(scope.row)" @click="createChapter(scope.row)"
>{{ scope.row.type==='lesson'? $t('lesson.createChapter'):$t('lesson.updateChapter')}}</el-button> >{{ scope.row.type==='lesson'? $t('lesson.createChapter'):$t('lesson.updateChapter')}}</el-button>
<el-button
size="mini"
type="primary"
v-if="scope.row.status==='1'"
@click="goDetail(scope.row)"
>
{{$t('lesson.review')}}
</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" plain type="primary" plain
@ -77,6 +85,7 @@
</el-card> </el-card>
<publish-create @refresh="refresh" ref="publishCreate" /> <publish-create @refresh="refresh" ref="publishCreate" />
<publish-lesson ref="publishLesson" @refresh="refresh" /> <publish-lesson ref="publishLesson" @refresh="refresh" />
<lesson-detail ref="lessonDetail"/>
</div> </div>
</template> </template>
@ -86,12 +95,14 @@
import PublishCreate from './lessoncategory/edit/create'; import PublishCreate from './lessoncategory/edit/create';
import PublishLesson from './lessoncategory/edit/lesson/publish'; import PublishLesson from './lessoncategory/edit/lesson/publish';
import { delLesson } from '@/api/jmap/lessondraft'; import { delLesson } from '@/api/jmap/lessondraft';
import LessonDetail from '@/views/approval/lesson/detail';
export default { export default {
name: 'LessonHome', name: 'LessonHome',
components: { components: {
PublishCreate, PublishCreate,
PublishLesson PublishLesson,
LessonDetail
}, },
computed: { computed: {
mapId() { mapId() {
@ -161,7 +172,7 @@
lessonStatus = this.$t('lesson.published'); lessonStatus = this.$t('lesson.published');
break; break;
case '3': case '3':
lessonStatus = this.$t('lesson.rejected'); lessonStatus = this.$t('lesson.rejected')+`(${this.$t('global.remarks')}：${row.explanation})`;
break; break;
} }
return lessonStatus; return lessonStatus;
@ -230,6 +241,9 @@
this.refuse(); this.refuse();
}); });
}); });
},
goDetail(row) {
this.$refs.lessonDetail.show(row.id);
} }
} }
}; };