From 2ca7f1e9d3ff3c54ec5d10688a33c628ec296f8b Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期一, 12 五月 2025 10:22:42 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 186 +++++++++++++++++++++++++++++++---------------
1 files changed, 124 insertions(+), 62 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d3f000a..307b059 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,33 +4,75 @@
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
<english v-if="activeBook.name == 'english'"></english>
- <sportsAndHealth v-if="activeBook.name == 'sportsAndHealth'"></sportsAndHealth>
+ <sportsAndHealth
+ v-if="activeBook.name == 'sportsAndHealth'"
+ ></sportsAndHealth>
<artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
<artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
<mathBook v-if="activeBook.name == 'mathBook'"></mathBook>
<botany v-if="activeBook.name == 'botany'"></botany>
<civilAviation v-if="activeBook.name == 'civilAviation'"></civilAviation>
<civilServices v-if="activeBook.name == 'civilServices'"></civilServices>
- <meetingPlanners v-if="activeBook.name == 'meetingPlanners'"></meetingPlanners>
- <aviationBasicSkills v-if="activeBook.name == 'aviationBasicSkills'"></aviationBasicSkills>
+ <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>
- <childcareInstitutionsManagement v-if="activeBook.name == 'childcareInstitutionsManagement'">
+ <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'">
+ <toddlerGameImplementation
+ v-if="activeBook.name == 'toddlerGameImplementation'"
+ ></toddlerGameImplementation>
+ <aurturingAndEducationAged0to3
+ v-if="activeBook.name == 'aurturingAndEducationAged0to3'"
+ >
</aurturingAndEducationAged0to3>
+ <preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
+ </preschoolEvaluation>
+ <preschoolBasicKnowledge
+ v-if="activeBook.name == 'preschoolBasicKnowledge'"
+ ></preschoolBasicKnowledge>
+ <behaviorObserveAndGuid
+ v-if="activeBook.name == 'behaviorObserveAndGuid'"
+ ></behaviorObserveAndGuid>
+ <policiesAndRegulations
+ v-if="activeBook.name == 'policiesAndRegulations'"
+ ></policiesAndRegulations>
+ <OralAndBroadcasting
+ v-if="activeBook.name == 'OralAndBroadcasting'"
+ ></OralAndBroadcasting>
+ <practicalCareChildrenManual
+ v-if="activeBook.name == 'practicalCareChildrenManual'"
+ ></practicalCareChildrenManual>
+ <childIllnessPreventionCare
+ v-if="activeBook.name == 'childIllnessPreventionCare'"
+ ></childIllnessPreventionCare>
+ <artInitiationForAges0to3
+ v-if="activeBook.name == 'artInitiationForAges0to3'"
+ ></artInitiationForAges0to3>
+ <toddlerSportsSafetyProtection
+ v-if="activeBook.name == 'toddlerSportsSafetyProtection'"
+ ></toddlerSportsSafetyProtection>
+ <cognitiveLanDevEduAges0to3
+ v-if="activeBook.name == 'cognitiveLanDevEduAges0to3'"
+ ></cognitiveLanDevEduAges0to3>
</div>
->>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
</template>
<script>
// 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.//闂鐨�
@@ -68,24 +110,42 @@
civilAviation: () => import("./books/civilAviation/view/index.vue"),
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"),
-=======
+ aviationBasicSkills: () =>
+ import("./books/aviationBasicSkills/view/index.vue"),
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"),
- aurturingAndEducationAged0to3: () => import("./books/aurturingAndEducationAged0to3/view/index.vue"),
->>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
+ preschoolGameGuidance: () =>
+ import("./books/preschoolGameGuidance/view/index.vue"),
+ kindergartenLanguageActivity: () =>
+ import("./books/kindergartenLanguageActivity/view/index.vue"),
+ kindergartenActivitiesDesignGuidance: () =>
+ import("./books/kindergartenActivitiesDesignGuidance/view/index.vue"),
+ childcareInstitutionsManagement: () =>
+ import("./books/childcareInstitutionsManagement/view/index.vue"),
+ toddlerGameImplementation: () =>
+ import("./books/toddlerGameImplementation/view/index.vue"),
+ aurturingAndEducationAged0to3: () =>
+ import("./books/aurturingAndEducationAged0to3/view/index.vue"),
+ preschoolEvaluation: () =>
+ import("./books/preschoolEvaluation/view/index.vue"),
+ preschoolBasicKnowledge: () =>
+ import("./books/preschoolBasicKnowledge/view/index.vue"),
+ policiesAndRegulations: () =>
+ import("./books/policiesAndRegulations/view/index.vue"),
+ OralAndBroadcasting: () =>
+ import("./books/OralAndBroadcasting/view/index.vue"),
+ practicalCareChildrenManual: () =>
+ import("./books/practicalCareChildrenManual/view/index.vue"),
+ childIllnessPreventionCare: () =>
+ import("./books/childIllnessPreventionCare/view/index.vue"),
+ artInitiationForAges0to3: () =>
+ import("./books/artInitiationForAges0to3/view/index.vue"),
+ toddlerSportsSafetyProtection: () =>
+ import("./books/toddlerSportsSafetyProtection/view/index.vue"),
+ behaviorObserveAndGuid: () =>
+ import("./books/behaviorObserveAndGuid/view/index.vue"),
+ cognitiveLanDevEduAges0to3: () =>
+ import("./books/cognitiveLanDevEduAges0to3/view/index.vue"),
},
data() {
return {
@@ -114,40 +174,42 @@
},
});
} else {
- // childHealth
- // lifeCare
- // sportsAndHealth
- // embedded
- // english
- // artAndDance
- // artAndDrama
- // mathBook
+ // childHealth // 瀛﹀墠鍎跨鍗敓涓庝繚鍋�
+ // lifeCare // 濠村辜鍎跨敓娲荤収鎶�
+ // sportsAndHealth // 浣撹偛涓庡仴搴�
+ // embedded // 宓屽叆寮忕粍鎬佹帶鍒舵妧鏈紙绗�3鐗堬級(閾侀亾绀�)
+ // english // 鏂版爣鍑嗛�氱敤鑱屽満鑻辫
+ // artAndDance // 鑹烘湳鑸炶箞
+ // artAndDrama // 鑹烘湳鎴忓墽
+ // mathBook // 鏁板
// civilAviation // 姘戣埅姒傝
// civilServices // 鏈嶅姟蹇冪悊
- // meetingPlanners
- // aviationBasicSkills //鍩烘湰鎶�鑳�
- // aviationSafety //瀹夊叏妫�鏌ュ疄鍔�
- // aviationEtiquette //绀间华鏈嶅姟
- // childcareInstitutionsManagement //鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
- // toddlerGameImplementation //濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
- // preschoolGameGuidance //瀛﹀墠娓告垙鎸囧 preschoolGameGuidance
- // kindergartenLanguageActivity
- //preschoolBasicKnowledge //瀛﹀墠鍩虹鏁欒偛鐭ヨ瘑
- // kindergartenLanguageActivity
- // aurturingAndEducationAged0to3 //0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
+ // meetingPlanners // 浼氳绛栧垝
+ // aviationBasicSkills // 鍩烘湰鎶�鑳�
+ // aviationSafety // 瀹夊叏妫�鏌ュ疄鍔�
+ // aviationEtiquette // 绀间华鏈嶅姟
+ // childcareInstitutionsManagement // 鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
+ // toddlerGameImplementation // 濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
+ // preschoolGameGuidance // 瀛﹀墠娓告垙鎸囧
+ // kindergartenLanguageActivity // 骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
+ // kindergartenActivitiesDesignGuidance //骞煎効鍥暀鑲叉椿鍔ㄨ璁″啓鎸囧
+ // aurturingAndEducationAged0to3 // 0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
+ // preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
+ // preschoolBasicKnowledge //瀛﹀墠鏁欒偛鍩虹鐭ヨ瘑
+ // policiesAndRegulations //鏀跨瓥娉曞緥涓庢硶瑙剕鏃呮父绀�
+ // practicalCareChildrenManual // 濠村辜鍎跨収鎶ゅ疄褰�
+ // OralAndBroadcasting // 鑸┖鏈嶅姟鍙ｈ浜ら檯涓庢挱闊虫妧宸�
+ // childIllnessPreventionCare // 0~3宀佸┐骞煎効鐤剧梾棰勯槻
+ // artInitiationForAges0to3 // 0~3宀佸┐骞煎効鑹烘湳鍚挋
+ // toddlerSportsSafetyProtection // 0~3宀佸┐骞煎効杩愬姩瀹夊叏涓庝繚鎶�
+ // behaviorObserveAndGuid // 濠村辜鍎胯涓鸿瀵熶笌鎸囧
+ // cognitiveLanDevEduAges0to3 // 0锝�3宀佸┐骞煎効璁ょ煡涓庤瑷�鍙戝睍鍙婃暀鑲�
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")
+ (process.env.VUE_APP_ENV == "product"
+ ? process.env.VUE_APP_BOOK_ID
+ : "mathBook")
);
-
- // this.activeBook = await this.config.getBookConfig(
- // 'http://182.92.203.7:3007/books/resource/'+
- // (process.env.VUE_APP_ENV == "product"
- // ? process.env.VUE_APP_BOOK_ID
- // : "botany")
- // );
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
this.config.activeBook = this.activeBook;
--
Gitblit v1.9.1