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-09-25 09:18:28 +08:00
parent 8daaffc854
commit 522b94fcfe
9 changed files with 87 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/logo_changan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

17
src/layout/components/Title.vue
View File

@ -2,15 +2,18 @@
<template> <template>
<div class="avatar-container" style="left:40px;" v-if="isShow"> <div class="avatar-container" style="left:40px;" v-if="isShow">
<div class="titleInner">长安玖琏</div> <div class="titleInner">长安玖琏</div>
<div class="titleInner" style="margin-left:40px;">城市轨道交通实训平台</div> <img class="logo" :src="logoImg" />
<div class="titleInner" style="margin-left:80px;">城市轨道交通实训平台</div>
</div> </div>
</template> </template>
<script> <script>
import { getSessionStorage } from '@/utils/auth'; import { getSessionStorage } from '@/utils/auth';
import logoImg from '@/assets/logo_changan.png';
export default { export default {
data() { data() {
return { return {
isShow:false, isShow:false,
logoImg: logoImg
}; };
}, },
mounted(){ mounted(){
@ -31,7 +34,15 @@ export default {
// right: 35px; // right: 35px;
// } // }
.titleInner{ .titleInner{
display:inline-block; display:inline-block;
color: #fff; color: #fff;
font-size:30px;
font-weight:bold;
}
.logo{
position: absolute;
width: 40px;
height: 40px;
top: 10px;
} }
</style> </style>

12
src/views/demonstration/detail/index.vue
View File

@ -2,8 +2,8 @@
<el-card v-loading="loading"> <el-card v-loading="loading">
<div slot="header" style="text-align: center;"> <div slot="header" style="text-align: center;">
<span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span> <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
</div> </div >
<div class="simulation-detail"> <div class="simulation-detail" :style="{ height: height-120 +'px' }">
<p class="list-item"> <p class="list-item">
<span class="list-label">{{ $t('demonstration.productDescription') }}</span> <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
<span class="list-elem">{{ courseModel.remarks }}</span> <span class="list-elem">{{ courseModel.remarks }}</span>
@ -11,7 +11,7 @@
<p class="list-item"> <p class="list-item">
<span class="list-label">{{ $t('global.permissionList') }}</span> <span class="list-label">{{ $t('global.permissionList') }}</span>
</p> </p>
<limit-list :ref="`limit_${this.prodId}`" :course-model="courseModel" /> <limit-list :ref="`limit`" :course-model="courseModel" />
</div> </div>
<div class="btn-buy"> <div class="btn-buy">
<el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button> <el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button>
@ -79,7 +79,6 @@ export default {
return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow; return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow;
}, },
isInRoom() { isInRoom() {
console.log(this.courseModel.prdType,this.hasPermssion,this.jointShow);
return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow; return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow;
}, },
mapId() { mapId() {
@ -249,13 +248,13 @@ export default {
transfer() { transfer() {
this.buttonLoading = false; this.buttonLoading = false;
if (this.$refs) { if (this.$refs) {
this.$refs[`limit_${this.currentPrdCode}`][0].transfer(this.courseModel); this.$refs[`limit`].transfer(this.courseModel);
} }
}, },
distribute() { distribute() {
this.buttonLoading = false; this.buttonLoading = false;
if (this.$refs) { if (this.$refs) {
this.$refs[`limit_${this.currentPrdCode}`][0].distribute(this.courseModel); this.$refs[`limit`].distribute(this.courseModel);
} }
} }
} }
@ -294,7 +293,6 @@ export default {
text-align: center; text-align: center;
justify-content: center; justify-content: center;
transform: translateY(-20px); transform: translateY(-20px);
margin-top: 30px;
} }
.el-tabs--border-card>.el-tabs__header .el-tabs__item { .el-tabs--border-card>.el-tabs__header .el-tabs__item {

41
src/views/exam/detail/courseDetail.vue
View File

@ -12,12 +12,27 @@
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane :label="this.$t('exam.itemList')" name="first"> <el-tab-pane :label="this.$t('exam.itemList')" name="first">
<div v-if="courseModel.detail.length != 0" :style="{ height: height - 230 +'px' }"> <div v-if="courseModel.detail.length != 0" :style="{ height: height - 230 +'px' }">
<el-scrollbar wrap-class="scrollbar-wrapper"> <!--<el-scrollbar wrap-class="scrollbar-wrapper">-->
<template v-for="item in courseModel.detail"> <!--<template v-for="item in courseModel.detail">-->
<ul :key="item.code" type="circle"> <!--<ul :key="item.code" type="circle">-->
<li @click="toExamDetail(item)">{{ item.name }}</li> <!--<li @click="toExamDetail(item)">{{ item.name }}</li>-->
</ul> <!--</ul>-->
</template> <!--</template>-->
<el-tree
ref="tree"
:data="courseModel.detail"
node-key="id"
:props="defaultProps"
:filter-node-method="filterNode"
highlight-current
:span="22"
@node-click="clickEvent"
>
<span slot-scope="{ node, data }">
<span v-if="node.data.trial" class="el-icon-goods" :style="{color: 'green'}">&nbsp;{{ node.label +'（免费）'}}</span>
<span v-else class="el-icon-sold-out">&nbsp;{{ node.label }}</span>
</span>
</el-tree>
</el-scrollbar> </el-scrollbar>
</div> </div>
<div v-else class="noList"> <div v-else class="noList">
@ -64,7 +79,11 @@ export default {
pmsList: [] pmsList: []
}, },
EffectiveTypeList: [], EffectiveTypeList: [],
activeName: 'first' activeName: 'first',
defaultProps: {
children: 'examDefinitionVOList',
label: 'name'
},
}; };
}, },
computed: { computed: {
@ -142,8 +161,12 @@ export default {
this.$refs.limitList.distribute(this.courseModel); this.$refs.limitList.distribute(this.courseModel);
} }
}, },
toExamDetail(item) { clickEvent(obj, data, ele) {
this.$router.push(`${UrlConfig.trainingPlatform.examDetail}/${item.id}`); this.$router.push(`${UrlConfig.trainingPlatform.examDetail}/${obj.id}`);
},
filterNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
} }
} }
}; };

10
src/views/exam/detail/examDetail.vue
View File

@ -44,6 +44,7 @@
</div> </div>
<div class="btn-start"> <div class="btn-start">
<el-button :loading="loading" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button> <el-button :loading="loading" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
<el-button @click="back" >{{ $t('global.back') }}</el-button>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -153,8 +154,8 @@ export default {
this.loading = true; this.loading = true;
getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => { getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => {
this.$router.push({ this.$router.push({
path: `${UrlConfig.exam.pay}/${this.examDetails.lessonId}`, path: `${UrlConfig.trainingPlatform.pay}/${this.examDetails.lessonId}`,
query: { permissionType: PermissionType.EXAM, prdCode: res.data.prdCode, mapId: res.data.mapId } query: { permissionType: PermissionType.EXAM,lessonId: this.examDetails.lessonId,prdCode: res.data.prdCode, mapId: res.data.mapId }
}); });
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('error.obtainCourseDetailsFailed')); this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
@ -210,7 +211,10 @@ export default {
} else { } else {
this.loading = false; this.loading = false;
} }
} },
back() {
this.$router.back();
}
} }
}; };
</script> </script>

18
src/views/package/index.vue
View File

@ -2,6 +2,9 @@
<div> <div>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" /> <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
<select-role ref="selectRole" @reloadTable="reloadTable" /> <select-role ref="selectRole" @reloadTable="reloadTable" />
<div class="btn-buy">
<el-button type="primary" @click="goBack">返回</el-button>
</div>
</div> </div>
</template> </template>
@ -193,7 +196,20 @@ export default {
if (this.queryList && this.queryList.reload) { if (this.queryList && this.queryList.reload) {
this.queryList.reload(); this.queryList.reload();
} }
} },
goBack() {
this.$router.push({ path: `${UrlConfig.trainingPlatform.trainingPlatformHome}` })
}
} }
}; };
</script> </script>
<style>
.btn-buy {
position: relative;
text-align: center;
justify-content: center;
transform: translateY(-20px);
margin-top: 30px;
margin-bottom: 20px;
}
</style>

5
src/views/teach/detail/index.vue
View File

@ -38,6 +38,10 @@
:span="22" :span="22"
@node-click="clickEvent" @node-click="clickEvent"
> >
<span slot-scope="{ node, data }">
<span v-if="node.data.trial" class="el-icon-goods" :style="{color: 'green'}">&nbsp;{{ node.label +'（免费）'}}</span>
<span v-else class="el-icon-sold-out">&nbsp;{{ node.label }}</span>
</span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -155,7 +159,6 @@ export default {
} }
}, },
clickEvent(obj, data, ele) { clickEvent(obj, data, ele) {
console.log(obj, data, ele);
if (obj.type){ if (obj.type){
this.$router.push({ path: `${UrlConfig.trainingPlatform.practical}/${obj.id}/${data.id}`}); this.$router.push({ path: `${UrlConfig.trainingPlatform.practical}/${obj.id}/${data.id}`});
} }

6
src/views/teach/practical/index.vue
View File

@ -21,6 +21,7 @@
</div> </div>
<div class="btn-start"> <div class="btn-start">
<el-button :loading="loading" type="primary" @click="start">{{ $t('teach.startTraining') }}</el-button> <el-button :loading="loading" type="primary" @click="start">{{ $t('teach.startTraining') }}</el-button>
<el-button @click="back" >{{ $t('global.back') }}</el-button>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -96,7 +97,10 @@ export default {
this.loading = false; this.loading = false;
this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`); this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
}); });
} },
back() {
this.$router.back();
}
} }
}; };
</script> </script>

4
src/views/trainingPlatform/demonList.vue
View File

@ -91,8 +91,8 @@
} }
}, },
clickEvent(obj, data, ele) { clickEvent(obj, data, ele) {
// this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/16`}); this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/16`});
// return; return;
if (data.parent && data.parent.data){ if (data.parent && data.parent.data){
this.mapId = data.parent.data.id; this.mapId = data.parent.data.id;
} }