From 1b6d212e7d31bff4a52878001876011eaa411966 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 4 Dec 2020 09:17:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=95=E9=A2=98=E5=AE=9A=E4=B9=89=20plac?=
 =?UTF-8?q?eholder=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/publish/examRule/draft/examFrom.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue
index e3ccab878..f95524a4c 100644
--- a/src/views/publish/examRule/draft/examFrom.vue
+++ b/src/views/publish/examRule/draft/examFrom.vue
@@ -10,7 +10,7 @@
         </el-select>
       </el-form-item>
       <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>
       </el-form-item>
       <el-form-item :label="$t('publish.testDate')">

From 666ff5afbbc8111816019cc918be0adb4001cb83 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 4 Dec 2020 09:31:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/Handler.js           | 2 +-
 src/views/demonstration/detail/index.vue   | 3 ++-
 src/views/exam/detail/examDetail.vue       | 3 ++-
 src/views/exam/result.vue                  | 3 ++-
 src/views/publish/examRule/draft/index.vue | 3 ++-
 src/views/publish/examRule/index.vue       | 3 ++-
 src/views/teach/detail/index.vue           | 5 +++--
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
index bacaea416..978c687c6 100644
--- a/src/scripts/cmdPlugin/Handler.js
+++ b/src/scripts/cmdPlugin/Handler.js
@@ -53,7 +53,7 @@ class Handler {
                     reject(error);
                 });
             } else {
-                reject();
+                resolve();
             }
         });
     }
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 153bfd875..b84cb8787 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="joylink-card">
     <div class="card-title">
-      <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
+      {{ $t('demonstration.simulationName') + courseModel.name }}
     </div>
     <div class="simulation-detail">
       <p class="list-item">
@@ -264,6 +264,7 @@ export default {
         line-height: 47px;
         text-align: center;
         border-bottom: 1px solid #d6d6d6;
+        font-weight: bold;
     }
     .simulation-detail {
         padding: 50px;
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index d6e4c4c81..7b33171a8 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="joylink-card">
     <div class="card-title">
-      <b>{{ $t('exam.nameOfTestPaper') +': ' + examDetails.name }}</b>
+      {{ $t('exam.nameOfTestPaper') +': ' + examDetails.name }}
     </div>
     <div class="card_content">
       <el-scrollbar wrap-class="scrollbar-wrapper">
@@ -240,6 +240,7 @@ export default {
             line-height: 47px;
             text-align: center;
             border-bottom: 1px solid #e6e6e6;
+            font-weight:bold;
         }
         .card_content{
             padding:50px;
diff --git a/src/views/exam/result.vue b/src/views/exam/result.vue
index a842a54ca..a169af3a7 100644
--- a/src/views/exam/result.vue
+++ b/src/views/exam/result.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="joylink-card paper">
     <div class="card-title">
-      <span style="font-weight:bold ">{{ $t('exam.examResultsDetails') }}</span>
+      {{ $t('exam.examResultsDetails') }}
     </div>
     <div class="context">
       <el-form ref="form" :model="resultModel" size="mini">
@@ -126,6 +126,7 @@ export default {
             line-height: 47px;
             border-bottom: 1px solid #e6e6e6;
             text-align: center;
+            font-weight:bold;
         }
         .context {
             padding: 30px 60px;
diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue
index ffbb4056c..a48bc94d3 100644
--- a/src/views/publish/examRule/draft/index.vue
+++ b/src/views/publish/examRule/draft/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="joylink-card" :class="lessonName ? 'card-box' : ''">
     <div v-if="lessonName" class="card-title">
-      <b>{{ $t('publish.lessonName') }}： {{ lessonName }}</b>
+      {{ $t('publish.lessonName') }}： {{ lessonName }}
     </div>
     <div class="exam-box" :style="{ 'height': lessonName ? 'calc(100% - 47px)' : '' }">
       <el-steps class="steps" :active="display">
@@ -205,6 +205,7 @@ export default {
             height: 47px;
             line-height: 47px;
             border-bottom: 1px solid #e6e6e6;
+            font-weight:bold;
         }
     }
     .card-box{
diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue
index 020261441..0e9454dde 100644
--- a/src/views/publish/examRule/index.vue
+++ b/src/views/publish/examRule/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="joylink-card">
     <div v-if="lessonName" class="card-title">
-      <b>{{ $t('publish.lessonName') }}： {{ lessonName }}</b>
+      {{ $t('publish.lessonName') }}： {{ lessonName }}
     </div>
     <div :style="{ 'height': lessonName ? 'calc(100% - 47px)' : '100%' }">
       <el-scrollbar wrap-class="scrollbar-wrapper">
@@ -326,6 +326,7 @@ export default {
 		height: 47px;
 		line-height: 47px;
 		border-bottom: 1px solid #e6e6e6;
+        font-weight:bold;
 	}
     /deep/ {
         .is-always-shadow {
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index c2f6a9904..1cafc5d4c 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="joylink-card card_hidden_box">
     <div class="card-title">
-      <b>{{ $t('teach.courseName') }}: {{ courseModel.name }}</b>
+      {{ $t('teach.courseName') }}: {{ courseModel.name }}
     </div>
     <div class="content_box" style="">
       <el-tabs v-model="activeName">
@@ -252,7 +252,8 @@ export default {
     line-height: 47px;
     text-align: center;
     border-bottom: 1px solid #e6e6e6;
-    }
+    font-weight:bold;
+}
   .content_box{
       padding: 50px;
       flex: 1;