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

user1

2024-06-19 558de7a1274017280509a14866c8b6d1d46286a2

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

 .env.product

@@ -1,6 +1,6 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/childHealth'
VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
VUE_APP_BOOK_ID = 'childHealth'
VUE_APP_BOOK_ID = 'mathBook'

 src/App.vue

@@ -65,7 +65,7 @@
        process.env.VUE_APP_RESOURCE_CTX +
          (process.env.VUE_APP_ENV == "product"
            ? process.env.VUE_APP_BOOK_ID
            : "artAndDrama")
            : "english")
      );
      // 测试试读30页
      // this.activeBook.tryPageCount = 10;

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

@@ -527,7 +527,7 @@
                <li>Speakers　Chinese Cultural Symbols</li>
                <li style="width: 40%; text-align: center">Descriptions</li>
              </ul>
              <matching :rawData="rawData" :item="question"></matching>
              <matching :rawData="rawData" :question="question"></matching>
            </div>
            <h3 id="c003" class="fl al-cn">
              <span class="bjh3">Reading</span>
@@ -826,15 +826,19 @@
            </p>
            <div class="bkbj">
              <p>
                <i>making you feel more active and healthy</i> foodie /ˈfuːdi/
                <i>n.</i> 吃货；美食家
                <i>making you feel more active and healthy</i> 
              </p>
            </div>
            <p>
              <i
            <p>foodie /ˈfuːdi/<i>n.</i> 吃货；美食家</p>
            <div class="bkbj">
              <p>
                <i
                >a person who is very interested in cooking and eating different
                kinds of food</i
              >
              </p>
            </div>
            <p>
              unique /ju<i>ˈ</i>niːk/ <i>adj.</i> 唯一的；独一无二的
            </p>
            <div class="bkbj">
@@ -2564,7 +2568,7 @@
        "online shopping",
        "facial recognition",
        "electronic payment",
        "intercity  train",
        "intercity train",
        "shared bike",
        "take-away service",
      ],
@@ -2735,6 +2739,7 @@
          item.value == item.answer
            ? (item.isRight = true)
            : (item.isRight = false);
            console.log(item.value,item.answer);
        }
      }
      this.dropdownData = dropdownDatas;

 src/books/artAndDance/assets/images/01-2.gif

 src/books/artAndDance/assets/images/06.gif

 src/books/artAndDance/assets/images/07.gif

 src/books/artAndDance/assets/images/08.gif

 src/books/artAndDance/assets/main.less

@@ -476,4 +476,27 @@
      }
    }
  }
}
}


::-webkit-scrollbar {
  width: 8px;
  height: 10px;
}

::-webkit-scrollbar-track-piece {
  background-color: rgba(0, 0, 0, 0.1);
  -webkit-border-radius: 6px;
}

::-webkit-scrollbar-thumb:vertical {
  height: 5px;
  background-color: rgba(125, 125, 125, 0.3);
  -webkit-border-radius: 6px;
}

::-webkit-scrollbar-thumb:horizontal {
  width: 5px;
  background-color: rgba(125, 125, 125, 0.3);
  -webkit-border-radius: 6px;
}

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

@@ -3,7 +3,7 @@
    <div class="page-box" page="12">
      <div v-if="showPageList.indexOf(12) > -1">
        <img class="img-0" alt="" src="../../assets/images/dy3.jpg" />
        <img src="../../assets/images/07.gif" alt="" style="width: 56%;" class="cover-gif">
        <img src="../../assets/images/07.gif" alt="" style="width: 54%;" class="cover-gif">
      </div>
    </div>
    <div class="page-box" page="13">

 src/books/lifeCare/css/default.less

@@ -1906,10 +1906,10 @@

      @media screen and (max-width: 800px) {
        .coverImg {
            img {
              height: 100%;
            }
          img {
            height: 100%;
          }
        }


        .chapter {
@@ -1922,7 +1922,7 @@
            width: 100% !important;
            position: absolute;
            left: 0%;
            top: 4%;
            top: 3%;
          }

          .pdf-content {
@@ -2036,6 +2036,10 @@
          .page-box {
            min-height: 800px !important;
          }

          .table111 tr th ,.table112 tr th {
            padding: 8px 0;
          }
        }
      }


 src/books/lifeCare/view/components/front001.vue

@@ -127,7 +127,7 @@
          <div class="pageHeader-first">
            <div class="header-bj"></div>
            <div class="content">
              <div class="pageStr">&nbsp;&nbsp;&nbsp;&nbsp;</div>
              <div class="pageStr">&nbsp;&nbsp;</div>
              <div class="title">
                <img src="../../image/chapter.png" alt="" />
                <span class="cahpter">婴幼儿生活照护·行动手册</span>
@@ -194,7 +194,7 @@
          <div class="pageHeader-first">
            <div class="header-bj"></div>
            <div class="content">
              <div class="pageStr">&nbsp;&nbsp;&nbsp;&nbsp;</div>
              <div class="pageStr">&nbsp;&nbsp;</div>
              <div class="title">
                <img src="../../image/chapter.png" alt="" />
                <span class="cahpter">婴幼儿生活照护·行动手册</span>

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

@@ -727,23 +727,23 @@
          autoplay: {
            //自动开始
            delay: 3000, //时间间隔
            disableOnInteraction: false, //*手动操作轮播图后不会暂停*
            disableOnInteraction: false //*手动操作轮播图后不会暂停*
          },
          paginationClickable: true,
          slidesPerView: 1, // 一组三个
          spaceBetween: 30, // 间隔
          // 如果需要前进后退按钮
          navigation: {
            nextEl: (this.container ? this.container : document).querySelector(
            nextEl: dom.querySelector(
              ".swiper-button-next"
            ),
            prevEl: (this.container ? this.container : document).querySelector(
            prevEl: dom.querySelector(
              ".swiper-button-prev"
            ),
            )
          },
          // 窗口变化,重新init,针对F11全屏和放大缩小,必须加
          observer: true,
          observeParents: true,
          observeParents: true
          // // 如果需要分页器
          // pagination: {
          //   el: (this.container ? this.container : document).querySelector(
@@ -766,12 +766,12 @@
          spaceBetween: 30, // 间隔
          // 如果需要前进后退按钮
          navigation: {
            nextEl: (this.container ? this.container : document).querySelector(
            nextEl: dom.querySelector(
              ".swiper-button-next"
            ),
            prevEl: (this.container ? this.container : document).querySelector(
            prevEl: dom.querySelector(
              ".swiper-button-prev"
            ),
            )
          },
          // 窗口变化,重新init,针对F11全屏和放大缩小,必须加
          observer: true,
@@ -790,8 +790,8 @@
              var paginationInfoEl = dom.querySelector(".pageBox");
              if (paginationInfoEl)
                paginationInfoEl.textContent = currentPage + "/" + totalPages;
            },
          },
            }
          }
        });
      }
    },

 src/books/mathBook/assets/main.less

@@ -841,3 +841,26 @@
    }
  }
}


::-webkit-scrollbar {
  width: 8px;
  height: 10px;
}

::-webkit-scrollbar-track-piece {
  background-color: rgba(0, 0, 0, 0.1);
  -webkit-border-radius: 6px;
}

::-webkit-scrollbar-thumb:vertical {
  height: 5px;
  background-color: rgba(125, 125, 125, 0.3);
  -webkit-border-radius: 6px;
}

::-webkit-scrollbar-thumb:horizontal {
  width: 5px;
  background-color: rgba(125, 125, 125, 0.3);
  -webkit-border-radius: 6px;
}

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

@@ -565,6 +565,7 @@
          <div class="bj">
            <examinations
              :cardList="questionData"
              :hideCollect="true"
              inputBc="#d3edfa"
              v-if="questionData"
              :isReal="false"
@@ -576,11 +577,37 @@

    <!-- 函数控件弹窗 -->
    <el-dialog
      title=""
      :visible.sync="dialogVisible"
      width="60%"
      :append-to-body="true"
      :show-close="false"
    >
    <div slot="title" style="padding: 0 0 15px 0;position: relative;">
        <svg
          style="position: absolute; right:10px;cursor: pointer;"
          @click="dialogVisible = false"
          t="1718596022986"
          class="icon"
          viewBox="0 0 1024 1024"
          version="1.1"
          xmlns="http://www.w3.org/2000/svg"
          p-id="4252"
          width="20"
          height="20"
          xmlns:xlink="http://www.w3.org/1999/xlink"
        >
          <path
            d="M176.661601 817.172881C168.472798 825.644055 168.701706 839.149636 177.172881 847.338438 185.644056 855.527241 199.149636 855.298332 207.338438 846.827157L826.005105 206.827157C834.193907 198.355983 833.964998 184.850403 825.493824 176.661601 817.02265 168.472798 803.517069 168.701706 795.328267 177.172881L176.661601 817.172881Z"
            fill="#979797"
            p-id="4253"
          ></path>
          <path
            d="M795.328267 846.827157C803.517069 855.298332 817.02265 855.527241 825.493824 847.338438 833.964998 839.149636 834.193907 825.644055 826.005105 817.172881L207.338438 177.172881C199.149636 168.701706 185.644056 168.472798 177.172881 176.661601 168.701706 184.850403 168.472798 198.355983 176.661601 206.827157L795.328267 846.827157Z"
            fill="#979797"
            p-id="4254"
          ></path>
        </svg>
      </div>
      <iframe
        src="https://www.geogebra.org/calculator"
        frameborder="0"

 src/books/sportsAndHealth/css/default.less

@@ -44,25 +44,29 @@
          box-sizing: border-box;
        }

        .bodystyle-chapter001 {
        .gif-Con {
          max-width: 200px;
        }

        .bodystyle-chapter {
          display: flex;
          justify-content: space-between;
          align-items: center;
          width: 100%;
          position: relative;

          .bj-chapter001-bj-icon {
          .bj-chapter-bj-icon {
            width: 100%;
            padding-top: 15px;
          }

          .bj-chapter001-con {
          .bj-chapter-con {
            width: 60%;
            position: absolute;
            left: 0;
            top: 5%;

            .bj-chapter001-con-icon {
            .bj-chapter-con-icon {
              width: 100%;

              img {
@@ -70,6 +74,74 @@
                width: 100%;
              }
            }
          }
        }

        .header-odd {
          width: 100%;
          height: 100px;
          display: flex;
          justify-content: flex-end;
          align-items: flex-end;

          span {
            margin-right: 28px;
            font-family: 'FZLTXIHJW';
            font-size: 18px;
          }
          span:nth-child(3) {
            margin-right: 0;
          }

          .mk {
            color: #f39938;
            font-weight: 700;
          }

          .sub {
            color: #808285;
            font-weight: 600;
          }

          .sub-title {
            color: #a8a9ad;
          }

          .sub-page {
            color: #a8a9ad;
          }
        }

        .line-page {
          width: 1px;
          height: 100%;
          border-left: 2px dotted #eee;
          margin:0 14px;
        }

        .header-even {
          width: 100%;
          height: 100px;
          display: flex;
          justify-content: flex-start;
          align-items: flex-end;
          span {
            margin-left: 28px;
            font-family: 'FZLTXIHJW';
            font-size: 18px;
          }

          .sub-page {
            color: #a8a9ad;
          }

          .book-title {
            color: #f39938;
            font-weight: 700;
          }

          span:nth-child(3){
            margin-left: 0;
          }
        }

@@ -274,6 +346,10 @@
          }
        }

        .textHeader {
          min-height: 1150px;
        }

        .bj-img {
          position: absolute;
          left: 0;
@@ -286,18 +362,20 @@
          background-repeat: no-repeat;
          display: flex;
          justify-content: flex-start;
        }

          .bj-empyt-chapter01 {
            width: 40%;
            height: 100%;
          }
        .bj-empyt-chapter {
          width: 40%;
          height: 100%;
          margin-right: 5%;
        }

          .bj-text01 {
            width: 60%;
            height: 50%;
            padding-top: 60%;
            padding-right: 10%;
          }
        .bj-text {
          padding-top: 60%;
          padding-right: 10%;
          float: right;
          height: auto;
          width: 100%;
        }

        .bj-img02 {
@@ -312,18 +390,6 @@
          background-repeat: no-repeat;
          display: flex;
          justify-content: flex-start;

          .bj-empyt-chapter02 {
            width: 40%;
            height: 100%;
          }

          .bj-text02 {
            width: 60%;
            height: 50%;
            padding-top: 60%;
            padding-right: 10%;
          }
        }

        .bj-img03 {
@@ -338,18 +404,6 @@
          background-repeat: no-repeat;
          display: flex;
          justify-content: flex-start;

          .bj-empyt-chapter03 {
            width: 40%;
            height: 100%;
          }

          .bj-text03 {
            width: 60%;
            height: 50%;
            padding-top: 50%;
            padding-right: 10%;
          }
        }

        .bj-byb {
@@ -746,7 +800,7 @@
          font-family: "宋体";
          font-size: 18px;
          text-align: justify;
          padding: 10% 10%;
          padding: 6% 10% 10% 10%;
          box-sizing: border-box;
          line-height: 30px;
        }
@@ -1683,22 +1737,19 @@
            .pdf-wall {
              max-width: 180px;
              position: relative;
              left: 30px;
              top: 25px;
              border: 2px dotted #5d78bb;
              display: flex;
              flex-direction: column;
              justify-content: flex-start;
              align-items: flex-start;
              border: 2px dotted #5d78bb;
              padding: 10px;
              box-sizing: border-box;
              border-radius: 10px;
              top: 0 !important;

              .pdf-item {
                display: flex;
                flex-direction: column;
                justify-content: flex-start;
                justify-content: center;
                align-items: center;

                img {
@@ -1706,7 +1757,6 @@
                }

                span {
                  min-width: 150px;
                  font-size: 14px;
                  text-align: center;
                  font-family: 'FZLTXIHJW';
@@ -1736,15 +1786,52 @@
            justify-content: center;
            flex-wrap: wrap;
          }


          .bj-img {
            display: flex;
            flex-direction: column;
            justify-content: flex-start;
            background-size: 100% 50%;
          }

          .bj-img02 {
            display: flex;
            flex-direction: column;
            justify-content: flex-start;
            background-size: 100% 50%;
          }

          .bj-img02 {
            display: flex;
            flex-direction: column;
            justify-content: flex-start;
            background-size: 100% 50%;
          }

          .bj-empyt-chapter {
            height: 50%;
          }

          .bj-text {
            width: 100%;
            padding-top: 0%;
            padding: 0 10%;
            box-sizing: border-box;
          }

          .tablePublic table tr th{
            padding: 0;
            width: auto !important;
          }

          div.bk-xyx {
            padding: 2.5em 1.2em;
          }
        }
      }

      @media screen and (max-width:700px) {
        // .coverImg {
        //   img {
        //     height: 100%;
        //   }
        // }

        .chapter {

@@ -1755,6 +1842,20 @@
          .page-box {
            min-height: 800px !important;
          }

          .img-float {
            width: 130px;
          }

          .bodystyle-chapter {
            flex-direction: column;

            .bj-chapter-con {
              width: auto;
              position: relative;
            }
          }

        }
      }

@@ -1769,6 +1870,60 @@
          .page-box {
            min-height: 500px !important;
            margin-bottom: 20px;
          }

          .bj-img {
            display: flex;
            flex-direction: column;
            justify-content: flex-start;
            background-size: 100% 30%;
          }

          .bj-img02 {
            display: flex;
            flex-direction: column;
            justify-content: flex-start;
            background-size: 100% 30%;
          }

          .bj-img03 {
            display: flex;
            flex-direction: column;
            justify-content: flex-start;
            background-size: 100% 20%;

            .bj-text {
              width: 100%;
              padding-top: 0%;
              padding: 35% 10% 0 10% !important;
              box-sizing: border-box;

              p {
                line-height: 28px;
              }
            }
          }

          .pdf-text {
            .pdf-con {
              flex-direction: column;

              .pdf-view {
                margin-bottom: 10px;
              }
            }
          }


          .bj-empyt-chapter {
            height: 30%;
          }

          .bj-text {
            width: 100%;
            padding-top: 0%;
            padding: 0 10%;
            box-sizing: border-box;
          }
        }
      }
@@ -1796,6 +1951,8 @@


.custom-dialog {
  overflow: hidden !important;

  .el-dialog__body {
    padding: 0;
  }

 src/books/sportsAndHealth/image/li-tip.png

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

@@ -3,13 +3,13 @@
    <div class="page-box" page="12">
      <div v-if="showPageList.indexOf(12) > -1">
        <div class="bodystyle">
          <div class="bodystyle-chapter001">
            <div class="bj-chapter001-bj-icon">
          <div class="bodystyle-chapter">
            <div class="bj-chapter-bj-icon">
              <h1 class="lefth1" id="a007">
                <img class="img-gh1" alt="" src="../../image/jcmk.png" />
              </h1>
            </div>
            <div class="bj-chapter001-con">
            <div class="bj-chapter-con">
              <div>
                <p>
                  基础模块是《中等职业学校体育与健康课程标准》规定的必修内容，包含健康教育和体能发展两大部分。人民健康是民族昌盛和国家强盛的重要标志；把保障人民健康放在优先发展的战略位置。健康教育纳入国民教育体系，是教育阶段素质教育的重要内容，也是培养德智体美劳全面发展的社会主义建设者和接班人的必要保障。良好的体能不仅能够为日常生活中的运动奠定坚实的基础，而且能为专项运动中精准而灵活地发挥技能水平提供保障，更能为我们在职业岗位上展现高超技艺提供助力。
@@ -18,7 +18,7 @@
                  系统学习“健康教育”和“体能发展”两个单元的内容，能够帮助同学们更好地将健康掌握在自己手中，提升体能发展水平，练就强健体魄，使锻炼身体成为一种习惯和能力。
                </p>
              </div>
              <div class="bj-chapter001-con-icon">
              <div class="bj-chapter-con-icon">
                <img src="../../image/sports02.png" alt="" />
              </div>
            </div>
@@ -28,10 +28,10 @@
    </div>
    <div class="page-box" page="13">
      <div v-if="showPageList.indexOf(13) > -1">
        <div class="bodystyle">
        <div class="bodystyle textHeader">
          <div class="bj-img">
            <div class="bj-empyt-chapter01"></div>
            <div class="bj-text01">
            <div class="bj-empyt-chapter"></div>
            <div class="bj-text">
              <p>
                健康与诸多因素有关，不仅涉及身体，还涉及心理、社会适应等方面。健康是人们所追求的目标，高质量的生命离不开健康，幸福的人生也离不开健康。增进民生福祉、提高人民生活品质的重要举措在于推进健康中国建设。生命、健康和幸福三者的核心是健康。如何拥有健康，保持健康的状态？为此，同学们需要树立“健康第一”的理念；需要结合现阶段生理、心理等发展特点，以及运动的“双刃剑”特点，把握促进健康的规律；需要结合未来所从事职业的特点，形成预防各种职业病的能力；需要掌握紧急救护和安全避险的知识与技能，保护自身的生命安全；更要塑造体育精神，助力成就人生的梦想，力求为祖国健康工作五十年，幸福生活一辈子。
              </p>
@@ -45,6 +45,13 @@
    </div>
    <div class="page-box" page="14">
      <div v-if="showPageList.indexOf(14) > -1">
        <div class="header-odd">
          <span class="mk">基础模块</span>
          <span class="sub">第一单元</span>
          <span class="sub-title">健康教育</span>
          <div class="line-page"></div>
          <span class="sub-page">003</span>
        </div>
        <div class="bodystyle">
          <h3 id="c001">专题一 树立“健康第一”的理念</h3>
          <div class="bk-ztgs">
@@ -483,6 +490,11 @@
    </div>
    <div class="page-box" page="15">
      <div v-if="showPageList.indexOf(15) > -1">
        <div class="header-even">
          <span class="sub-page">004</span>
          <div class="line-page"></div>
          <span class="book-title">体育与健康</span>
        </div>
        <div class="bodystyle">
          <div class="img-float openImgBox">
            <img class="img-c" alt="" src="../../image/0017-1.jpg" />
@@ -858,6 +870,13 @@
    </div>
    <div class="page-box" page="16">
      <div v-if="showPageList.indexOf(16) > -1">
        <div class="header-odd">
          <span class="mk">基础模块</span>
          <span class="sub">第一单元</span>
          <span class="sub-title">健康教育</span>
          <div class="line-page"></div>
          <span class="sub-page">005</span>
        </div>
        <div class="bodystyle">
          <p>
            （如各器官的功能状态、机体的免疫能力）等。生物遗传因素直接关系着我们的健康，对诸多疾病的发生、发展及分布具有重要影响。虽然遗传因素无法改变，但是心理因素具有可塑性。保持积极的心理状态是维持和增进健康的必要条件。
@@ -2283,6 +2302,11 @@
    </div>
    <div class="page-box" page="17">
      <div v-if="showPageList.indexOf(17) > -1">
        <div class="header-even">
          <span class="sub-page">006</span>
          <div class="line-page"></div>
          <span class="book-title">体育与健康</span>
        </div>
        <div class="bodystyle">
          <div class="bk-xspj">
            <p class="bj-sbx">学习评价</p>
@@ -2375,6 +2399,13 @@
    </div>
    <div class="page-box" page="18">
      <div v-if="showPageList.indexOf(18) > -1">
        <div class="header-odd">
          <span class="mk">基础模块</span>
          <span class="sub">第一单元</span>
          <span class="sub-title">健康教育</span>
          <div class="line-page"></div>
          <span class="sub-page">007</span>
        </div>
        <div class="bodystyle">
          <h4 id="d006">二、中职学生的健康生活方式</h4>
          <p>对同学们来说，健康生活方式具体表现在如下几个方面。</p>
@@ -2410,6 +2441,11 @@
    </div>
    <div class="page-box" page="19">
      <div v-if="showPageList.indexOf(19) > -1">
        <div class="header-even">
          <span class="sub-page">008</span>
          <div class="line-page"></div>
          <span class="book-title">体育与健康</span>
        </div>
        <div class="bodystyle">
          <p>
            类及合理数量、适宜的身体活动量及饮水量参考，并以膳食宝塔的形式直观展现，是我们日常饮食应遵守的基本准则（见图1-2-1）。
@@ -2658,6 +2694,13 @@
    </div>
    <div class="page-box" page="20">
      <div v-if="showPageList.indexOf(20) > -1">
        <div class="header-odd">
          <span class="mk">基础模块</span>
          <span class="sub">第一单元</span>
          <span class="sub-title">健康教育</span>
          <div class="line-page"></div>
          <span class="sub-page">009</span>
        </div>
        <div class="bodystyle">
          <h5 id="e009">（五）培养良好的兴趣爱好，远离和戒除陋习</h5>
          <p>
@@ -3111,6 +3154,11 @@
    </div>
    <div class="page-box" page="21">
      <div v-if="showPageList.indexOf(21) > -1">
        <div class="header-even">
          <span class="sub-page">010</span>
          <div class="line-page"></div>
          <span class="book-title">体育与健康</span>
        </div>
        <div class="bodystyle">
          <div class="bk-xspj">
            <p class="bj-sbx">学习评价</p>

 src/books/sportsAndHealth/view/components/front001.vue

@@ -194,7 +194,7 @@
          <p class="block">
            本教材严格依据《中等职业学校体育与健康课程标准》编写，共分为9个单元。为了让每个单元的专题或项目的学习形式更加丰富，切实落实立德树人、以体育人，本教材在遵从“学—练—赛—评”学习框架的前提下，增设了一些启发学生思考、引领学生练习、促进师生互动的小栏目。各栏目具体说明如下。
          </p>
          <p class="center">
          <p class="center openImgBox">
            <img class="img-0" alt="" src="../../image/0010-1.jpg" />
          </p>
          <p>

 src/books/sportsAndHealth/view/components/index.vue

@@ -724,23 +724,23 @@
          autoplay: {
            //自动开始
            delay: 3000, //时间间隔
            disableOnInteraction: false, //*手动操作轮播图后不会暂停*
            disableOnInteraction: false //*手动操作轮播图后不会暂停*
          },
          paginationClickable: true,
          slidesPerView: 1, // 一组三个
          spaceBetween: 30, // 间隔
          // 如果需要前进后退按钮
          navigation: {
            nextEl: (this.container ? this.container : document).querySelector(
            nextEl: dom.querySelector(
              ".swiper-button-next"
            ),
            prevEl: (this.container ? this.container : document).querySelector(
            prevEl: dom.querySelector(
              ".swiper-button-prev"
            ),
            )
          },
          // 窗口变化,重新init,针对F11全屏和放大缩小,必须加
          observer: true,
          observeParents: true,
          observeParents: true
          // // 如果需要分页器
          // pagination: {
          //   el: (this.container ? this.container : document).querySelector(
@@ -763,12 +763,12 @@
          spaceBetween: 30, // 间隔
          // 如果需要前进后退按钮
          navigation: {
            nextEl: (this.container ? this.container : document).querySelector(
            nextEl: dom.querySelector(
              ".swiper-button-next"
            ),
            prevEl: (this.container ? this.container : document).querySelector(
            prevEl: dom.querySelector(
              ".swiper-button-prev"
            ),
            )
          },
          // 窗口变化,重新init,针对F11全屏和放大缩小,必须加
          observer: true,
@@ -787,8 +787,8 @@
              var paginationInfoEl = dom.querySelector(".pageBox");
              if (paginationInfoEl)
                paginationInfoEl.textContent = currentPage + "/" + totalPages;
            },
          },
            }
          }
        });
      }
    },

 src/books/sportsAndHealth/view/components/testDynaicTable.vue

@@ -2,10 +2,10 @@
  <div class="chapter" num="2">
    <div class="page-box" page="22">
      <div v-if="showPageList.indexOf(22) > -1">
        <div class="bodystyle">
        <div class="bodystyle textHeader">
          <div class="bj-img02">
            <div class="bj-empyt-chapter02"></div>
            <div class="bj-text02">
            <div class="bj-empyt-chapter"></div>
            <div class="bj-text">
              <p>
                体能是促进健康、助力技能掌握与职业发展的基础。一般体能保障日常生活中同学们的基本活动，促进机体健康；专项体能为专项运动的学习提供保障；职业体能为相应职业发展发挥助推作用，从而提升职业发展水平。本单元聚焦一般体能和职业体能的学练，专项体能相关内容放在了拓展模块的各专项运动之中。体能锻炼要讲究科学的方法，要有系统性、针对性。不同的人有不一样的体能基础。体能一方面受遗传因素影响，另一方面要依靠后天锻炼。正处于青春期阶段的中职学生，需要科学精准地锻炼体能、强健体魄，为将来所从事的职业储备重要力量，为祖国的建设做出应有的贡献。
              </p>
@@ -40,10 +40,10 @@
            <table>
              <thead>
                <tr>
                  <th style="width: 70px">训练类型</th>
                  <th style="width: 70px">训练部位</th>
                  <th style="width: 70px">动作名称</th>
                  <th>动作示例</th>
                  <th>训练类型</th>
                  <th>训练部位</th>
                  <th>动作名称</th>
                  <th style="max-width: 200px;">动作示例</th>
                  <th>频次</th>
                </tr>
              </thead>
@@ -55,7 +55,7 @@
                <tr>
                  <td>站姿 T 字</td>
                  <td class="gif-Con openImgBox">
                    <img width="200px" src="../../image/gif/T-zi.gif" alt="" />
                    <img width="100%" src="../../image/gif/T-zi.gif" alt="" />
                  </td>
                  <td>
                    <span>次数：20 次 </span><br /><span>组数：2 组</span

 src/books/sportsAndHealth/view/components/testPp.vue

@@ -3,13 +3,13 @@
    <div class="page-box" page="24">
      <div v-if="showPageList.indexOf(24) > -1">
        <div class="bodystyle">
          <div class="bodystyle-chapter001">
            <div class="bj-chapter001-bj-icon">
          <div class="bodystyle-chapter">
            <div class="bj-chapter-bj-icon">
              <h1 class="lefth1" id="a007">
                <img class="img-gh1" alt="" src="../../image/kzmk.png" />
              </h1>
            </div>
            <div class="bj-chapter001-con">
            <div class="bj-chapter-con">
              <div>
                <p>
                  无论是为了终身参与体育锻炼，还是为了提升职业发展所需的运动能力，每个同学都需要学习并熟练掌握1～2项运动技能。《中等职业学校体育与健康课程标准》中的运动项目包含球类运动、田径类运动、体操类运动、武术与民族民间传统体育类运动、水上类运动、冰雪类运动、新兴体育类运动七大类。每一类运动都有其独特的价值和兴趣点，同学们可以从这些类型的运动中自主选择自己喜爱的、适宜的运动。同学们在具体选学某一项运动的时候，最好能够按照“想学、能学、学会”的标准来综合判定。“想学”是指对某项运动有兴趣，“能学”是指具备学练的条件，“学会”是一种结果追求。学练掌握1～2项运动技能，这能够真正地为终身体育及职业发展奠定基础。
@@ -18,7 +18,7 @@
                  希望同学们在满足兴趣爱好与运动需求的基础上，认真学练你们自主选择的拓展模块中的专项运动，能具备一定的运动特长，培养出一定的运动能力，为促进健康和终身参与体育锻炼夯实根基。
                </p>
              </div>
              <div class="bj-chapter001-con-icon">
              <div class="bj-chapter-con-icon">
                <img src="../../image/sports02.png" alt="" />
              </div>
            </div>
@@ -28,10 +28,10 @@
    </div>
    <div class="page-box" page="25">
      <div v-if="showPageList.indexOf(25) > -1">
        <div class="bodystyle">
        <div class="bodystyle textHeader">
          <div class="bj-img03">
            <div class="bj-empyt-chapter03"></div>
            <div class="bj-text03">
            <div class="bj-empyt-chapter"></div>
            <div class="bj-text">
              <p>
                竞争是球类运动最突出的特征。无论是集体合作完成的某项运动，还是单枪匹马与对手交锋的球类项目，都具有较强的竞争性。此外，集体项目还能充分培养同学们团队合作的意识和能力。因此，中职学生有必要选择某些球类运动进行学习，以提高未来走向社会所需的竞争与合作的意识和能力。本单元球类运动中设置了学校最常开展的篮球、足球、排球、羽毛球、乒乓球、网球（俗称“三大球”和“三小球”）项目，这些项目也是大多数同学爱学、爱练、爱赛的项目。球类运动的兴趣点主要集中在“得分”上。无论是篮球的投篮得分，还是足球比赛中的射门得分等，都大大吸引着比赛观看者和比赛参与者的注意力。在球类运动中，同学们能够不断体验球技提高的获得感，在比赛过程中得分获胜的成就感，以及与同伴合作或与对手竞争的愉悦感。同时，同学们也要学会接受一时比赛失利带来的沮丧，既要享受成功，也要坦然面对失利。
              </p>
@@ -1460,7 +1460,9 @@
      <el-dialog
        :visible.sync="dialogVisible"
        width="60vw"
        top="2vh"
        append-to-body
        lock-scroll
        :show-close="false"
        class="custom-dialog"
      >

 src/books/sportsAndHealth/view/components/text.html

@@ -3800,6 +3800,26 @@



  <!-- 偶数页 -->
  <div class="header-even">
    <span class="sub-page">004</span>
    <div class="line-page"></div>
    <span class="book-title">体育与健康</span>
  </div>

  <!-- 奇数页 -->
  <div class="header-odd">
    <span class="mk">基础模块</span>
    <span class="sub">第一单元</span>
    <span class="sub-title">健康教育</span>
    <div class="line-page"></div>
    <span class="sub-page">003</span>
  </div>









 src/components/examinations/index.vue

@@ -92,7 +92,7 @@
                v-cloak
              ></p>
            </div>
            <img :src="value.isCollect ? isHeart : heart" alt="" class="collect-png" @click="handleCollect(nindex,index)" >
            <img :src="value.isCollect ? isHeart : heart" alt="" class="collect-png" @click="handleCollect(nindex,index)" v-if="!(hideCollect && value.questionType == 'shortAnswer')" >
            <!-- 收藏 -->
          </div>
          <div class="questionContent">
@@ -500,6 +500,10 @@
      type: String,
      default: "#fff",
    },
    hideCollect:{
      type:Boolean,
      default:false
    }
  },
  data() {
    return {

 src/components/matching/matching.vue

@@ -15,10 +15,9 @@
            :key="index"
            ref="left"
            @mousedown="(e) => touchstart(e, item, index)"
            :style="{backgroundColor:primaryColor}"
          >
            {{ item.label.txt }}
          </div>
            :style="{ backgroundColor: primaryColor }"
            v-html="item.label.txt"
          ></div>
        </div>
        <div class="answer-box">
          <div
@@ -26,10 +25,9 @@
            v-for="(item, index) in rightArr"
            :key="index"
            ref="right"
            :style="{backgroundColor:primaryColor}"
          >
            {{ item.label.txt }}
          </div>
            :style="{ backgroundColor: primaryColor }"
            v-html="item.label.txt"
          ></div>
        </div>
      </div>
      <canvas
@@ -48,17 +46,24 @@
    <!-- 按钮 -->
    <div class="btn-bottom">
      <el-button @click="submitData">提交</el-button>
      <el-button @click="saveData" :style="{borderColor:primaryColor}">保存</el-button>
      <el-button @click="redo" >重做</el-button>
      <el-button @click="handleAnswer" :style="{borderColor:primaryColor}">查看答案</el-button>
      <el-button @click="saveData" :style="{ borderColor: primaryColor }"
        >保存</el-button
      >
      <el-button @click="redo">重做</el-button>
      <el-button @click="handleAnswer" :style="{ borderColor: primaryColor }"
        >查看答案</el-button
      >
    </div>
    <!-- 解析 -->
    <ul class="show-answer" v-if="isShowAnswer">
      <li v-if="isRight !== null">答案结果：<span v-if="isRight" style="color: #83e089;">正确</span> <span v-if="isRight == false" style="color:#d81e06">错误</span></li>
      <li v-if="isRight !== null">
        答案结果：<span v-if="isRight" style="color: #83e089">正确</span>
        <span v-if="isRight == false" style="color: #d81e06">错误</span>
      </li>
      <li class="show-answer-box">
        <div>答案:</div>
        <div>
          <img :src="item.answerImg" alt="" class="w100">
          <img :src="question.answerImg" alt="" class="w100" />
        </div>
      </li>
    </ul>
@@ -85,8 +90,8 @@
      checkItemIndex: null,
      isShowAnswer: false,
      isRight: null,
      value:[],
      pageNum:null
      value: [],
      pageNum: null,
    };
  },
  props: {
@@ -99,16 +104,16 @@
        };
      },
    },
    item: {
    question: {
      type: Object,
      default: () => {
        return [];
      },
    },
    primaryColor:{
      type:String,
      default:"#0bab87"
    }
    primaryColor: {
      type: String,
      default: "#0bab87",
    },
  },
  watch: {
    rawData: {
@@ -120,7 +125,7 @@
  },
  mounted() {
    // 获取当前页码，用于匹配本次存储题目数据
    this.pageNum = this.handlePage()
    this.pageNum = this.handlePage();
    // 添加滚动事件 监听 解决因为滚动引起的拖动线不对的问题
    window.addEventListener(
      "scroll",
@@ -142,7 +147,7 @@
    this.$nextTick(() => {
      this.drawing();
    });
    this.getAnswer()
    this.getAnswer();
  },
  methods: {
    init() {
@@ -182,14 +187,15 @@
    // 触摸结束
    touchend(e, index) {
      this.isDragging = false;
      if (this.item.showAnswer) {
      if (this.question.showAnswer) {
        return false;
      }
      // let event = e.changedTouches[0];
      // document.elementFromPoint 重点，根据x,y坐标 取当前元素 所有能运行的逻辑 都依托于这里。
      let dom = (
        this.container ? this.container : document
      ).elementFromPoint(e.pageX, e.pageY);
      let dom = (this.container ? this.container : document).elementFromPoint(
        e.pageX,
        e.pageY
      );
      // 右边的dom是哪个
      let right = this.rightDom.find((r) => r.bom === dom);
      // 不管是哪个都清除掉 底部的线
@@ -220,7 +226,7 @@
        })
        .filter((r) => r.right !== undefined);
      this.$emit("input", model);
      this.item.userChoise = model;
      this.question.userChoise = model;
      // console.log(JSON.stringify(model));
    },
    // 触摸开始
@@ -239,7 +245,7 @@
    // touchmove(e, item) {
    //     if(!this.isDragging) return false
    //     console.log('移动',e);
    //     if (this.item.showAnswer) {
    //     if (this.question.showAnswer) {
    //         return false;
    //     }
    //     // let event = e.targetTouches[0];
@@ -251,7 +257,7 @@
    // 移动中
    mousemove(e) {
      if (!this.isDragging) return false;
      if (this.item.showAnswer) {
      if (this.question.showAnswer) {
        return false;
      }
      this.checkItem.line[2] = e.pageX;
@@ -329,10 +335,10 @@
    // 提交
    submitData() {
      const answerArr = [];
      const values = this.item.options.values;
      const values = this.question.options.values;
      for (let index = 0; index < values.length; index++) {
        const item = values[index];
        const rightIndex = this.item.options.linkValues.findIndex(
        const rightIndex = this.question.options.linkValues.findIndex(
          (citem) => citem.oldId == item.oldId
        );
        answerArr.push({
@@ -340,22 +346,21 @@
          right: rightIndex,
        });
      }
      this.isRight = this.areArraysEqual(this.item.userChoise,answerArr)
      this.isShowAnswer =true
      this.isRight = this.areArraysEqual(this.question.userChoise, answerArr);
      this.isShowAnswer = true;
    },
    // 获取当前页码
    handlePage() {
      let pageNum = null
      let pageNum = null;
      const element = (
        this.container ? this.container : document
      ).querySelector("matching");
      if (element) {
        pageNum = this.getParentWithClass(
          element,
          "page-box"
        ).getAttribute("page");
        pageNum = this.getParentWithClass(element, "page-box").getAttribute(
          "page"
        );
      }
      return pageNum
      return pageNum;
    },
    getParentWithClass(element, className) {
      while (element.parentElement) {
@@ -367,31 +372,38 @@
    },
    // 获取本地存储题目答案
    getAnswer() {
      const data =  localStorage.getItem(this.config.activeBook.name + '-matching-' + this.pageNum)
      if(data) {
       this.value = JSON.parse(data)
      const data = localStorage.getItem(
        this.config.activeBook.name + "-matching-" + this.pageNum
      );
      if (data) {
        this.value = JSON.parse(data);
      }
    },
    // 保存
    saveData() {
      if(this.item.userChoise.length)
      localStorage.setItem(this.config.activeBook.name + '-matching-' + this.pageNum,JSON.stringify(this.item.userChoise))
      if (this.question.userChoise.length)
        localStorage.setItem(
          this.config.activeBook.name + "-matching-" + this.pageNum,
          JSON.stringify(this.question.userChoise)
        );
      // console.log('保存成功',this.config.activeBook.name,this.pageNum);
    },
    // 重做
    redo() {
      this.item.showAnswer = false
      localStorage.removeItem(this.config.activeBook.name + '-matching-' + this.pageNum)
      this.value = []
      this.question.showAnswer = false;
      localStorage.removeItem(
        this.config.activeBook.name + "-matching-" + this.pageNum
      );
      this.value = [];
      for (let index = 0; index < this.leftArr.length; index++) {
        const item = this.leftArr[index];
        item.value = []
        item.line = []
        item.value = [];
        item.line = [];
      }
      this.leftArr
      this.drawing()
      this.isShowAnswer = false
    }
      this.leftArr;
      this.drawing();
      this.isShowAnswer = false;
    },
  },
};
</script>
@@ -459,7 +471,7 @@
  height: min-content;
  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
  li {
    padding:10px
    padding: 10px;
  }
}
.btn-bottom {
@@ -467,10 +479,26 @@
  margin: 70px auto 0 auto;
  display: flex;
  justify-content: space-evenly;
  flex-wrap: wrap;
  .el-button {
    margin-top: 10px;
  }
}
.el-button {
  height:30px;
  padding:7px;
  min-width: 78px
  height: 30px;
  padding: 7px;
  min-width: 78px;
}
.answer-box-item {
  /deep/ .un1 {
    -webkit-text-emphasis-style: dot;
    -moz-text-emphasis-style: dot;
    -ms-text-emphasis-style: dot;
    text-emphasis-style: dot;
    -webkit-text-emphasis-position: under;
    -moz-text-emphasis-position: under;
    -ms-text-emphasis-position: under;
    text-emphasis-position: under;
  }
}
</style>

 src/components/pdfview/index.vue

@@ -2,23 +2,22 @@
  <div class="preview" v-if="this.preViewMd5">
    <div id="imageParent" class="imageBox"></div>
    <div class="bottom_tool">
      <svg
      <!-- <svg
        t="1718330411310"
        @click="downloadPdf"
        t="1718251204993"
        class="icon"
        viewBox="0 0 1024 1024"
        version="1.1"
        xmlns="http://www.w3.org/2000/svg"
        p-id="4418"
        xmlns:xlink="http://www.w3.org/1999/xlink"
        width="25"
        height="25"
        p-id="7121"
        width="20"
        height="20"
      >
        <path
          d="M557 564.974l153.188-181.04c16.054-18.972 44.448-21.34 63.42-5.286 18.972 16.054 21.338 44.448 5.284 63.42L550.56 711.92a44.982 44.982 0 0 1-8.95 10.254 44.872 44.872 0 0 1-15.082 8.432A44.944 44.944 0 0 1 512 733c-16.264 0-30.512-8.628-38.42-21.556L245.65 442.068c-16.052-18.972-13.686-47.366 5.286-63.42 18.972-16.052 47.366-13.686 63.42 5.286l152.646 180.4V157c0-24.852 20.148-45 45-45s45 20.148 45 45v407.974zM823 630c0-24.852 20.148-45 45-45s45 20.148 45 45v238c0 24.87-20.176 45.026-45.046 45l-710-0.726c-24.834-0.026-44.954-20.166-44.954-45V630c0-24.852 20.148-45 45-45s45 20.148 45 45v192.32l620 0.634V630z"
          p-id="4419"
          d="M1022.955204 522.570753c0 100.19191-81.516572 181.698249-181.718715 181.698249l-185.637977 0c-11.2973 0-20.466124-9.168824-20.466124-20.466124 0-11.307533 9.168824-20.466124 20.466124-20.466124l185.637977 0c77.628008 0 140.786467-63.148226 140.786467-140.766001 0-77.423347-62.841234-140.448776-140.203182-140.766001-0.419556 0.030699-0.818645 0.051165-1.217734 0.061398-5.945409 0.143263-11.686157-2.292206-15.687284-6.702656-4.001127-4.400217-5.894244-10.335393-5.167696-16.250102 1.330298-10.806113 1.944282-19.760043 1.944282-28.192086 0-60.763922-23.658839-117.884874-66.617234-160.833035-42.968627-42.968627-100.089579-66.617234-160.843268-66.617234-47.368844 0-92.742241 14.449084-131.208321 41.781592-37.616736 26.738991-65.952084 63.700811-81.925894 106.884332-2.425236 6.538927-8.012488 11.399631-14.827707 12.893658-6.815219 1.483794-13.927197-0.603751-18.859533-5.54632-19.289322-19.330254-44.943608-29.972639-72.245418-29.972639-56.322773 0-102.146425 45.813419-102.146425 102.125959 0 0.317225 0.040932 0.982374 0.092098 1.627057 0.061398 0.920976 0.122797 1.831718 0.153496 2.762927 0.337691 9.465582-5.863545 17.928325-15.001669 20.455891-32.356942 8.933463-61.541635 28.550243-82.181721 55.217602-21.305235 27.516704-32.571836 60.508096-32.571836 95.41307 0 86.244246 70.188572 156.422585 156.443052 156.422585l169.981393 0c11.2973 0 20.466124 9.15859 20.466124 20.466124 0 11.2973-9.168824 20.466124-20.466124 20.466124l-169.981393 0c-108.828614 0-197.3753-88.536452-197.3753-197.354833 0-44.053332 14.223956-85.712127 41.126676-120.473839 22.809495-29.460985 53.897537-52.086285 88.710414-64.816215 5.065366-74.322729 67.149353-133.2447 142.751215-133.2447 28.386514 0 55.504128 8.217149 78.651314 23.52581 19.657712-39.868009 48.842405-74.169233 85.497233-100.212376 45.434795-32.295544 99.004875-49.354058 154.918325-49.354058 71.692832 0 139.087778 27.915793 189.782368 78.600149 50.694589 50.694589 78.610382 118.089535 78.610382 189.782368 0 3.704368-0.102331 7.470135-0.296759 11.368932C952.633602 352.568894 1022.955204 429.511287 1022.955204 522.570753zM629.258611 820.711014l-102.023628 102.013395c-3.990894 4.001127-9.230222 5.996574-14.46955 5.996574s-10.478655-1.995447-14.46955-5.996574l-102.023628-102.013395c-7.992021-7.992021-7.992021-20.947078 0-28.939099s20.947078-8.002254 28.939099 0l67.087954 67.077721 0-358.699522c0-11.2973 9.15859-20.466124 20.466124-20.466124 11.307533 0 20.466124 9.168824 20.466124 20.466124l0 358.699522 67.087954-67.077721c7.992021-8.002254 20.947078-7.992021 28.939099 0S637.250632 812.718993 629.258611 820.711014z"
          p-id="7122"
        ></path>
      </svg>
      </svg> -->
    </div>
  </div>
</template>
@@ -79,9 +78,7 @@
      window.open(await getResourcePath(this.preViewMd5));
    },
    domViewer() {
      let ele = (this.container ? this.container : document).getElementById(
        "imageParent"
      );
      let ele = document.getElementById("imageParent");
      this.viewerCon = new Viewer(ele, {
        inline: false,
        container: this.container
@@ -93,16 +90,12 @@
      });
    },
    clearDom() {
      let ele = (this.container ? this.container : document).getElementById(
        "imageParent"
      );
      let ele = document.getElementById("imageParent");
      ele.innerHtml = "";
    },
    createDom(page) {
      var that = this;
      let ele = (this.container ? this.container : document).getElementById(
        "imageParent"
      );
      let ele = document.getElementById("imageParent");
      const img = document.createElement("img");
      img.src = this.getPageImage(page);
      img.alt = "";
@@ -117,9 +110,7 @@
    },
    scrollBottom() {
      var that = this;
      var ele = (this.container ? this.container : document).getElementById(
        "imageParent"
      );
      var ele = document.getElementById("imageParent");
      ele.addEventListener("scroll", function () {
        // 计算滚动条距离底部的位置
        const scrollBottom =
@@ -185,8 +176,8 @@
    justify-content: flex-end;
    align-items: center;
    svg {
      margin-right: 10px;
      fill: #999;
      margin-right: 15px;
      fill: #d1d1d1;
    }
    svg:hover {
      fill: #fff;