Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

QYF-GitLab1

2025-02-17 1b3fd3be47ea0c06b80db9603eb1279daa0dad07

 src/App.vue

@@ -13,22 +13,19 @@
    <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>
    <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>
    <preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
    <kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'">
    </kindergartenLanguageActivity>
    <aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
    </aurturingAndEducationAged0to3>
<<<<<<< HEAD
    <preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
    </preschoolEvaluation>
=======
    <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge> 
>>>>>>> d9a7a02277ade8d3c17c41c4495def9ef1b85d33
  </div>
</template>
<script>
@@ -68,12 +65,13 @@
    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"),
    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"),
    preschoolGameGuidance: () => import("./books/preschoolGameGuidance/view/index.vue"),
    kindergartenLanguageActivity: () => import("./books/kindergartenLanguageActivity/view/index.vue"),
    aurturingAndEducationAged0to3: () => import("./books/aurturingAndEducationAged0to3/view/index.vue"),
    preschoolEvaluation: () => import("./books/preschoolEvaluation/view/index.vue"),
    preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
@@ -122,6 +120,8 @@
      // childcareInstitutionsManagement  //托育机构管理与实务
      // toddlerGameImplementation  //婴幼儿游戏活动实施
      // preschoolGameGuidance //学前游戏指导 preschoolGameGuidance
      // kindergartenLanguageActivity  //幼儿园语言活动 kindergartenLanguageActivity
      // kindergartenActivitiesDesignGuidance 幼儿园教育活动与指导 第2版
      // kindergartenLanguageActivity //幼儿园语言教育与活动指导
      // aurturingAndEducationAged0to3 //0~3岁婴幼儿抚育与教育
      // preschoolEvaluation  // 学前教育评价
@@ -129,7 +129,7 @@
        process.env.VUE_APP_RESOURCE_CTX +
        (process.env.VUE_APP_ENV == "product"
          ? process.env.VUE_APP_BOOK_ID
          : "preschoolEvaluation")
          : "kindergartenActivitiesDesignGuidance")
      );

      // this.activeBook = await this.config.getBookConfig(