From 1b3fd3be47ea0c06b80db9603eb1279daa0dad07 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 17 二月 2025 15:35:55 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d3f000a..8753dfe 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,24 +13,20 @@
<civilServices v-if="activeBook.name == 'civilServices'"></civilServices>
<meetingPlanners v-if="activeBook.name == 'meetingPlanners'"></meetingPlanners>
<aviationBasicSkills v-if="activeBook.name == 'aviationBasicSkills'"></aviationBasicSkills>
- <aviationSafety v-if="activeBook.name == 'aviationSafety'"></aviationSafety>
- <aviationEtiquette v-if="activeBook.name == 'aviationEtiquette'"></aviationEtiquette>
+ <aviationSafety v-if="activeBook.name == 'aviationSafety'"></aviationSafety>
+ <aviationEtiquette v-if="activeBook.name == 'aviationEtiquette'"></aviationEtiquette>
+ <preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
+ <kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'"></kindergartenLanguageActivity>
+ <kindergartenActivitiesDesignGuidance v-if="activeBook.name == 'kindergartenActivitiesDesignGuidance'"></kindergartenActivitiesDesignGuidance>
<childcareInstitutionsManagement v-if="activeBook.name == 'childcareInstitutionsManagement'">
</childcareInstitutionsManagement>
<toddlerGameImplementation v-if="activeBook.name == 'toddlerGameImplementation'"></toddlerGameImplementation>
-<<<<<<< HEAD
- <preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
- <kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'"></kindergartenLanguageActivity>
- <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
-</div>
-=======
- <preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
- <kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'">
- </kindergartenLanguageActivity>
<aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
</aurturingAndEducationAged0to3>
+ <preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
+ </preschoolEvaluation>
+ <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
</div>
->>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
</template>
<script>
// 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.//闂鐨�
@@ -69,23 +65,16 @@
civilServices: () => import("./books/civilServices/view/index.vue"),
meetingPlanners: () => import("./books/meetingPlanners/view/index.vue"),
aviationBasicSkills: () => import("./books/aviationBasicSkills/view/index.vue"),
-<<<<<<< HEAD
aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
aviationEtiquette: ()=> import("./books/aviationEtiquette/view/index.vue"),
- childcareInstitutionsManagement: ()=> import("./books/childcareInstitutionsManagement/view/index.vue"),
- toddlerGameImplementation: ()=> import("./books/toddlerGameImplementation/view/index.vue"),
preschoolGameGuidance: ()=> import("./books/preschoolGameGuidance/view/index.vue"),
kindergartenLanguageActivity: ()=> import("./books/kindergartenLanguageActivity/view/index.vue"),
- preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
-=======
- aviationSafety: () => import("./books/aviationSafety/view/index.vue"),
- aviationEtiquette: () => import("./books/aviationEtiquette/view/index.vue"),
+ kindergartenActivitiesDesignGuidance: () => import("./books/kindergartenActivitiesDesignGuidance/view/index.vue"),
childcareInstitutionsManagement: () => import("./books/childcareInstitutionsManagement/view/index.vue"),
toddlerGameImplementation: () => import("./books/toddlerGameImplementation/view/index.vue"),
- preschoolGameGuidance: () => import("./books/preschoolGameGuidance/view/index.vue"),
- kindergartenLanguageActivity: () => import("./books/kindergartenLanguageActivity/view/index.vue"),
aurturingAndEducationAged0to3: () => import("./books/aurturingAndEducationAged0to3/view/index.vue"),
->>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
+ preschoolEvaluation: () => import("./books/preschoolEvaluation/view/index.vue"),
+ preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
},
data() {
return {
@@ -131,15 +120,16 @@
// childcareInstitutionsManagement //鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
// toddlerGameImplementation //濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
// preschoolGameGuidance //瀛﹀墠娓告垙鎸囧 preschoolGameGuidance
- // kindergartenLanguageActivity
- //preschoolBasicKnowledge //瀛﹀墠鍩虹鏁欒偛鐭ヨ瘑
- // kindergartenLanguageActivity
+ // kindergartenLanguageActivity //骞煎効鍥瑷�娲诲姩 kindergartenLanguageActivity
+ // kindergartenActivitiesDesignGuidance 骞煎効鍥暀鑲叉椿鍔ㄤ笌鎸囧 绗�2鐗�
+ // kindergartenLanguageActivity //骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
// aurturingAndEducationAged0to3 //0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
+ // preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "aurturingAndEducationAged0to3")
+ : "kindergartenActivitiesDesignGuidance")
);
// this.activeBook = await this.config.getBookConfig(
--
Gitblit v1.9.1