From 4b04bb4269d55c1b415deeeb9e071bbb02fd4582 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 17 二月 2025 15:37:03 +0800
Subject: [PATCH] 学前教育评价样章
---
src/App.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 7ca11fd..8818d1d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,12 +23,9 @@
</kindergartenLanguageActivity>
<aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
</aurturingAndEducationAged0to3>
-<<<<<<< HEAD
<preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
</preschoolEvaluation>
-=======
<preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
->>>>>>> d9a7a02277ade8d3c17c41c4495def9ef1b85d33
</div>
</template>
<script>
@@ -119,11 +116,11 @@
// aviationBasicSkills //鍩烘湰鎶�鑳�
// aviationSafety //瀹夊叏妫�鏌ュ疄鍔�
// aviationEtiquette //绀间华鏈嶅姟
- // childcareInstitutionsManagement //鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
- // toddlerGameImplementation //濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
- // preschoolGameGuidance //瀛﹀墠娓告垙鎸囧 preschoolGameGuidance
- // kindergartenLanguageActivity //骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
- // aurturingAndEducationAged0to3 //0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
+ // childcareInstitutionsManagement // 鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
+ // toddlerGameImplementation // 濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
+ // preschoolGameGuidance // 瀛﹀墠娓告垙鎸囧
+ // kindergartenLanguageActivity // 骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
+ // aurturingAndEducationAged0to3 // 0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
// preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
--
Gitblit v1.9.1