From 739e4c590b6b058149ee909e77d2077fffda262f Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期一, 30 十二月 2024 14:25:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 04f2ced..a2980c7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,16 +4,42 @@
<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>
+ <aviationSafety v-if="activeBook.name == 'aviationSafety'"></aviationSafety>
+ <aviationEtiquette v-if="activeBook.name == 'aviationEtiquette'"></aviationEtiquette>
</div>
</template>
-
<script>
+ // 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.//闂鐨�
+const debounce = (fn, delay) => {
+ let timer = null;
+ return function () {
+ let context = this;
+ let args = arguments;
+ clearTimeout(timer);
+ timer = setTimeout(function () {
+ fn.apply(context, args);
+ }, delay);
+ };
+};
+// 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.
+const _ResizeObserver = window.ResizeObserver;
+window.ResizeObserver = class ResizeObserver extends _ResizeObserver {
+ constructor(callback) {
+ callback = debounce(callback, 16);
+ super(callback);
+ }
+};
export default {
name: "App",
components: {
@@ -26,11 +52,16 @@
mathBook: () => import("./books/mathBook/view/index.vue"),
artAndDrama: () => import("./books/artAndDrama/view/index.vue"),
botany: () => import("./books/botany/view/index.vue"),
- civilAviation: () => import("./books/civilAviation/view/index.vue")
+ 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"),
+ aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
+ aviationEtiquette: ()=> import("./books/aviationEtiquette/view/index.vue"),
},
data() {
return {
- activeBook: {}
+ activeBook: {},
};
},
async created() {
@@ -49,10 +80,10 @@
(this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
) {
this.$store.state.qiankun.getBookConfig({
- bookConfig: this.activeBook
+ bookConfig: this.activeBook,
});
}
- }
+ },
});
} else {
// childHealth
@@ -64,11 +95,15 @@
// artAndDrama
// mathBook
// civilAviation
+ // civilServices
+ // meetingPlanners
+ // aviationBasicSkills
+ // aviationSafety
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "mathBook")
+ : "aviationEtiquette")
);
// this.activeBook = await this.config.getBookConfig(
@@ -85,11 +120,10 @@
},
methods: {
but() {
- console.log(this.activeBook, 'this.activeBook789');
- }
- }
+ console.log(this.activeBook, "this.activeBook789");
+ },
+ },
};
-
</script>
<style lang="less">
@@ -97,7 +131,7 @@
body {
width: 100%;
height: 100%;
- margin: 0;
+ margin: 0 !important;
}
#app {
--
Gitblit v1.9.1