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

闫增涛

3 天以前 b1ee986edd5ea1c55186b795bf4b54215e4e9331

 src/App.vue

@@ -13,24 +13,26 @@
    <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>
<<<<<<< HEAD
    <preschoolGameGuidance  v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
    <kindergartenLanguageActivity  v-if="activeBook.name == 'kindergartenLanguageActivity'"></kindergartenLanguageActivity>
    <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge> 
</div>
=======
    <preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
    <kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'">
    </kindergartenLanguageActivity>
    <aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
    </aurturingAndEducationAged0to3>
    <preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
    </preschoolEvaluation>
    <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge> 
    <policiesAndRegulations v-if="activeBook.name == 'policiesAndRegulations'"></policiesAndRegulations> 
    <OralAndBroadcasting v-if="activeBook.name == 'OralAndBroadcasting'" ></OralAndBroadcasting>
    <practicalCareChildrenManual v-if="activeBook.name == 'practicalCareChildrenManual'"></practicalCareChildrenManual>
    <childIllnessPreventionCare v-if="activeBook.name == 'childIllnessPreventionCare'"></childIllnessPreventionCare>
    <artInitiationForAges0to3 v-if="activeBook.name == 'artInitiationForAges0to3'"></artInitiationForAges0to3>
    <toddlerSportsSafetyProtection v-if="activeBook.name == 'toddlerSportsSafetyProtection'"></toddlerSportsSafetyProtection>
  </div>
>>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
</template>
<script>
// 解决ERROR ResizeObserver loop completed with undelivered notifications.//问题的
@@ -69,23 +71,22 @@
    civilServices: () => import("./books/civilServices/view/index.vue"),
    meetingPlanners: () => import("./books/meetingPlanners/view/index.vue"),
    aviationBasicSkills: () => import("./books/aviationBasicSkills/view/index.vue"),
<<<<<<< HEAD
    aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
    aviationEtiquette: ()=> import("./books/aviationEtiquette/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"),
    preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
=======
    aviationSafety: () => import("./books/aviationSafety/view/index.vue"),
    aviationEtiquette: () => import("./books/aviationEtiquette/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"),
>>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
    preschoolEvaluation: () => import("./books/preschoolEvaluation/view/index.vue"),
    preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
    policiesAndRegulations: ()=> import("./books/policiesAndRegulations/view/index.vue"),
    OralAndBroadcasting:()=> import("./books/OralAndBroadcasting/view/index.vue"),
    practicalCareChildrenManual: ()=> import("./books/practicalCareChildrenManual/view/index.vue"),
    childIllnessPreventionCare: ()=> import("./books/childIllnessPreventionCare/view/index.vue"),
    artInitiationForAges0to3: ()=> import("./books/artInitiationForAges0to3/view/index.vue"),
    toddlerSportsSafetyProtection : ()=> import("./books/toddlerSportsSafetyProtection/view/index.vue"),
  },
  data() {
    return {
@@ -124,24 +125,28 @@
      // mathBook
      // civilAviation       // 民航概论
      // civilServices       // 服务心理
      // meetingPlanners
      // aviationBasicSkills //基本技能
      // aviationSafety      //安全检查实务
      // aviationEtiquette   //礼仪服务
      // childcareInstitutionsManagement  //托育机构管理与实务
      // toddlerGameImplementation  //婴幼儿游戏活动实施
      // preschoolGameGuidance //学前游戏指导 preschoolGameGuidance
      // kindergartenLanguageActivity
      //preschoolBasicKnowledge //学前基础教育知识
      // kindergartenLanguageActivity 
      // aurturingAndEducationAged0to3 //0~3岁婴幼儿抚育与教育
      // meetingPlanners     // 会议策划
      // aviationBasicSkills // 基本技能
      // aviationSafety      // 安全检查实务
      // aviationEtiquette   // 礼仪服务
      // childcareInstitutionsManagement  // 托育机构管理与实务 
      // toddlerGameImplementation  // 婴幼儿游戏活动实施
      // preschoolGameGuidance // 学前游戏指导
      // kindergartenLanguageActivity // 幼儿园语言教育与活动指导
      // kindergartenActivitiesDesignGuidance    //幼儿园教育活动设计写指导
      // aurturingAndEducationAged0to3 // 0~3岁婴幼儿抚育与教育
      // preschoolEvaluation  // 学前教育评价
      // preschoolBasicKnowledge //学前教育基础知识
      // policiesAndRegulations  //政策法律与法规|旅游社
      // practicalCareChildrenManual // 婴幼儿照护实录
      // OralAndBroadcasting         // 航空服务口语交际与播音技巧
      console.log('debugger',process.env);
      this.activeBook = await this.config.getBookConfig(
        process.env.VUE_APP_RESOURCE_CTX +
        (process.env.VUE_APP_ENV == "product"
          ? process.env.VUE_APP_BOOK_ID
          : "aurturingAndEducationAged0to3")
          : "OralAndBroadcasting")
      );

      // this.activeBook = await this.config.getBookConfig(
      //   'http://182.92.203.7:3007/books/resource/'+
      //   (process.env.VUE_APP_ENV == "product"