From 50b5b4c76285d57a96e9397054b8c8c147c44464 Mon Sep 17 00:00:00 2001 From: litian <2804272236@qq.com> Date: 星期五, 21 二月 2025 09:29:32 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout --- src/App.vue | 91 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 74 insertions(+), 17 deletions(-) diff --git a/src/App.vue b/src/App.vue index c598bd8..28b2fa2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,10 +9,46 @@ <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> + <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> </div> </template> - <script> +// 瑙e喅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); + }; +}; +// 瑙e喅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: { @@ -24,22 +60,34 @@ artAndDance: () => import("./books/artAndDance/view/index.vue"), mathBook: () => import("./books/mathBook/view/index.vue"), artAndDrama: () => import("./books/artAndDrama/view/index.vue"), - botany: () => import("./books/botany/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"), + 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"), }, data() { return { - activeBook: {} + activeBook: {}, }; }, async created() { if (this.setGlobalState) { this.setGlobalState({ - initTestBook: async (bookId, tryPageCount) => { this.activeBook = await this.config.getBookConfig( process.env.VUE_APP_RESOURCE_CTX + process.env.VUE_APP_BOOK_ID ); - this.config.activeBook = this.activeBook; this.config.goodsStore = this.activeBook.storeRefcode; if (tryPageCount) { @@ -49,10 +97,10 @@ (this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig) ) { this.$store.state.qiankun.getBookConfig({ - bookConfig: this.activeBook + bookConfig: this.activeBook, }); } - } + }, }); } else { // childHealth @@ -63,13 +111,25 @@ // artAndDance // artAndDrama // mathBook - + // civilAviation // 姘戣埅姒傝 + // civilServices // 鏈嶅姟蹇冪悊 + // meetingPlanners + // aviationBasicSkills //鍩烘湰鎶�鑳� + // aviationSafety //瀹夊叏妫�鏌ュ疄鍔� + // aviationEtiquette //绀间华鏈嶅姟 + // childcareInstitutionsManagement // 鎵樿偛鏈烘瀯绠$悊涓庡疄鍔� + // toddlerGameImplementation // 濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂� + // preschoolGameGuidance // 瀛﹀墠娓告垙鎸囧 + // kindergartenLanguageActivity // 骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵� + // aurturingAndEducationAged0to3 // 0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲� + // preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环 this.activeBook = await this.config.getBookConfig( - process.env.VUE_APP_RESOURCE_CTX + + process.env.VUE_APP_RESOURCE_CTX + (process.env.VUE_APP_ENV == "product" ? process.env.VUE_APP_BOOK_ID - : "sportsAndHealth") + : "preschoolEvaluation") ); + // this.activeBook = await this.config.getBookConfig( // 'http://182.92.203.7:3007/books/resource/'+ // (process.env.VUE_APP_ENV == "product" @@ -83,14 +143,11 @@ } }, methods: { - but() { - console.log(this.activeBook, 'this.activeBook789'); - } - - } + console.log(this.activeBook, "this.activeBook789"); + }, + }, }; - </script> <style lang="less"> @@ -98,7 +155,7 @@ body { width: 100%; height: 100%; - margin: 0; + margin: 0 !important; } #app { -- Gitblit v1.9.1