From 9d71f13c6d516135ad8d65777c2e7c36e057c39a Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期二, 07 一月 2025 17:27:15 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index eed866a..d05ff0c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,6 +15,8 @@
<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>
</div>
</template>
<script>
@@ -53,7 +55,9 @@
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")
+ aviationBasicSkills: () => import("./books/aviationBasicSkills/view/index.vue"),
+ aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
+ aviationEtiquette: ()=> import("./books/aviationEtiquette/view/index.vue"),
},
data() {
return {
@@ -90,15 +94,17 @@
// artAndDance
// artAndDrama
// mathBook
- // civilAviation
- // civilServices
+ // civilAviation // 姘戣埅姒傝
+ // civilServices // 鏈嶅姟蹇冪悊
// meetingPlanners
- // aviationBasicSkills
+ // aviationBasicSkills //鍩烘湰鎶�鑳�
+ // aviationSafety //瀹夊叏妫�鏌ュ疄鍔�
+ // aviationEtiquette //绀间华鏈嶅姟
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "aviationBasicSkills")
+ : "aviationEtiquette")
);
// this.activeBook = await this.config.getBookConfig(
--
Gitblit v1.9.1