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

YM

2024-05-22 66ce96093584d8f1c6441e9c7034cdf364e6ac34

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

 src/books/English/view/index.vue

@@ -79,4 +79,5 @@
};
</script>

<style lang="less" scoped></style>
<style lang="less">
</style>

 src/books/content/index.vue

@@ -56,4 +56,6 @@
};
</script>

<style lang="less" scoped></style>
<style lang="less">
@import "./css/default.less";
</style>

 src/books/embedded/assets/main.less

@@ -371,7 +371,8 @@
    line-height: 1.3em;
    text-align: center;
    text-indent: 0;
    color: #b03639;
    color: #501438;
    margin-top: 4px;
  }

  /*环绕图片*/
@@ -651,6 +652,9 @@
  .mt-100 {
    margin-top: 100px;
  }
  .mb-5 {
    margin-bottom: 5px;
  }
  .mb-20 {
    margin-bottom: 20px;
  }
@@ -691,6 +695,9 @@
  }
  .w100 {
    width: 100%;
  }
  .w50 {
    width: 50%;
  }
  .page-heder-img {
    width: 100%;
@@ -762,6 +769,9 @@
  .border-so {
    border-bottom: 1px solid #501438;
  }
  .rw-border {
    border-bottom: 2px solid #501438;
  }
  .btn {
    cursor: pointer;
    border: 2px solid #501438;

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

@@ -11,7 +11,8 @@
        <h2 class="secondTitle primary-color" id="sigil_toc_id_13">
          任务一　认识嵌入式组态和触摸屏
        </h2>
        <div class="w100 border-so mb-20"></div>
        <div class="w100 border-so mb-5"></div>
        <div class="w50 rw-border mb-20"></div>
        <p class="quotation fl al-cn t0 primary-color">
          <img
            src="../../assets/images/icon/mubiao.png"
@@ -367,7 +368,7 @@
      </ul>
    </div>
    <!-- 7 -->
    <div class="page-box fl fl-cl ju-bt al-end padding-96 pr" page="17">
    <div class="page-box fl fl-cl ju-bt al-end padding-96" page="17">
      <div class="w100">
        <div class="primary-color fz-18 fw-bl mt-100 fl ju-ed mb-20">
          <img src="../../assets/images/header-one.png" alt="" />
@@ -382,11 +383,11 @@
        </p>
        <table border="1" cellpadding="10" cellspacing="0">
          <tr class="table-bc">
            <td class="table-cn">
            <td class="table-cn" colspan="2">
              评 分 表<br />
              <input style="width: 30px" class="input-border table-bc" /> 学年
            </td>
            <td colspan="2" class="table-cn">
            <td  class="table-cn">
              工 作 形 式 <br />
              <input type="checkbox" name="xingshi" value="prople" /> 个人
              <input type="checkbox" name="xingshi" value="fengong" /> 小组分工
@@ -446,10 +447,12 @@
            class="input-border"
          />日期:<input style="width: 82px" class="input-border" />
        </div>
        <div class="pr">
        <h2 class="secondTitle primary-color" id="sigil_toc_id_14">
          任务二　MCGS嵌入版组态软件安装
        </h2>
        <div class="w100 border-so mb-20"></div>
          <div class="w100 border-so mb-5"></div>
          <div class="w50 rw-border mb-20"></div>
        <p class="quotation fl al-cn t0 primary-color">
          <img
            src="../../assets/images/icon/mubiao.png"
@@ -479,27 +482,6 @@
        <p class="content">
          在昆仑通态官网上下载MCGS_嵌入版完整安装包，解压缩后，具体安装步骤如下：
        </p>
        <video
          v-if="videoOne"
          :src="config.resourceCtx + '/配套学习资源/p7/MCGS安装视频带音频.mp4'"
          webkit-playsinline="true"
          x-webkit-airplay="true"
          playsinline="true"
          x5-video-orientation="h5"
          x5-video-player-fullscreen="true"
          x5-playsinline=""
          controls
          class="w100 mt-20"
        ></video>
        <div class="primary-color fl al-cn ju-cn">
          <span>视频：MCGS安装视频</span>
        </div>
        <p class="content">
          （1）运行Setup.exe文件，MCGS安装程序窗口如图1-15所示。
        </p>
        <p class="content">
          在安装程序窗口中单击“安装组态软件”按钮，弹出安装程序窗口。单击“下一步”按钮，启动安装程序，如图1-16所示。
        </p>
        <ul class="right-resource">
          <li class="fl al-cn ju-cn border-so p-10">
            <img
@@ -516,13 +498,36 @@
                安装文件.rar</span
              >
              <img
                @click="downloadRar('McgsPro 3.3.6.6354 SP1.3 组态软件安装包')"
                  @click="
                    downloadRar('McgsPro 3.3.6.6354 SP1.3 组态软件安装包')
                  "
                src="../../assets/images/icon/download.png"
                class="downlod-icon cu-pr"
              />
            </div>
          </li>
        </ul>
        </div>

        <video
          v-if="videoOne"
          :src="config.resourceCtx + '/配套学习资源/p7/MCGS安装视频带音频.mp4'"
          webkit-playsinline="true"
          x-webkit-airplay="true"
          playsinline="true"
          x5-video-orientation="h5"
          x5-video-player-fullscreen="true"
          x5-playsinline=""
          controls
          class="w100 mt-20"
        ></video>
        <p class="imgdescript">视频：MCGS安装视频</p>
        <p class="content">
          （1）运行Setup.exe文件，MCGS安装程序窗口如图1-15所示。
        </p>
        <p class="content">
          在安装程序窗口中单击“安装组态软件”按钮，弹出安装程序窗口。单击“下一步”按钮，启动安装程序，如图1-16所示。
        </p>
      </div>
      <ul class="page-footer fl fl-cl al-cn w-mi p0 mb-40">
        <li class="footer-num">7</li>
@@ -597,11 +602,11 @@
        </div>
        <table border="1" cellpadding="10" cellspacing="0">
          <tr class="table-bc">
            <td class="table-cn">
            <td class="table-cn" colspan="2">
              评 分 表<br />
              <input style="width: 30px" class="input-border table-bc" /> 学年
            </td>
            <td colspan="2" class="table-cn">
            <td  class="table-cn">
              工 作 形 式 <br />
              <input type="checkbox" name="xingshi" value="prople" /> 个人
              <input type="checkbox" name="xingshi" value="fengong" /> 小组分工
@@ -654,7 +659,8 @@
        <h2 class="secondTitle" id="sigil_toc_id_15">
          任务三　建立工程与下载工程
        </h2>
        <div class="w100 border-so mb-20"></div>
        <div class="w100 border-so mb-5"></div>
        <div class="w50 rw-border mb-20"></div>
        <div class="fl ju-bt">
          <div class="left" style="width: 30%">
            <p class="quotation fl al-cn t0 primary-color">
@@ -1148,11 +1154,11 @@
        </div>
        <table border="1" cellpadding="10" cellspacing="0">
          <tr class="table-bc">
            <td class="table-cn">
            <td class="table-cn" colspan="2">
              评 分 表<br />
              <input style="width: 30px" class="input-border table-bc" /> 学年
            </td>
            <td colspan="2" class="table-cn">
            <td  class="table-cn">
              工 作 形 式 <br />
              <input type="checkbox" name="xingshi" value="prople" /> 个人
              <input type="checkbox" name="xingshi" value="fengong" /> 小组分工
@@ -1425,8 +1431,8 @@
}
.right-resource {
  position: absolute;
  right: 10px;
  bottom: 180px;
  right: -80px;
  top:40px
}
.word-resource {
  padding: 0;

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

@@ -60,7 +60,7 @@
      <p class="contentCR">本书由中国铁道出版社进行制作与发行。</p>
      <p class="contentCR">版权所有·侵权必究</p> -->
      <div style="width: 65%;" class="fw-box">
        <img src="../../assets/images/banquan.png" style="width:90%">
        <img src="../../assets/images/banquan.png">
        <!-- <p class="content">图书在版编目(CIP)数据</p>
        <p class="content">嵌入式组态控制技术/张文明，华祖银主编.-3 版.</p>
        <p class="content">-北京:中国铁道出版社有限公司，2019.7</p>
@@ -96,7 +96,8 @@
      <p class="t0">网&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址：http:// www.tdpress.com/5 leds/</p>
      <p class="t0">印&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;刷：北京柏力行彩印有限公司</p>
      <p class="t0">版&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次：2011年8月第1版 2019年7月第3版 2019年7月第1次印刷</p>
      <p class="t0">开&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;本：787mmx1092mm1/16印张:18字数:433千数:1~2000册</p>
      <p class="t0">开&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;本：787mmx1092mm1/16印张：18字数：433千</p>
      <p class="t0">印&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;数：1~2000册</p>
      <p class="t0">书&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：SBN978-7-113-25402-5</p>
      <p class="t0">定&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：59.80元</p>
      <hr />

 src/books/embedded/view/index.vue

@@ -92,4 +92,6 @@
};
</script>

<style lang="less" scoped></style>
<style lang="less">
@import "../assets/main.less";
</style>