From b27476519bae6380f608793a23e790c86720d401 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 30 十二月 2024 15:17:27 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index eed866a..c2270fc 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 {
@@ -94,11 +98,13 @@
// civilServices
// meetingPlanners
// 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