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

unknown

2024-05-31 0c8ced0e151a668266c52cbd3e012d4227e6ab0d

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

 src/assets/js/config.js

@@ -11,7 +11,8 @@
};
export const appId = 3;
export const requestTimeOut = 300000; // 请求超时时间
export const tokenKey = "jsek-token";
// export const tokenKey = "jsek-token";
export const tokenKey = "token"

const config = {
  resourceCtx,

 src/books/English/assets/main.less

@@ -651,7 +651,7 @@
  // 自定义内容
  .page-box {
    box-sizing: border-box;
    min-height: 1150px !important;
    min-height: 1128px !important;
    margin-bottom: 20px;
    box-shadow: 0 3px 6px 1px #00000029;
    background-color: #fff;
@@ -709,12 +709,16 @@
  .m0 {
    margin: 0 !important;
  }

  .mb-0 {
    margin-bottom: 0;
  }
  .mb-20 {
    margin-bottom: 20px;
  }
  .mt-20 {
    margin-top: 20px;
  }
  .mt-40 {
    margin-top: 40px;
  }

 src/books/English/view/components/header.vue

@@ -1,19 +1,15 @@
<template>
  <div class="chapter" num="1">
    <!--  -->
    <div class="page-box" page="1">
    <div class="page-box mt-20" page="1">
      <div v-if="showPageList.indexOf(1) > -1">
        <p class="center">
          <img class="img-0" alt="" src="../../assets/images/Cover.jpg" />
        </p>
      </div>
    </div>
    <!-- 1 -->
    <div class="page-box" page="2">
      <div v-if="showPageList.indexOf(2) > -1">
        <p class="center">
          <img class="img-0" alt="" src="../../assets/images/SMY.jpg" />
        </p>
      </div>
    </div>
    <!-- 2 -->

 src/books/artAndDance/assets/images/chapter-one-header.png

 src/books/artAndDance/assets/images/icon/boy.jpg

 src/books/artAndDance/assets/images/icon/tree.jpg

 src/books/artAndDance/assets/images/pageContentHeader.jpg

 src/books/artAndDance/assets/main.less

@@ -169,10 +169,11 @@
    font-family: "STKaiti";
    color: #ef495d;
    font-weight: bold;
    font-size: 1.15em;
    // font-size: 1.15em;
    font-size: 26px;
    margin-top: 2em;
    text-align: center;
    margin-bottom: 2em;
    margin-bottom: 20px;
    text-indent: 0em;
  }

@@ -290,9 +291,11 @@
  }
  .block2 {
    font-family: "STKaiti";
    font-size: 1.15em;
    // font-size: 1.15em;
    font-size: 26px;
    text-align: center;
    text-indent: 0em;
    margin: 6px 0;
  }

  .bj1 {
@@ -350,7 +353,73 @@
  .ju-bt {
    justify-content: space-between;
  }
  .ju-end {
    justify-content: flex-end;
  }
  .al-cn {
    align-items: center;
  }
  .wh-nr {
    white-space: nowrap;
  }
  .w100 {
    width: 100%;
  }
  .m0 {
    margin: 0;
  }
  .mb-20 {
    margin-bottom: 20px;
  }
  .mb-40 {
    margin-bottom: 40px;
  }
  .ml-40 {
    margin-left: 40px;
  }
  .mr-40 {
    margin-right: 40px;
  }
  .pg-mh {
    min-height: 1150px;
  }
  .dl-ib {
    display: inline-block;
  }
  .w-min {
    width: min-content;
  }
  .w40 {
    width: 40px;
  }
}

/* 媒体查询做基础响应式布局 */
@media (max-width: 660px) {
  .ans-dance {
    /* 分页padding */
    .page-padding {
      padding: 104px 20px;
    }
    .padding-96 {
      padding: 0 20px;
    }
    /* video大小 */
    .video-box {
      max-width: 260px;
    }
  }
}
@media (min-width: 660px) {
  .ans-dance {
    .page-padding {
      padding: 104px 96px;
    }
    .padding-96 {
      padding: 0 96px;
    }
    .video-box {
      max-width: 370px;
    }
  }
}

 src/books/artAndDance/view/components/chapter001.vue

@@ -0,0 +1,173 @@
<template>
  <div class="chapter" num="1">
    <div class="page-box" page="4">
      <div v-if="showPageList.indexOf(4) > -1">
        <img class="img-0" alt="" src="../../assets/images/dy1.jpg" />
      </div>
    </div>
    <div class="page-box" page="5">
      <div v-if="showPageList.indexOf(5) > -1" class="pg-mh fl fl-cl ju-bt">
        <img
          src="../../assets/images/pageContentHeader.jpg"
          alt=""
          class="w100 mb-40"
        />
        <div class="padding-96">
          <p class="center">
            <img class="img-a" alt="" src="../../assets/images/image6-1.jpg" />
          </p>
          <h2 class="lefth2" id="b001">
            <img class="img-gn" alt="" src="../../assets/images/rhybx.jpg" />
          </h2>
          <h3 id="c001" class="fw-400 fz-26 mb-20">元素</h3>
          <p class="block2 fw-400 fz-26">单手挥别</p>
          <p class="block1 w70"><span class="ls fz-26">——单晃手</span></p>
          <p class="block2 fz-26">双手挥别</p>
          <p class="block1 w70"><span class="ls fz-26">——双晃手</span></p>
          <p class="block2 fz-26">配合步伐</p>
          <p class="block1 w70"><span class="ls fz-26">——上步晃手</span></p>
        </div>
        <ul>
          <li class="ml-40">
            <img src="../../assets/images/icon/tree.jpg" />
            <span class="dl-ib"> 2 </span>
          </li>
          <li>
            <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
          </li>
        </ul>
      </div>
    </div>
    <div class="page-box" page="6">
      <div v-if="showPageList.indexOf(6) > -1">
        <div>
          <img src="../../assets/images/chapter-one-header.png" class="w100" />
        </div>
        <div class="padding-96">
          <h3 id="c002">空间与方向</h3>
          <p class="block2">高、中空间</p>
          <p class="block2">1、2、4、8点方向</p>
          <h2 class="lefth2" id="b002">
            <img class="img-gn" alt="" src="../../assets/images/xsyty.jpg" />
          </h2>
          <video
            :src="videoPathOne"
            webkit-playsinline="true"
            x-webkit-airplay="true"
            playsinline="true"
            x5-video-orientation="h5"
            x5-video-player-fullscreen="true"
            x5-playsinline=""
            controls
            class="w100"
          ></video>
          <h3 id="c003">黄鹤楼送孟浩然之广陵</h3>
          <p class="block2">〔唐〕李白</p>
          <p class="block2">故人西辞黄鹤楼，</p>
          <p class="block2">烟花三月下扬州。</p>
          <p class="block2">孤帆远影碧空尽，</p>
          <p class="block2">唯见长江天际流。</p>
          <p class="center">
            <img class="img-g" alt="" src="image/i0007-1.jpg" />
          </p>
          <h2 class="lefth2" id="b003">
            <img class="img-gn" alt="" src="image/czysj.jpg" />
          </h2>
        </div>
        <ul>
          <li class="fl ju-end mr-40">
            <div>
              <span class="dl-ib"> 3 </span>
              <img src="../../assets/images/icon/tree.jpg" />
            </div>
          </li>
          <li>
            <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
          </li>
        </ul>
      </div>
    </div>
    <div class="page-box" page="7">
      <div v-if="showPageList.indexOf(5) > -1" class="fl fl-cl ju-bt">
        <img
          src="../../assets/images/pageContentHeader.jpg"
          alt=""
          class="w100 mb-40"
        />
        <div class="padding-96">
          <div class="bj1">
            <p class="block">
              <img
                class="inline"
                alt=""
                src="../../assets/images/dn.png"
              />运用所学舞蹈元素，设立两个与好友告别的场景。
            </p>
            <p class="block">
              <img
                class="inline"
                alt=""
                src="../../assets/images/dn.png"
              />学生自愿分组，每组自行设置与送别相关的主题，在教师的引导下进行创编，并富有情感地展示出来。
            </p>
          </div>
          <h2 class="lefth2" id="b004">
            <img class="img-gn1" alt="" src="../../assets/images/tz.jpg" />
          </h2>
          <div class="bj2">
            <p class="block">
              充分理解古诗表达的情感，根据已学舞蹈元素，创编带有送别意味的单一舞蹈动作或造型吧。
            </p>
          </div>
          <p class="center"><img class="img-0" alt="" src="image/ym.jpg" /></p>
        </div>
        <ul>
          <li class="ml-40">
            <img src="../../assets/images/icon/tree.jpg" />
            <span class="dl-ib"> 2 </span>
          </li>
          <li>
            <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
          </li>
        </ul>
      </div>
    </div>
  </div>
</template>

<script>
import getResourcePath from "@/assets/methods/resources";
export default {
  name: "chapterOne",
  props: {
    showPageList: {
      type: Array,
    },
  },
  mounted() {
    this.getVidoePath();
  },
  data() {
    return {
      videoPathOne: "",
    };
  },
  methods: {
    getVidoePath() {
      this.videoPathOne = getResourcePath("db8040667457cc6fc9b0209009acb316");
    },
  },
};
</script>

<style lang="less" scoped>
.w70 {
  width: 78%;
}
.fw-400 {
  font-weight: 400 !important;
}
.fz-26 {
  font-size: 26px !important;
}
</style>

 src/books/artAndDance/view/components/header.vue

@@ -1,70 +1,59 @@
<template>
  <div class="chapter" num="1">
    <div class="page-box" page="1">
      <div class="bodystyle">
        <p class="center">
          <img class="img-0" alt="" src="../../assets/images/Cover.jpg" />
        </p>
      </div>
      <div v-if="showPageList.indexOf(1) > -1"></div>
      <img class="img-0" alt="" src="../../assets/images/Cover.jpg" />
    </div>
    <div class="page-box" page="2">
      <div class="bodystyle">
        <p class="center">
          <img class="img-0" alt="" src="../../assets/images/SMY.jpg" />
        </p>
      <div v-if="showPageList.indexOf(2) > -1">
        <img class="img-0" alt="" src="../../assets/images/SMY.jpg" />
      </div>
    </div>
    <div class="page-box" page="3">
      <ul class="fl fl-cl ju-bt" style="min-height: 1150px;">
        <li>
          <img src="../../assets/images/pageHeader.png" alt="">
        </li>
        <li>
          <div class="bodystyle">
            <h1 id="a003" class="front">编委会</h1>
            <hr />
            <p>顾　　问：<span class="kaiti">彭吉象　吕艺生</span></p>
            <p>主　　编：<span class="kaiti">王杰</span></p>
            <p>副 主 编：<span class="kaiti">于晓雪　徐梦婕</span></p>
            <ul class="fl">
              <li>
                <p class="wh-nr">编写委员：</p>
              </li>
              <li class="fl fl-cl">
                <span class="kaiti">邢高熙　王　玲　王　锦　崔春杰</span>
                <span class="kaiti">李紫薇　刘辰曦　晁　莹　戴刘香依</span>
                <span class="kaiti">柯　咏　张艺瑶　尚小雪　周　狄</span>
              </li>
            </ul>
            <p>美术绘画：<span class="kaiti">张家荣</span></p>
            <p>主讲教师：<span class="kaiti">张悦　　高晓梅</span></p>
            <ul class="fl">
              <li>
                <p class="wh-nr">表 演 者：</p>
              </li>
              <li class="fl fl-cl">
                <span class="kaiti"
                >董恩汐　姚星朵　周清竹　朱婉漠</span
              >
              <span class="kaiti"
                >戴嘉墨　高子淇　舒博瑞　曹恩淇</span
              >
              <span class="kaiti">刘子璐　郑清妍</span>
              </li>
            </ul>
            <p>
              
      <div v-if="showPageList.indexOf(2) > -1">
        <ul class="fl fl-cl ju-bt" style="min-height: 1150px">
          <li>
            <img src="../../assets/images/pageHeader.png" alt="" class="w100" />
          </li>
          <li>
            <div class="bodystyle">
              <h1 id="a003" class="front">编委会</h1>
              <hr />
              <p>顾　　问：<span class="kaiti">彭吉象　吕艺生</span></p>
              <p>主　　编：<span class="kaiti">王杰</span></p>
              <p>副 主 编：<span class="kaiti">于晓雪　徐梦婕</span></p>
              <ul class="fl">
                <li>
                  <p class="wh-nr">编写委员：</p>
                </li>
                <li class="fl fl-cl">
                  <span class="kaiti">邢高熙　王　玲　王　锦　崔春杰</span>
                  <span class="kaiti">李紫薇　刘辰曦　晁　莹　戴刘香依</span>
                  <span class="kaiti">柯　咏　张艺瑶　尚小雪　周　狄</span>
                </li>
              </ul>
              <p>美术绘画：<span class="kaiti">张家荣</span></p>
              <p>主讲教师：<span class="kaiti">张悦　　高晓梅</span></p>
              <ul class="fl">
                <li>
                  <p class="wh-nr">表 演 者：</p>
                </li>
                <li class="fl fl-cl">
                  <span class="kaiti">董恩汐　姚星朵　周清竹　朱婉漠</span>
                  <span class="kaiti">戴嘉墨　高子淇　舒博瑞　曹恩淇</span>
                  <span class="kaiti">刘子璐　郑清妍</span>
                </li>
              </ul>
              <p></p>
              <p>　　　　　</p>
              <p>　　　　　</p>
            </div>
            <p class="center">
              <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
            </p>
            <p>
              　　　　　
            </p>
            <p>　　　　　</p>
          </div>
          <p class="center">
            <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
          </p>
        </li>
      </ul>
          </li>
        </ul>
      </div>
    </div>
  </div>
</template>
@@ -72,6 +61,11 @@
<script>
export default {
  name: "pageHeader",
  props: {
    showPageList: {
      type: Array,
    },
  },
};
</script>


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

@@ -184,7 +184,15 @@
        // 删除笔记、高亮、划线
        delSign: (data) => {
          this.delSign(data);
        }
        },
        // 全文检索
        searchBookByKeyword: (keyword) => {
          return this.searchTextByPage(keyword);
        },
        // 跳转检索结果位置
        jumpSearchItem: (data) => {
          this.searchItemLocation(data);
        },
      });
    }

@@ -333,6 +341,10 @@

    // 渲染标记
    renderSign(type, data) {
      // 父层设置禁止渲染标记时不再进行渲染
      if (this.$store.state.qiankun.disableSign) {
        return false;
      }
      const existence = (
        this.container ? this.container : document
      ).querySelector(`[dataid="${data.id}"]`);

 src/books/embedded/assets/main.less

@@ -601,7 +601,7 @@
  // 自定义内容
  .page-box {
    box-sizing: border-box;
    min-height: 1150px !important;
    min-height: 1092px !important;
    margin-bottom: 20px;
    box-shadow: 0 3px 6px 1px #00000029;
    background-color: #fff;