diff --git a/src/assets/images/error.png b/src/assets/images/error.png index d8143db..0be3829 100644 Binary files a/src/assets/images/error.png and b/src/assets/images/error.png differ diff --git a/src/assets/images/logo-hh.png b/src/assets/images/logo-hh.png index 4eec715..faf1bfb 100644 Binary files a/src/assets/images/logo-hh.png and b/src/assets/images/logo-hh.png differ diff --git a/src/assets/images/system/1/left.png b/src/assets/images/system/1/left.png index 65cc5ce..dc3ee5b 100644 Binary files a/src/assets/images/system/1/left.png and b/src/assets/images/system/1/left.png differ diff --git a/src/assets/images/system/1/right.png b/src/assets/images/system/1/right.png index 548a057..0343909 100644 Binary files a/src/assets/images/system/1/right.png and b/src/assets/images/system/1/right.png differ diff --git a/src/assets/images/system/1/yes.png b/src/assets/images/system/1/yes.png index 5211ef1..ea2a1c9 100644 Binary files a/src/assets/images/system/1/yes.png and b/src/assets/images/system/1/yes.png differ diff --git a/src/assets/images/system/10/bg1.png b/src/assets/images/system/10/bg1.png index 5a8db79..15baff4 100644 Binary files a/src/assets/images/system/10/bg1.png and b/src/assets/images/system/10/bg1.png differ diff --git a/src/assets/images/system/10/btn.png b/src/assets/images/system/10/btn.png index c74f526..102a579 100644 Binary files a/src/assets/images/system/10/btn.png and b/src/assets/images/system/10/btn.png differ diff --git a/src/assets/images/system/10/header.png b/src/assets/images/system/10/header.png index bb70f44..c1150c7 100644 Binary files a/src/assets/images/system/10/header.png and b/src/assets/images/system/10/header.png differ diff --git a/src/assets/images/system/10/left.png b/src/assets/images/system/10/left.png index f05aeeb..06092c3 100644 Binary files a/src/assets/images/system/10/left.png and b/src/assets/images/system/10/left.png differ diff --git a/src/assets/images/system/10/right.png b/src/assets/images/system/10/right.png index d127bea..d4ab205 100644 Binary files a/src/assets/images/system/10/right.png and b/src/assets/images/system/10/right.png differ diff --git a/src/assets/images/system/10/yes.png b/src/assets/images/system/10/yes.png index e70aad1..3985785 100644 Binary files a/src/assets/images/system/10/yes.png and b/src/assets/images/system/10/yes.png differ diff --git a/src/assets/images/system/4/bg1.png b/src/assets/images/system/4/bg1.png index 46a9077..db83319 100644 Binary files a/src/assets/images/system/4/bg1.png and b/src/assets/images/system/4/bg1.png differ diff --git a/src/assets/images/system/4/bg2.png b/src/assets/images/system/4/bg2.png index d8b2b5d..70bc972 100644 Binary files a/src/assets/images/system/4/bg2.png and b/src/assets/images/system/4/bg2.png differ diff --git a/src/assets/images/system/4/btn.png b/src/assets/images/system/4/btn.png index 4808ebe..1e88946 100644 Binary files a/src/assets/images/system/4/btn.png and b/src/assets/images/system/4/btn.png differ diff --git a/src/assets/images/system/4/header.png b/src/assets/images/system/4/header.png index 023878d..5a92245 100644 Binary files a/src/assets/images/system/4/header.png and b/src/assets/images/system/4/header.png differ diff --git a/src/assets/images/system/4/left.png b/src/assets/images/system/4/left.png index ee08721..13ee3b6 100644 Binary files a/src/assets/images/system/4/left.png and b/src/assets/images/system/4/left.png differ diff --git a/src/assets/images/system/4/right.png b/src/assets/images/system/4/right.png index 30837ba..0484594 100644 Binary files a/src/assets/images/system/4/right.png and b/src/assets/images/system/4/right.png differ diff --git a/src/assets/images/system/4/yes.png b/src/assets/images/system/4/yes.png index ff3dc9b..c55ed2a 100644 Binary files a/src/assets/images/system/4/yes.png and b/src/assets/images/system/4/yes.png differ diff --git a/src/assets/images/system/5/bg1.png b/src/assets/images/system/5/bg1.png index 6a97525..1ff9cc0 100644 Binary files a/src/assets/images/system/5/bg1.png and b/src/assets/images/system/5/bg1.png differ diff --git a/src/assets/images/system/5/bg2.png b/src/assets/images/system/5/bg2.png index 7587e48..45b9a66 100644 Binary files a/src/assets/images/system/5/bg2.png and b/src/assets/images/system/5/bg2.png differ diff --git a/src/assets/images/system/5/btn.png b/src/assets/images/system/5/btn.png index 571bbe1..04ccf1b 100644 Binary files a/src/assets/images/system/5/btn.png and b/src/assets/images/system/5/btn.png differ diff --git a/src/assets/images/system/5/header.png b/src/assets/images/system/5/header.png index 486f7fe..287f037 100644 Binary files a/src/assets/images/system/5/header.png and b/src/assets/images/system/5/header.png differ diff --git a/src/assets/images/system/5/left.png b/src/assets/images/system/5/left.png index ed57c2a..ed8c4da 100644 Binary files a/src/assets/images/system/5/left.png and b/src/assets/images/system/5/left.png differ diff --git a/src/assets/images/system/5/right.png b/src/assets/images/system/5/right.png index 9f8f604..0968305 100644 Binary files a/src/assets/images/system/5/right.png and b/src/assets/images/system/5/right.png differ diff --git a/src/assets/images/system/5/yes.png b/src/assets/images/system/5/yes.png index 27fcac2..621d00f 100644 Binary files a/src/assets/images/system/5/yes.png and b/src/assets/images/system/5/yes.png differ diff --git a/src/assets/images/system/6/bg1.png b/src/assets/images/system/6/bg1.png index 0d127ff..15baff4 100644 Binary files a/src/assets/images/system/6/bg1.png and b/src/assets/images/system/6/bg1.png differ diff --git a/src/assets/images/system/6/btn.png b/src/assets/images/system/6/btn.png index 8bd999e..36de10f 100644 Binary files a/src/assets/images/system/6/btn.png and b/src/assets/images/system/6/btn.png differ diff --git a/src/assets/images/system/6/header.png b/src/assets/images/system/6/header.png index 5bcd421..198d5ab 100644 Binary files a/src/assets/images/system/6/header.png and b/src/assets/images/system/6/header.png differ diff --git a/src/assets/images/system/6/left.png b/src/assets/images/system/6/left.png index 407d5f8..d8059a3 100644 Binary files a/src/assets/images/system/6/left.png and b/src/assets/images/system/6/left.png differ diff --git a/src/assets/images/system/6/right.png b/src/assets/images/system/6/right.png index 765f963..daebd43 100644 Binary files a/src/assets/images/system/6/right.png and b/src/assets/images/system/6/right.png differ diff --git a/src/assets/images/system/6/yes.png b/src/assets/images/system/6/yes.png index 08863aa..87fec12 100644 Binary files a/src/assets/images/system/6/yes.png and b/src/assets/images/system/6/yes.png differ diff --git a/src/assets/images/system/7/bg1.png b/src/assets/images/system/7/bg1.png index a70847f..c292a3e 100644 Binary files a/src/assets/images/system/7/bg1.png and b/src/assets/images/system/7/bg1.png differ diff --git a/src/assets/images/system/7/bg2.png b/src/assets/images/system/7/bg2.png index 67c955f..db97bc8 100644 Binary files a/src/assets/images/system/7/bg2.png and b/src/assets/images/system/7/bg2.png differ diff --git a/src/assets/images/system/7/btn.png b/src/assets/images/system/7/btn.png index ef755d2..0b08570 100644 Binary files a/src/assets/images/system/7/btn.png and b/src/assets/images/system/7/btn.png differ diff --git a/src/assets/images/system/7/header.png b/src/assets/images/system/7/header.png index fc1765f..39face8 100644 Binary files a/src/assets/images/system/7/header.png and b/src/assets/images/system/7/header.png differ diff --git a/src/assets/images/system/7/left.png b/src/assets/images/system/7/left.png index ea96c05..f1bd494 100644 Binary files a/src/assets/images/system/7/left.png and b/src/assets/images/system/7/left.png differ diff --git a/src/assets/images/system/7/right.png b/src/assets/images/system/7/right.png index a6ab8ac..1573e92 100644 Binary files a/src/assets/images/system/7/right.png and b/src/assets/images/system/7/right.png differ diff --git a/src/assets/images/system/7/yes.png b/src/assets/images/system/7/yes.png index f0e1c5d..6b9df11 100644 Binary files a/src/assets/images/system/7/yes.png and b/src/assets/images/system/7/yes.png differ diff --git a/src/assets/images/system/8/bg1.png b/src/assets/images/system/8/bg1.png index 27c5fd4..071342b 100644 Binary files a/src/assets/images/system/8/bg1.png and b/src/assets/images/system/8/bg1.png differ diff --git a/src/assets/images/system/8/btn.png b/src/assets/images/system/8/btn.png index 3e27745..c872630 100644 Binary files a/src/assets/images/system/8/btn.png and b/src/assets/images/system/8/btn.png differ diff --git a/src/assets/images/system/8/header.png b/src/assets/images/system/8/header.png index 40cdb85..3227ec6 100644 Binary files a/src/assets/images/system/8/header.png and b/src/assets/images/system/8/header.png differ diff --git a/src/assets/images/system/8/left.png b/src/assets/images/system/8/left.png index 5ecbd32..1f380c7 100644 Binary files a/src/assets/images/system/8/left.png and b/src/assets/images/system/8/left.png differ diff --git a/src/assets/images/system/8/right.png b/src/assets/images/system/8/right.png index 1ac5759..41a9ef2 100644 Binary files a/src/assets/images/system/8/right.png and b/src/assets/images/system/8/right.png differ diff --git a/src/assets/images/system/8/yes.png b/src/assets/images/system/8/yes.png index 1263886..5a1f000 100644 Binary files a/src/assets/images/system/8/yes.png and b/src/assets/images/system/8/yes.png differ diff --git a/src/assets/images/system/9/bg1.png b/src/assets/images/system/9/bg1.png index a545b93..81603a7 100644 Binary files a/src/assets/images/system/9/bg1.png and b/src/assets/images/system/9/bg1.png differ diff --git a/src/assets/images/system/9/bg2.png b/src/assets/images/system/9/bg2.png index 49e7f8b..08dcef3 100644 Binary files a/src/assets/images/system/9/bg2.png and b/src/assets/images/system/9/bg2.png differ diff --git a/src/assets/images/system/9/btn.png b/src/assets/images/system/9/btn.png index 67791e8..1d90bf0 100644 Binary files a/src/assets/images/system/9/btn.png and b/src/assets/images/system/9/btn.png differ diff --git a/src/assets/images/system/9/header.png b/src/assets/images/system/9/header.png index 58bb501..4cc1a09 100644 Binary files a/src/assets/images/system/9/header.png and b/src/assets/images/system/9/header.png differ diff --git a/src/assets/images/system/9/left.png b/src/assets/images/system/9/left.png index 1ee5aea..4df2092 100644 Binary files a/src/assets/images/system/9/left.png and b/src/assets/images/system/9/left.png differ diff --git a/src/assets/images/system/9/right.png b/src/assets/images/system/9/right.png index e807327..1fbede6 100644 Binary files a/src/assets/images/system/9/right.png and b/src/assets/images/system/9/right.png differ diff --git a/src/assets/images/system/9/yes.png b/src/assets/images/system/9/yes.png index 896b32b..93c10d8 100644 Binary files a/src/assets/images/system/9/yes.png and b/src/assets/images/system/9/yes.png differ diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue index 4bd3743..f96c19c 100644 --- a/src/components/TestPanel.vue +++ b/src/components/TestPanel.vue @@ -239,6 +239,11 @@ export default { }) }) }, + // 关闭父页面的loading，并置加载完成状态为true + closeLoad() { + this.$parent.loadIns.close() + this.$parent.loaded = true + }, // 获取考核列表来查询该考核是否已经考过 getAssList(){ this.$post(`${this.api.pageStuAssessment}`, { @@ -268,6 +273,8 @@ export default { this.statusTimer = setInterval(_ => { this.getStatus() }, 1000) + } else { + this.closeLoad() } }).catch(res => {}) }, @@ -283,6 +290,7 @@ export default { projectId, // 项目id，同上 cid // 课程id }).then(res => { + this.closeLoad() const code = res.getLastCache // 如果有缓存代码，再提示用户是否要继续上次的实验 if (code) { diff --git a/src/views/Home.vue b/src/views/Home.vue index beb043b..72058ca 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,5 +1,5 @@