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

Merge remote-tracking branch 'remotes/origin/test'

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-12-04 09:33:11 +08:00
commit b0a3c8b83f
8 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/cmdPlugin/Handler.js
View File

@ -53,7 +53,7 @@ class Handler {
reject(error); reject(error);
}); });
} else { } else {
reject(); resolve();
} }
}); });
} }

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

@ -1,7 +1,7 @@
<template> <template>
<div v-loading="loading" class="joylink-card"> <div v-loading="loading" class="joylink-card">
<div class="card-title"> <div class="card-title">
<span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span> {{ $t('demonstration.simulationName') + courseModel.name }}
</div> </div>
<div class="simulation-detail"> <div class="simulation-detail">
<p class="list-item"> <p class="list-item">
@ -264,6 +264,7 @@ export default {
line-height: 47px; line-height: 47px;
text-align: center; text-align: center;
border-bottom: 1px solid #d6d6d6; border-bottom: 1px solid #d6d6d6;
font-weight: bold;
} }
.simulation-detail { .simulation-detail {
padding: 50px; padding: 50px;

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

@ -1,7 +1,7 @@
<template> <template>
<div class="joylink-card"> <div class="joylink-card">
<div class="card-title"> <div class="card-title">
<b>{{ $t('exam.nameOfTestPaper') +': ' + examDetails.name }}</b> {{ $t('exam.nameOfTestPaper') +': ' + examDetails.name }}
</div> </div>
<div class="card_content"> <div class="card_content">
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
@ -240,6 +240,7 @@ export default {
line-height: 47px; line-height: 47px;
text-align: center; text-align: center;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
font-weight:bold;
} }
.card_content{ .card_content{
padding:50px; padding:50px;

3
src/views/exam/result.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div v-loading="loading" class="joylink-card paper"> <div v-loading="loading" class="joylink-card paper">
<div class="card-title"> <div class="card-title">
<span style="font-weight:bold ">{{ $t('exam.examResultsDetails') }}</span> {{ $t('exam.examResultsDetails') }}
</div> </div>
<div class="context"> <div class="context">
<el-form ref="form" :model="resultModel" size="mini"> <el-form ref="form" :model="resultModel" size="mini">
@ -126,6 +126,7 @@ export default {
line-height: 47px; line-height: 47px;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
text-align: center; text-align: center;
font-weight:bold;
} }
.context { .context {
padding: 30px 60px; padding: 30px 60px;

2
src/views/publish/examRule/draft/examFrom.vue
View File

@ -10,7 +10,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('publish.testDuration')" prop="duration"> <el-form-item :label="$t('publish.testDuration')" prop="duration">
<el-input-number v-model="form.duration" placeholder="90" style="float: left; width: calc(100% - 80px);" :disabled="isEdit" :min="1" /> <el-input-number v-model="form.duration" placeholder="请输入" style="float: left; width: calc(100% - 80px);" :disabled="isEdit" :min="1" />
<span style="width:80px; display: block;float: left; text-align: center;">&nbsp;{{ $t('publish.durationMinutes') }}</span> <span style="width:80px; display: block;float: left; text-align: center;">&nbsp;{{ $t('publish.durationMinutes') }}</span>
</el-form-item> </el-form-item>
<el-form-item :label="$t('publish.testDate')"> <el-form-item :label="$t('publish.testDate')">

3
src/views/publish/examRule/draft/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="joylink-card" :class="lessonName ? 'card-box' : ''"> <div class="joylink-card" :class="lessonName ? 'card-box' : ''">
<div v-if="lessonName" class="card-title"> <div v-if="lessonName" class="card-title">
<b>{{ $t('publish.lessonName') }}： {{ lessonName }}</b> {{ $t('publish.lessonName') }}： {{ lessonName }}
</div> </div>
<div class="exam-box" :style="{ 'height': lessonName ? 'calc(100% - 47px)' : '' }"> <div class="exam-box" :style="{ 'height': lessonName ? 'calc(100% - 47px)' : '' }">
<el-steps class="steps" :active="display"> <el-steps class="steps" :active="display">
@ -205,6 +205,7 @@ export default {
height: 47px; height: 47px;
line-height: 47px; line-height: 47px;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
font-weight:bold;
} }
} }
.card-box{ .card-box{

3
src/views/publish/examRule/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="joylink-card"> <div class="joylink-card">
<div v-if="lessonName" class="card-title"> <div v-if="lessonName" class="card-title">
<b>{{ $t('publish.lessonName') }}： {{ lessonName }}</b> {{ $t('publish.lessonName') }}： {{ lessonName }}
</div> </div>
<div :style="{ 'height': lessonName ? 'calc(100% - 47px)' : '100%' }"> <div :style="{ 'height': lessonName ? 'calc(100% - 47px)' : '100%' }">
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
@ -326,6 +326,7 @@ export default {
height: 47px; height: 47px;
line-height: 47px; line-height: 47px;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
font-weight:bold;
} }
/deep/ { /deep/ {
.is-always-shadow { .is-always-shadow {

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

@ -1,7 +1,7 @@
<template> <template>
<div class="joylink-card card_hidden_box"> <div class="joylink-card card_hidden_box">
<div class="card-title"> <div class="card-title">
<b>{{ $t('teach.courseName') }}: {{ courseModel.name }}</b> {{ $t('teach.courseName') }}: {{ courseModel.name }}
</div> </div>
<div class="content_box" style=""> <div class="content_box" style="">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
@ -252,7 +252,8 @@ export default {
line-height: 47px; line-height: 47px;
text-align: center; text-align: center;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
} font-weight:bold;
}
.content_box{ .content_box{
padding: 50px; padding: 50px;
flex: 1; flex: 1;