From 9d126c9e3a111a7ad0568a859f2cad56565543a9 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期三, 02 四月 2025 14:48:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ca61ee0..7a167d1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,9 +4,7 @@
<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>
@@ -14,10 +12,30 @@
<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>
+ <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>
+ <aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
+ </aurturingAndEducationAged0to3>
+ <preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
+ </preschoolEvaluation>
+ <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
+ <policiesAndRegulations v-if="activeBook.name == 'policiesAndRegulations'"></policiesAndRegulations>
+<<<<<<< HEAD
+ <OralAndBroadcasting v-if="activeBook.name == 'OralAndBroadcasting'" ></OralAndBroadcasting>
+=======
+ <practicalCareChildrenManual v-if="activeBook.name == 'practicalCareChildrenManual'"></practicalCareChildrenManual>
+>>>>>>> aaa13b34449445bdf7aa03d4a8fb3944b5250d6b
</div>
</template>
<script>
- // 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.//闂鐨�
+// 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.//闂鐨�
const debounce = (fn, delay) => {
let timer = null;
return function () {
@@ -50,8 +68,22 @@
artAndDrama: () => import("./books/artAndDrama/view/index.vue"),
botany: () => import("./books/botany/view/index.vue"),
civilAviation: () => import("./books/civilAviation/view/index.vue"),
- civilServices: () =>import("./books/civilServices/view/index.vue"),
- meetingPlanners: () =>import("./books/meetingPlanners/view/index.vue")
+ civilServices: () => import("./books/civilServices/view/index.vue"),
+ meetingPlanners: () => import("./books/meetingPlanners/view/index.vue"),
+ aviationBasicSkills: () => import("./books/aviationBasicSkills/view/index.vue"),
+ aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
+ aviationEtiquette: ()=> import("./books/aviationEtiquette/view/index.vue"),
+ 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")
},
data() {
return {
@@ -88,14 +120,26 @@
// artAndDance
// artAndDrama
// mathBook
- // civilAviation
- // civilServices
- // meetingPlanners
+ // civilAviation // 姘戣埅姒傝
+ // civilServices // 鏈嶅姟蹇冪悊
+ // meetingPlanners // 浼氳绛栧垝
+ // aviationBasicSkills // 鍩烘湰鎶�鑳�
+ // aviationSafety // 瀹夊叏妫�鏌ュ疄鍔�
+ // aviationEtiquette // 绀间华鏈嶅姟
+ // childcareInstitutionsManagement // 鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
+ // toddlerGameImplementation // 濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
+ // preschoolGameGuidance // 瀛﹀墠娓告垙鎸囧
+ // kindergartenLanguageActivity // 骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
+ // aurturingAndEducationAged0to3 // 0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
+ // preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
+ // preschoolBasicKnowledge //瀛﹀墠鏁欒偛鍩虹鐭ヨ瘑
+ // policiesAndRegulations //鏀跨瓥娉曞緥涓庢硶瑙剕鏃呮父绀�
+ // practicalCareChildrenManual // 濠村辜鍎跨収鎶ゅ疄褰�
this.activeBook = await this.config.getBookConfig(
- process.env.VUE_APP_RESOURCE_CTX +
+ 'http://182.92.203.7:3007/books/resource/' +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "meetingPlanners")
+ : "practicalCareChildrenManual")
);
// this.activeBook = await this.config.getBookConfig(
--
Gitblit v1.9.1