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

闫增涛

2024-05-23 b4469608f6b7bd6e57657ad80654314f450e854d

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

 src/App.vue

@@ -1,7 +1,7 @@
<template>
  <div id="app">
    <childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
    <book v-if="activeBook.name == 'content'"></book>
    <lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
    <embedded v-if="activeBook.name == 'embedded'"></embedded>
    <english v-if="activeBook.name == 'english'"></english>
  </div>
@@ -9,32 +9,49 @@

<script>
import childHealth from "./books/childHealth/view/index.vue";
import book from "./books/content/index.vue";
import lifeCare from "./books/lifeCare/index.vue";
import embedded from "./books/embedded/view/index.vue";
import english from "./books/English/view/index.vue"
import english from "./books/English/view/index.vue";

export default {
  name: "App",
  components: {
    childHealth,
    book,
    lifeCare,
    embedded,
    english
  },
  data() {
    return {
      activeBook: {},
      activeBook: {}
    };
  },
  async created() {
    this.activeBook = this.thisBookConfig;
    console.log('图书',this.activeBook);
    if (this.$store.state.qiankun,this.$store.state.qiankun.getBookConfig) {
      this.$store.state.qiankun.getBookConfig({
        bookConfig: this.activeBook,
    if (this.setGlobalState) {
      this.setGlobalState({
        initTestBook: async (bookId) => {
          this.activeBook = await this.config.getBookConfig(this.config.resourceCtx + bookId);
          this.config.resourceCtx = this.config.resourceCtx + bookId;
          this.config.activeBook = this.activeBook;
          this.config.goodsStore = this.activeBook.storeRefcode;
          console.log("图书", this.activeBook);
          if (
            (this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
          ) {
            this.$store.state.qiankun.getBookConfig({
              bookConfig: this.activeBook
            });
          }
        }
      });
    } else {
      this.activeBook = await this.config.getBookConfig(
        this.config.resourceCtx + "childHealth"
      );
      this.config.activeBook = this.activeBook;
      this.config.goodsStore = this.activeBook.storeRefcode;
    }
  },
  }
};
</script>


 src/assets/js/config.js

@@ -1,12 +1,12 @@
import axios from "axios";
export const resourceCtx = "http://182.92.203.7:3007/books/resource/4"; // 资源请求地址
export const resourceCtx = "http://182.92.203.7:3007/books/resource/"; // 资源请求地址
export let activeBook = {}; // 资源请求地址
export let goodsStore = "";
// 请求教材配置信息
const getBookConfig = async () => {
  const response = await axios.get(resourceCtx + "/bookConfig.json");
  activeBook = response.data;
  goodsStore = response.data.storeRefcode;
const getBookConfig = async (ctx) => {
  const response = await axios.get(
    ctx + "/bookConfig.json"
  );
  return response.data;
};
export const appId = 3;
@@ -20,6 +20,6 @@
  tokenKey,
  goodsStore,
  appId,
  getBookConfig,
  getBookConfig
};
export default config;

 src/assets/methods/examination.js

@@ -1,4 +1,4 @@
import { activeBook } from "@/assets/js/config";
import { activeBook, goodsStore } from "@/assets/js/config";
import MG from "@/assets/js/middleGround/WebMiddleGroundApi";
import getPublicImage from "@/assets/js/middleGround/tool";
const getQuestionList = async (oldList, questionList) => {
@@ -33,6 +33,7 @@
  for (let qindex = 0; qindex < questionList.length; qindex++) {
    const qitem = questionList[qindex];
    let query = {
      storeInfo: goodsStore,
      path: "*",
      cmsPath: activeBook.rootCmsItemId,
      cmsType: "*",

 src/books/childHealth/view/content/index.vue

@@ -294,18 +294,19 @@
      const borderColorDom = (
        this.container ? this.container : document
      ).querySelectorAll(".theme-border");
      console.log(this.config,'this.configthis.config');
      // 获取配置的主题色
      const bookThemeColor =
        this.thisBookConfig && this.thisBookConfig.bookThemeColor
          ? this.thisBookConfig.bookThemeColor
        this.config.activeBook && this.config.activeBook.bookThemeColor
          ? this.config.activeBook.bookThemeColor
          : null;
      const chapterThemeColor =
        this.thisBookConfig && this.thisBookConfig.chapterThemeColor
          ? this.thisBookConfig.chapterThemeColor
        this.config.activeBook && this.config.activeBook.chapterThemeColor
          ? this.config.activeBook.chapterThemeColor
          : null;
      const pageThemeColor =
        this.thisBookConfig && this.thisBookConfig.pageThemeColor
          ? this.thisBookConfig.pageThemeColor
        this.config.activeBook && this.config.activeBook.pageThemeColor
          ? this.config.activeBook.pageThemeColor
          : null;
      colorDom.forEach((domItem) => {
        // 获取章节、页码

 src/books/lifeCare/Fonts/FZHTJW.ttf

Binary files differ

 src/books/lifeCare/Fonts/FZLTXIHJW.ttf

Binary files differ

 src/books/lifeCare/Fonts/FZLTZHJW.ttf

Binary files differ

 src/books/lifeCare/components/carousel.vue

 src/books/lifeCare/components/chapter01/table-1-1-1.vue

 src/books/lifeCare/components/chapter01/table-1-1-2.vue

 src/books/lifeCare/components/chapter01/table-1-1-3.vue

 src/books/lifeCare/components/customTable.vue

 src/books/lifeCare/components/header.vue

 src/books/lifeCare/css/default.less

 src/books/lifeCare/icons/sub.png

 src/books/lifeCare/icons/task.png

 src/books/lifeCare/icons/video.png

 src/books/lifeCare/image/0001-5.jpg

 src/books/lifeCare/image/0011-1.jpg

 src/books/lifeCare/image/0018-1.jpg

 src/books/lifeCare/image/0019-1.jpg

 src/books/lifeCare/image/0019-2.jpg

 src/books/lifeCare/image/0024-1.jpg

 src/books/lifeCare/image/0025-1.jpg

 src/books/lifeCare/image/0025-2.jpg

 src/books/lifeCare/image/0027-1.jpg

 src/books/lifeCare/image/0027-2.jpg

 src/books/lifeCare/image/0028-1.jpg

 src/books/lifeCare/image/0029-1.jpg

 src/books/lifeCare/image/0030-1.jpg

 src/books/lifeCare/image/0032-1.jpg

 src/books/lifeCare/image/0033-1.jpg

 src/books/lifeCare/image/0033-2.jpg

 src/books/lifeCare/image/0034-1.jpg

 src/books/lifeCare/image/0035-1.jpg

 src/books/lifeCare/image/0035-2.jpg

 src/books/lifeCare/image/0039-1.jpg

 src/books/lifeCare/image/0041-1.jpg

 src/books/lifeCare/image/0042-1.jpg

 src/books/lifeCare/image/0042-2.jpg

 src/books/lifeCare/image/0042-3.jpg

 src/books/lifeCare/image/0042-4.jpg

 src/books/lifeCare/image/0043-1.jpg

 src/books/lifeCare/image/0043-2.jpg

 src/books/lifeCare/image/0043-3.jpg

 src/books/lifeCare/image/0043-4.jpg

 src/books/lifeCare/image/0043-5.jpg

 src/books/lifeCare/image/0044-2.jpg

 src/books/lifeCare/image/0045-2.jpg

 src/books/lifeCare/image/0047-1.jpg

 src/books/lifeCare/image/0049-1.jpg

 src/books/lifeCare/image/0050-1.jpg

 src/books/lifeCare/image/0052-1.jpg

 src/books/lifeCare/image/0053-1.jpg

 src/books/lifeCare/image/0055-1.jpg

 src/books/lifeCare/image/0055-2.jpg

 src/books/lifeCare/image/0056-1.jpg

 src/books/lifeCare/image/0057-1.jpg

 src/books/lifeCare/image/0058-2.jpg

 src/books/lifeCare/image/0059-1.jpg

 src/books/lifeCare/image/0059-2.jpg

 src/books/lifeCare/image/0059-3.jpg

 src/books/lifeCare/image/0060-1.jpg

 src/books/lifeCare/image/0060-2.jpg

 src/books/lifeCare/image/0061-1.jpg

 src/books/lifeCare/image/0062-1.jpg

 src/books/lifeCare/image/0064-1.jpg

 src/books/lifeCare/image/0067-1.jpg

 src/books/lifeCare/image/0070-1.jpg

 src/books/lifeCare/image/0071-1.jpg

 src/books/lifeCare/image/0075-2.jpg

 src/books/lifeCare/image/0078-1.jpg

 src/books/lifeCare/image/0080-1.jpg

 src/books/lifeCare/image/0083-1.jpg

 src/books/lifeCare/image/0085-1.jpg

 src/books/lifeCare/image/0086-1.jpg

 src/books/lifeCare/image/0087-1.jpg

 src/books/lifeCare/image/0088-1.jpg

 src/books/lifeCare/image/0089-2.jpg

 src/books/lifeCare/image/0090-1.jpg

 src/books/lifeCare/image/0093-1.jpg

 src/books/lifeCare/image/0096-2.jpg

 src/books/lifeCare/image/0097-1.jpg

 src/books/lifeCare/image/0097-2.jpg

 src/books/lifeCare/image/0098-1.jpg

 src/books/lifeCare/image/0099-1.jpg

 src/books/lifeCare/image/0101-1.jpg

 src/books/lifeCare/image/0106-1.jpg

 src/books/lifeCare/image/0107-1.jpg

 src/books/lifeCare/image/0109-1.jpg

 src/books/lifeCare/image/0112-1.jpg

 src/books/lifeCare/image/0114-1.jpg

 src/books/lifeCare/image/0120-2.jpg

 src/books/lifeCare/image/0122-1.jpg

 src/books/lifeCare/image/0122-2.jpg

 src/books/lifeCare/image/0123-1.jpg

 src/books/lifeCare/image/0123-2.jpg

 src/books/lifeCare/image/0126-1.jpg

 src/books/lifeCare/image/0127-1.jpg

 src/books/lifeCare/image/0130-1.jpg

 src/books/lifeCare/image/0133-1.jpg

 src/books/lifeCare/image/0133-2.jpg

 src/books/lifeCare/image/0133-3.jpg

 src/books/lifeCare/image/0134-1.jpg

 src/books/lifeCare/image/0134-2.jpg

 src/books/lifeCare/image/0135-1.jpg

 src/books/lifeCare/image/0138-1.jpg

 src/books/lifeCare/image/0144-1.jpg

 src/books/lifeCare/image/0145-1.jpg

 src/books/lifeCare/image/0146-2.jpg

 src/books/lifeCare/image/0148-1.jpg

 src/books/lifeCare/image/0150-1.jpg

 src/books/lifeCare/image/0151-1.jpg

 src/books/lifeCare/image/0151-2.jpg

 src/books/lifeCare/image/0152-1.jpg

 src/books/lifeCare/image/0152-2.jpg

 src/books/lifeCare/image/0155-1.jpg

 src/books/lifeCare/image/0155-2.jpg

 src/books/lifeCare/image/0156-1.jpg

 src/books/lifeCare/image/0156-2.jpg

 src/books/lifeCare/image/0158-1.jpg

 src/books/lifeCare/image/0165-1.jpg

 src/books/lifeCare/image/0166-1.jpg

 src/books/lifeCare/image/0168-1.jpg

 src/books/lifeCare/image/0172-1.jpg

 src/books/lifeCare/image/0173-1.jpg

 src/books/lifeCare/image/0174-1.jpg

 src/books/lifeCare/image/0185-1.jpg

 src/books/lifeCare/image/0185-2.jpg

 src/books/lifeCare/image/0186-1.jpg

 src/books/lifeCare/image/0187-1.jpg

 src/books/lifeCare/image/0188-1.jpg

 src/books/lifeCare/image/0189-1.jpg

 src/books/lifeCare/image/0189-2.jpg

 src/books/lifeCare/image/0189-3.jpg

 src/books/lifeCare/image/0190-1.jpg

 src/books/lifeCare/image/0193-1.jpg

 src/books/lifeCare/image/0202-1.jpg

 src/books/lifeCare/image/0208-1.jpg

 src/books/lifeCare/image/0209-1.jpg

 src/books/lifeCare/image/0209-2.jpg

 src/books/lifeCare/image/0210-2.jpg

 src/books/lifeCare/image/0215-1.jpg

 src/books/lifeCare/image/0215-2.jpg

 src/books/lifeCare/image/0216-1.jpg

 src/books/lifeCare/image/0216-2.jpg

 src/books/lifeCare/image/0217-1.jpg

 src/books/lifeCare/image/0217-2.jpg

 src/books/lifeCare/image/0218-1.jpg

 src/books/lifeCare/image/0218-2.jpg

 src/books/lifeCare/image/0219-1.jpg

 src/books/lifeCare/image/0220-1.jpg

 src/books/lifeCare/image/0220-2.jpg

 src/books/lifeCare/image/0221-1.jpg

 src/books/lifeCare/image/0224-1.jpg

 src/books/lifeCare/image/0230-1.jpg

 src/books/lifeCare/image/0234-1.jpg

 src/books/lifeCare/image/0235-1.jpg

 src/books/lifeCare/image/0237-1.jpg

 src/books/lifeCare/image/0238-1.jpg

 src/books/lifeCare/image/0239-1.jpg

 src/books/lifeCare/image/0245-1.jpg

 src/books/lifeCare/image/0247-1.jpg

 src/books/lifeCare/image/0248-1.jpg

 src/books/lifeCare/image/0255-1.jpg

 src/books/lifeCare/image/0256-1.jpg

 src/books/lifeCare/image/0256-2.jpg

 src/books/lifeCare/image/0257-1.jpg

 src/books/lifeCare/image/FD.jpg

 src/books/lifeCare/image/SMY.jpg

 src/books/lifeCare/image/chapter.png

 src/books/lifeCare/image/ckwx.jpg

 src/books/lifeCare/image/dy-qjgs.jpg

 src/books/lifeCare/image/dy-sys.png

 src/books/lifeCare/image/dy-xgzl.jpg

 src/books/lifeCare/image/dy-xxdh.jpg

 src/books/lifeCare/image/dy-xxjy.jpg

 src/books/lifeCare/image/dy-xxmb.jpg

 src/books/lifeCare/image/dy-ycs.png

 src/books/lifeCare/image/dy1.jpg

 src/books/lifeCare/image/dy2.jpg

 src/books/lifeCare/image/dy3.jpg

 src/books/lifeCare/image/dy4.jpg

 src/books/lifeCare/image/dy5.jpg

 src/books/lifeCare/image/dy6.jpg

 src/books/lifeCare/image/dy7.jpg

 src/books/lifeCare/image/dy8.jpg

 src/books/lifeCare/image/ml.jpg

 src/books/lifeCare/image/pageImg.png

 src/books/lifeCare/image/qy.jpg

 src/books/lifeCare/image/sysm.jpg

 src/books/lifeCare/image/xxgcy.png

 src/books/lifeCare/image/xy.jpg

 src/books/lifeCare/image/zt-gjc.jpg

 src/books/lifeCare/image/zt-my.png

 src/books/lifeCare/image/zt-sys.png

 src/books/lifeCare/image/zt-xueyx.png

 src/books/lifeCare/image/zt-xxmb.jpg

 src/books/lifeCare/image/zt-xyx.png

 src/books/lifeCare/image/zt-yy.png

 src/books/lifeCare/image/zt1.jpg

 src/books/lifeCare/image/zt2.jpg

 src/books/lifeCare/image/zt3.jpg

 src/books/lifeCare/image/zt4.jpg

 src/books/lifeCare/image/zt5.jpg

 src/books/lifeCare/image/zt6.jpg

 src/books/lifeCare/image/zt7.jpg

 src/books/lifeCare/image/zt8.jpg

 src/books/lifeCare/index.vue

 src/books/lifeCare/js/examinationList.js

 src/books/lifeCare/js/viewer.js

 src/books/lifeCare/view/1-test.vue

 src/books/lifeCare/view/ChapterFive/index.vue

 src/books/lifeCare/view/ChapterFive/section1.vue

 src/books/lifeCare/view/ChapterFive/section10.vue

 src/books/lifeCare/view/ChapterFive/section11.vue

 src/books/lifeCare/view/ChapterFive/section12.vue

 src/books/lifeCare/view/ChapterFive/section13.vue

 src/books/lifeCare/view/ChapterFive/section14.vue

 src/books/lifeCare/view/ChapterFive/section15.vue

 src/books/lifeCare/view/ChapterFive/section16.vue

 src/books/lifeCare/view/ChapterFive/section17.vue

 src/books/lifeCare/view/ChapterFive/section18.vue

 src/books/lifeCare/view/ChapterFive/section19.vue

 src/books/lifeCare/view/ChapterFive/section2.vue

 src/books/lifeCare/view/ChapterFive/section20.vue

 src/books/lifeCare/view/ChapterFive/section21.vue

 src/books/lifeCare/view/ChapterFive/section22.vue

 src/books/lifeCare/view/ChapterFive/section23.vue

 src/books/lifeCare/view/ChapterFive/section24.vue

 src/books/lifeCare/view/ChapterFive/section25.vue

 src/books/lifeCare/view/ChapterFive/section26 copy 2.vue

 src/books/lifeCare/view/ChapterFive/section26.vue

 src/books/lifeCare/view/ChapterFive/section27.vue

 src/books/lifeCare/view/ChapterFive/section28.vue

 src/books/lifeCare/view/ChapterFive/section29.vue

 src/books/lifeCare/view/ChapterFive/section3.vue

 src/books/lifeCare/view/ChapterFive/section4.vue

 src/books/lifeCare/view/ChapterFive/section5.vue

 src/books/lifeCare/view/ChapterFive/section6.vue

 src/books/lifeCare/view/ChapterFive/section7.vue

 src/books/lifeCare/view/ChapterFive/section8.vue

 src/books/lifeCare/view/ChapterFive/section9.vue

 src/books/lifeCare/view/ChapterFour/index.vue

 src/books/lifeCare/view/ChapterFour/section1.vue

 src/books/lifeCare/view/ChapterFour/section10.vue

 src/books/lifeCare/view/ChapterFour/section11.vue

 src/books/lifeCare/view/ChapterFour/section12.vue

 src/books/lifeCare/view/ChapterFour/section13.vue

 src/books/lifeCare/view/ChapterFour/section14.vue

 src/books/lifeCare/view/ChapterFour/section15.vue

 src/books/lifeCare/view/ChapterFour/section16.vue

 src/books/lifeCare/view/ChapterFour/section2.vue

 src/books/lifeCare/view/ChapterFour/section3.vue

 src/books/lifeCare/view/ChapterFour/section4.vue

 src/books/lifeCare/view/ChapterFour/section5.vue

 src/books/lifeCare/view/ChapterFour/section6.vue

 src/books/lifeCare/view/ChapterFour/section7.vue

 src/books/lifeCare/view/ChapterFour/section8.vue

 src/books/lifeCare/view/ChapterFour/section9.vue

 src/books/lifeCare/view/ChapterOne/section1.vue

 src/books/lifeCare/view/ChapterOne/section2.vue

 src/books/lifeCare/view/ChapterOne/section3.vue

 src/books/lifeCare/view/ChapterOne/section4.vue

 src/books/lifeCare/view/ChapterOne/section5.vue

 src/books/lifeCare/view/ChapterOne/section6.vue

 src/books/lifeCare/view/ChapterOne/section7.vue

 src/books/lifeCare/view/ChapterOne/section8.vue

 src/books/lifeCare/view/ChapterOne/section9.vue

 src/books/lifeCare/view/ChapterThree/index.vue

 src/books/lifeCare/view/ChapterThree/section1.vue

 src/books/lifeCare/view/ChapterThree/section10.vue

 src/books/lifeCare/view/ChapterThree/section11.vue

 src/books/lifeCare/view/ChapterThree/section12.vue

 src/books/lifeCare/view/ChapterThree/section13.vue

 src/books/lifeCare/view/ChapterThree/section14.vue

 src/books/lifeCare/view/ChapterThree/section15.vue

 src/books/lifeCare/view/ChapterThree/section16.vue

 src/books/lifeCare/view/ChapterThree/section17.vue

 src/books/lifeCare/view/ChapterThree/section18.vue

 src/books/lifeCare/view/ChapterThree/section19.vue

 src/books/lifeCare/view/ChapterThree/section2.vue

 src/books/lifeCare/view/ChapterThree/section20.vue

 src/books/lifeCare/view/ChapterThree/section21.vue

 src/books/lifeCare/view/ChapterThree/section22.vue

 src/books/lifeCare/view/ChapterThree/section23.vue

 src/books/lifeCare/view/ChapterThree/section24.vue

 src/books/lifeCare/view/ChapterThree/section25.vue

 src/books/lifeCare/view/ChapterThree/section3.vue

 src/books/lifeCare/view/ChapterThree/section4.vue

 src/books/lifeCare/view/ChapterThree/section5.vue

 src/books/lifeCare/view/ChapterThree/section6.vue

 src/books/lifeCare/view/ChapterThree/section7.vue

 src/books/lifeCare/view/ChapterThree/section8.vue

 src/books/lifeCare/view/ChapterThree/section9.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-1.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-10.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-11.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-12.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-13.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-2.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-3.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-4.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-5.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-6.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-7.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-8.vue

 src/books/lifeCare/view/ChapterTwo/chapter003-9.vue

 src/books/lifeCare/view/ChapterTwo/chapter003.vue

 src/books/lifeCare/view/ChapterTwo/index.vue

 src/books/lifeCare/view/Cover.jpg

 src/books/lifeCare/view/back001.vue

 src/books/lifeCare/view/chapter001.vue

 src/books/lifeCare/view/chapter002.vue

 src/books/lifeCare/view/chapter003.vue

 src/books/lifeCare/view/chapter004.vue

 src/books/lifeCare/view/chapter005.vue

 src/books/lifeCare/view/chapter006.vue

 src/books/lifeCare/view/chapter007.vue

 src/books/lifeCare/view/chapter008.vue

 src/books/lifeCare/view/chapter009.vue

 src/books/lifeCare/view/chapter010.vue

 src/books/lifeCare/view/chapter011.vue

 src/books/lifeCare/view/chapter012.vue

 src/books/lifeCare/view/chapter013.vue

 src/books/lifeCare/view/chapter014.vue

 src/books/lifeCare/view/chapter015.vue

 src/books/lifeCare/view/chapter016.vue

 src/books/lifeCare/view/chapter017.vue

 src/books/lifeCare/view/chapter018.vue

 src/books/lifeCare/view/chapter019.vue

 src/books/lifeCare/view/content.opf

 src/books/lifeCare/view/coverpage.vue

 src/books/lifeCare/view/front001.vue

 src/books/lifeCare/view/front002.vue

 src/books/lifeCare/view/front003.vue

 src/books/lifeCare/view/front004.vue

 src/books/lifeCare/view/front005.vue

 src/books/lifeCare/view/front006.vue

 src/books/lifeCare/view/preface/index.vue

 src/books/lifeCare/view/preface/section1.vue

 src/books/lifeCare/view/preface/section2.vue

 src/books/lifeCare/view/preface/section3.vue

 src/books/lifeCare/view/preface/section4.vue

 src/books/lifeCare/view/preface/section5.vue

 src/books/lifeCare/view/preface/section6.vue

 src/books/lifeCare/view/test.vue

 src/books/lifeCare/view/toc.ncx

 src/main.js

@@ -10,7 +10,7 @@
// 自定义配置
import config from "@/assets/js/config";
Vue.prototype.config = config;
Vue.prototype.thisBookConfig = await config.getBookConfig();
// Vue.prototype.thisBookConfig = await config.getBookConfig();

// 请求处理
import MG from "@/assets/js/middleGround/WebMiddleGroundApi";