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

zhongshujie

2024-10-25 8c312ce260f1e76cd843a4c4c18620f167d7f436

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

 .env.product

@@ -1,8 +1,8 @@
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/civilAviation'
VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
# VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
# VUE_APP_PUBLIC_PATH = 'http://182.92.203.7:3007/books/book/botany'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook/botany/civilAviation"
VUE_APP_BOOK_ID = 'civilAviation'
VUE_APP_BOOK_ID = 'mathBook'

 src/books/civilAviation/assets/main.less

@@ -1220,14 +1220,11 @@

.custom-dialog {
    overflow: hidden !important;

    .el-dialog__body {
        padding: 0;
    }

    .el-dialog__header {
        background-color: rgba(0, 0, 0, 0.8);

        .header_title {
            display: flex;
            justify-content: space-between;
@@ -1241,7 +1238,6 @@
                cursor: pointer;
            }
        }

        .el-dialog__title,
        .el-dialog__headerbtn .el-dialog__close {
            color: #fff;

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

@@ -2120,7 +2120,7 @@
        <li v-for="(item, index) in thinkData" :key="index">
          <div v-if="index <= showIndex" style="display: flex">
            <span style="position: relative">
              <span style="position: absolute; top: 4px; left: 13px; color: #fff">{{ index + 1 }}</span>
              <span style="position: absolute; top: 16px; left: 13px; color: #fff">{{ index + 1 }}</span>
              <img src="../../assets/images/icon/blue-group.png" alt="" style="margin-right: 10px"
                v-if="index < thinkOne.length - 1" />
              <img src="../../assets/images/icon/blue.png" alt="" v-if="index == thinkOne.length - 1"

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

@@ -189,7 +189,7 @@

    // 测试页面跳转
    // setTimeout(() => {
    //   this.gotoPage(2,10);
    //   this.gotoPage(3,51);
    //   //   setTimeout(() => {
    //   //     this.renderSign("Highlight", {
    //   //       id: "2ACA9359",

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

@@ -1036,14 +1036,6 @@
      </div>
    </div>









    <div>
      <el-dialog :visible.sync="dialogVisible" width="60vw" top="2vh" lock-scroll :show-close="false"
        class="custom-dialog">

 src/components/paint/index.vue

@@ -14,7 +14,6 @@
        <button @click="saveImgData">保存</button>
      </li>
      <li>

      </li>
      <li>
        <label>画笔：</label>
@@ -205,9 +204,7 @@
          rect.render(ctx);
          return patternCanvas;
        };

        const img = new Image();
        // img.src = "../assets/images/drop.jpg";
        this.texturePatternBrush = new fabric.PatternBrush(this.canvas);
        this.texturePatternBrush.source = img;
      }
@@ -269,11 +266,9 @@
      if (brush.getPatternSrc) {
        brush.source = brush.getPatternSrc.call(brush);
      }
      console.log(e.srcElement.value);
    },
    // 修改画笔粗细
    changeLineWidth(e) {
      console.log(e);
      this.canvas.freeDrawingBrush.width =
        parseInt(e.srcElement.value, 10) || 1;
    },
@@ -326,7 +321,6 @@
    changeShowColor(e) {
      this.canvas.contextContainer.shadowColor = e.srcElement.value;
    },

    // 阴影宽度
    changeShowWidth(e) {
      console.log(this.canvas);
@@ -340,7 +334,7 @@
      this.canvas.contextContainer.shadowOffsetY =
        parseInt(e.srcElement.value, 10) || 0;
    },
    // 保存图书
    // 保存图片
    saveImgData() {
      const imgData = this.canvas.toDataURL({
        format: "png", // 指定输出格式，通常是'png'或'jpeg'