合并代码

闫增涛

2024-06-13 6b15f89a33b0bffb9837f954c48ea2b21e7381fd

合并代码

 src/App.vue

@@ -79,7 +79,7 @@
        // artAndDance
        // artAndDrama
        // math
        this.config.resourceCtx + "artAndDrama"
        this.config.resourceCtx + "math"
      );
      // 测试试读30页
      // this.activeBook.tryPageCount = 10;

 src/books/childHealth/view/content/components/chapter007.vue

@@ -385,41 +385,6 @@
            </p>
            <p class="block">常见于胃肠道疾病。</p>
            <p class="block">2.大便性状异常</p>
            <p class="block">（2）维生素A或维生素D中毒，也会引起厌食。</p>
            <p class="block">（3）长期摄食无盐饮食，也可使食欲低下。</p>
            <p class="block">2.食欲亢进</p>
            <p class="block">
              （1）幼儿若吃得多、喝得多、尿得多，应检查是否患有甲状腺功能亢进或糖尿病。
            </p>
            <p class="block">（2）心理异常也可贪食。</p>
            <p class="block">（3）家族遗传性肥胖患儿也有贪食习惯。</p>
            <p class="block">3.异嗜癖</p>
            <p class="block">
              异嗜癖是指幼儿对食物以外的非食物物品表现出不可自制的食欲，如喜食泥土、煤核、纸张、墙皮等。常见于体内锌、铁严重缺乏的幼儿，在中国南方也可见于钩虫病。
            </p>
            <p class="block"><b>三、睡眠异常</b></p>
            <p class="block">
              正常幼儿上床后可很快入睡，睡眠平稳、无鼾声，可有微汗。
            </p>
            <p class="block">睡眠异常主要包括以下3种。</p>
            <p class="block">1.入睡困难</p>
            <p class="block">（1）进入新的环境，不能适应。</p>
            <p class="block">（2）精神紧张、压力过大。</p>
            <p class="block">（3）疾病疼痛所致，如剧烈牙疼可致入睡困难。</p>
            <p class="block">2.睡眠不安</p>
            <p class="block">（1）佝偻病等所致。</p>
            <p class="block">（2）体内有蛲虫活动。</p>
            <p class="block">（3）心理因素。</p>
            <p class="block">3.嗜睡</p>
            <p class="block">常见于脑膜炎、脑炎等疾病的早期表现。</p>
            <p class="block"><b>四、大便异常</b></p>
            <p class="block">包括大便次数异常和大便性状异常。</p>
            <p class="block">1.大便次数异常</p>
            <p class="block">
              排便次数较平时有明显减少或增多，排便时有不舒服感。
            </p>
            <p class="block">常见于胃肠道疾病。</p>
            <p class="block">2.大便性状异常</p>
            <p class="block">
              （1）血便：粪便带血，色鲜红、暗红或呈柏油状，量多少不等，可混有脓液、黏液，统称便血或血便。
            </p>

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

@@ -171,7 +171,7 @@
  },
  mounted() {
    // 默认加载章节
    this.showCatalogList = [1];
    this.showCatalogList = [8];
    // 滚动监听节流
    this.throttledScrollHandler = _.throttle(
      this.scrollFun,

 src/books/math/assets/main.less

@@ -750,10 +750,10 @@
    cursor: pointer;
    text-indent: 0;
    display: inline-block;
    border:1px solid #8281ED;
    border:1px solid #00a1e9;
    height: 22px;
    padding: 5px;
    background-color:#8281ED ;
    padding: 3px;
    background-color:#00a1e9 ;
    border-radius: 5px;
    svg {
      fill: #fff;
@@ -761,7 +761,7 @@
    &:hover {
      background-color: #fff;
      svg {
        fill:#8281ED ;
        fill:#00a1e9 ;
      }
    }
  }

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

@@ -90,15 +90,7 @@
          <p class="center openImgBox">
            <img class="img-c" alt="" src="../../assets/images/0100-3.jpg" />
          </p>
          <p class="img fl al-cn ju-cn">
            <span>图3-14 </span
            ><img
              :src="chapterData.isCollectImg ? collectCheck : collectImg"
              alt=""
              class="collect-btn"
              @click="handleCollect('img')"
            />
          </p>
          <p class="img">图3-14</p>
          <p>
            观察图3-14（1）
            发现，函数<i>f</i>（<i>x</i>）=|<i>x</i>|的定义域是（-∞，+∞），函数图像关于<i>y</i>轴对称.从表3-11中还发现，当自变量取一对相反数时，对应的函数值相等，如<i>f</i>（-1）=<i>f</i>（1）=1，<i>f</i>（-2）=<i>f</i>（2）=2，<i>f</i>（-3）=<i>f</i>（3）=3，…实际上，对任意<i>x</i>∈（-∞，+∞），都有<i>f</i>（-<i>x</i>）=|-<i>x</i>|=|<i>x</i>|=<i>f</i>（<i>x</i>），即<i>f</i>（-<i>x</i>）=<i>f</i>（<i>x</i>）.
@@ -146,7 +138,15 @@
              style="width: 40%"
            />
          </p>
          <p class="img">图3-15</p>
          <p class="img fl al-cn ju-cn">
            <span>图3-15</span>
            <img
              :src="chapterData.isCollectImg ? collectCheck : collectImg"
              alt=""
              class="collect-btn"
              @click="handleCollect('img')"
            />
          </p>
          <video
            :src="videoPath"
            webkit-playsinline="true"
@@ -307,6 +307,32 @@
                  />
                </svg>
              </span>
              <span class="btn-box" @click="stepDialog = true">
                <svg
                  xmlns="http://www.w3.org/2000/svg"
                  width="19.28"
                  height="20.563"
                  viewBox="0 0 19.28 20.563"
                >
                  <g transform="translate(-109.056 -82.941)">
                    <path
                      class="a"
                      d="M3439.656-15185.7h-12.643a1.815,1.815,0,0,1-1.816-1.81v-16.944a1.83,1.83,0,0,1,1.816-1.809h15.674a1.8,1.8,0,0,1,1.79,1.809v13.93h-4.217a.6.6,0,0,0-.6.6v4.217h0Zm-9.819-2.764a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm0-2a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm1.393-8.525a2.416,2.416,0,0,0-2.416,2.411,2.421,2.421,0,0,0,2.416,2.42h.111a1.8,1.8,0,0,0,1.1,1.1,1.809,1.809,0,0,0,.6.107,1.808,1.808,0,0,0,1.7-1.206h4.072l-.172.172a.635.635,0,0,0-.179.454.569.569,0,0,0,.179.4.637.637,0,0,0,.435.176.6.6,0,0,0,.424-.176l1.2-1.214a.618.618,0,0,0,0-.858l-1.2-1.187a.619.619,0,0,0-.431-.176.6.6,0,0,0-.427.176.615.615,0,0,0,0,.854l.172.176h-4.072a1.8,1.8,0,0,0-1.1-1.1,1.755,1.755,0,0,0-.6-.1,1.808,1.808,0,0,0-1.7,1.206h-.111a.554.554,0,0,1-.145-.016,1.2,1.2,0,0,1-.84-.4,1.217,1.217,0,0,1-.3-.878,1.2,1.2,0,0,1,1.206-1.137.407.407,0,0,1,.069,0h3.729a1.807,1.807,0,0,0,1.118,1.114,1.816,1.816,0,0,0,.576.091,1.789,1.789,0,0,0,1.7-1.205h.309a2.415,2.415,0,0,0,1.679-.775,2.407,2.407,0,0,0,.637-1.729,2.411,2.411,0,0,0-2.419-2.324h-6.213a1.821,1.821,0,0,0-1.107-1.1,1.8,1.8,0,0,0-.6-.1,1.814,1.814,0,0,0-1.706,1.2,1.8,1.8,0,0,0,.077,1.389,1.787,1.787,0,0,0,1.026.92,1.841,1.841,0,0,0,.6.1,1.807,1.807,0,0,0,1.706-1.2h6.266a1.179,1.179,0,0,1,.836.4,1.22,1.22,0,0,1,.305.874,1.213,1.213,0,0,1-1.214,1.146h-.172a1.8,1.8,0,0,0-1.118-1.118,1.711,1.711,0,0,0-.576-.1,1.8,1.8,0,0,0-1.706,1.214Z"
                      transform="translate(-3316.14 15289.201)"
                    />
                    <path
                      class="a"
                      d="M316.806,239.727a.6.6,0,1,0,.6-.6A.6.6,0,0,0,316.806,239.727Zm-5.421-4.207a.6.6,0,1,0,.6.6A.587.587,0,0,0,311.385,235.52Zm2.4,8.438a.607.607,0,1,0-.6-.613A.621.621,0,0,0,313.789,243.958Z"
                      transform="translate(-196.896 -148.921)"
                    />
                    <path
                      class="a"
                      d="M763.392,793.79l3.262-3.262h-3.262Z"
                      transform="translate(-638.661 -690.634)"
                    />
                  </g>
                </svg>
              </span>
              <span class="btn-box" @click="openMathDiaolog">
                <svg
                  xmlns="http://www.w3.org/2000/svg"
@@ -330,32 +356,6 @@
                      class="a"
                      d="M14.936,7.489l.693,2.251a5.154,5.154,0,0,0,.236.61c.083.159.18.242.3.242a.82.82,0,0,0,.533-.457,4.849,4.849,0,0,0,.339-.817H17.8a4.849,4.849,0,0,1-.693,1.51,2.813,2.813,0,0,1-.873.852,1.766,1.766,0,0,1-.88.27,1.178,1.178,0,0,1-1.018-.464,4.357,4.357,0,0,1-.623-1.309l-.326-1.067a6.4,6.4,0,0,0-.222-.8L12.747,7c-.083-.27-.152-.478-.2-.6a1.136,1.136,0,0,0-.194-.312.4.4,0,0,0-.284-.118c-.326,0-.6.423-.817,1.261h-.769a6.671,6.671,0,0,1,.6-1.5,3.034,3.034,0,0,1,.81-.873,1.663,1.663,0,0,1,.942-.312,1.344,1.344,0,0,1,1.067.471,3.692,3.692,0,0,1,.644,1.268l.139.436C14.672,6.7,14.936,7.489,14.936,7.489Z"
                      transform="translate(398 948)"
                    />
                  </g>
                </svg>
              </span>
              <span class="btn-box" @click="stepDialog = true">
                <svg
                  xmlns="http://www.w3.org/2000/svg"
                  width="19.28"
                  height="20.563"
                  viewBox="0 0 19.28 20.563"
                >
                  <g transform="translate(-109.056 -82.941)">
                    <path
                      class="a"
                      d="M3439.656-15185.7h-12.643a1.815,1.815,0,0,1-1.816-1.81v-16.944a1.83,1.83,0,0,1,1.816-1.809h15.674a1.8,1.8,0,0,1,1.79,1.809v13.93h-4.217a.6.6,0,0,0-.6.6v4.217h0Zm-9.819-2.764a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm0-2a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm1.393-8.525a2.416,2.416,0,0,0-2.416,2.411,2.421,2.421,0,0,0,2.416,2.42h.111a1.8,1.8,0,0,0,1.1,1.1,1.809,1.809,0,0,0,.6.107,1.808,1.808,0,0,0,1.7-1.206h4.072l-.172.172a.635.635,0,0,0-.179.454.569.569,0,0,0,.179.4.637.637,0,0,0,.435.176.6.6,0,0,0,.424-.176l1.2-1.214a.618.618,0,0,0,0-.858l-1.2-1.187a.619.619,0,0,0-.431-.176.6.6,0,0,0-.427.176.615.615,0,0,0,0,.854l.172.176h-4.072a1.8,1.8,0,0,0-1.1-1.1,1.755,1.755,0,0,0-.6-.1,1.808,1.808,0,0,0-1.7,1.206h-.111a.554.554,0,0,1-.145-.016,1.2,1.2,0,0,1-.84-.4,1.217,1.217,0,0,1-.3-.878,1.2,1.2,0,0,1,1.206-1.137.407.407,0,0,1,.069,0h3.729a1.807,1.807,0,0,0,1.118,1.114,1.816,1.816,0,0,0,.576.091,1.789,1.789,0,0,0,1.7-1.205h.309a2.415,2.415,0,0,0,1.679-.775,2.407,2.407,0,0,0,.637-1.729,2.411,2.411,0,0,0-2.419-2.324h-6.213a1.821,1.821,0,0,0-1.107-1.1,1.8,1.8,0,0,0-.6-.1,1.814,1.814,0,0,0-1.706,1.2,1.8,1.8,0,0,0,.077,1.389,1.787,1.787,0,0,0,1.026.92,1.841,1.841,0,0,0,.6.1,1.807,1.807,0,0,0,1.706-1.2h6.266a1.179,1.179,0,0,1,.836.4,1.22,1.22,0,0,1,.305.874,1.213,1.213,0,0,1-1.214,1.146h-.172a1.8,1.8,0,0,0-1.118-1.118,1.711,1.711,0,0,0-.576-.1,1.8,1.8,0,0,0-1.706,1.214Z"
                      transform="translate(-3316.14 15289.201)"
                    />
                    <path
                      class="a"
                      d="M316.806,239.727a.6.6,0,1,0,.6-.6A.6.6,0,0,0,316.806,239.727Zm-5.421-4.207a.6.6,0,1,0,.6.6A.587.587,0,0,0,311.385,235.52Zm2.4,8.438a.607.607,0,1,0-.6-.613A.621.621,0,0,0,313.789,243.958Z"
                      transform="translate(-196.896 -148.921)"
                    />
                    <path
                      class="a"
                      d="M763.392,793.79l3.262-3.262h-3.262Z"
                      transform="translate(-638.661 -690.634)"
                    />
                  </g>
                </svg>
@@ -754,11 +754,17 @@
              for (let index = 0; index < res.data.data.length; index++) {
                const item = res.data.data[index];
                if(item.infoList.length) {
                  for (let cindex = 0; cindex < item.infoList.length; cindex++) {
                  for (
                    let cindex = 0;
                    cindex < item.infoList.length;
                    cindex++
                  ) {
                  const citem = item.infoList[cindex];
                  const question = oldAnswer[9].find(ditem => ditem.id == citem.id)
                    const question = oldAnswer[9].find(
                      (ditem) => ditem.id == citem.id
                    );
                  if(question) {
                    citem.userAnswer = question.userAnswer
                      citem.userAnswer = question.userAnswer;
                  }
                }
                }

 src/components/examinations/index.vue

@@ -68,7 +68,7 @@
                  v-for="(itemText, indexText) in value.stem"
                  :key="indexText"
                >
                  <span v-if="typeof itemText == 'string'">{{ itemText }}</span>
                  <span v-if="typeof itemText == 'string'" v-html="itemText" ></span>
                  <!-- &nbsp; -->
                  <el-input
                    v-else