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

litian

2025-04-14 278c88d55beb177a9420113d84be774d97c797f5

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

 src/App.vue

@@ -25,8 +25,8 @@

if (window.electronAPI) {
  window.electronAPI.onLogout((data) => {
    localStorage.removeItem("token")
    localStorage.removeItem("userInfo")
    localStorage.removeItem('token')
    localStorage.removeItem('userInfo')
    router.replace({
      path: '/login'
    })
@@ -122,14 +122,14 @@
let chapter = getUrlParam('chapter')
let startPage = getUrlParam('startPage')
let token = getUrlParam('token')
if(bookId){
if (bookId) {
  localStorage.setItem('bookId', bookId)
}

if(token && token != null && token != 'null'){
if (token && token != null && token != 'null') {
  localStorage.setItem('token', token)
}
if(chapter && startPage){
if (chapter && startPage) {
  localStorage.setItem('chapter', chapter)
  localStorage.setItem('startPage', startPage)
}
@@ -141,7 +141,8 @@
}
</script>

<style>
<style lang="less">
@import './assets/style/examination.less';
.updateDownloadInfo {
  position: fixed;
  top: 2px;
@@ -150,10 +151,11 @@
  z-index: 999;
}


@font-face {
  font-family: "swiper-icons";
  src: url("data:application/font-woff;charset=utf-8;base64, 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")
    format("woff");
  font-family: 'swiper-icons';
  src: url('data:application/font-woff;charset=utf-8;base64, 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')
    format('woff');
  font-weight: 400;
  font-style: normal;
}

 src/assets/style/examination.less

New file
@@ -0,0 +1,644 @@
.pdfBox-component {
  overflow: auto;
  padding-bottom: 40px;
  .catalogName {
    display: flex;
    text-indent: 1em !important;
    font-size: 16px;
    .catalogName-box {
      display: inline-block;
      width: 94%;
    }
  }
  .catalogImage {
    width: 50%;
  }
  .examination {
    min-height: 100px;
    ul {
      list-style: none;
    }

    p {
      margin: 0;
    }
    math {
    }
  }

  .examinations-btn-box {
    height: 30px;
    width: 78px;
    padding: 4px 10px;
  }

  .border-box {
    padding-top: 20px;
    // border: 2px solid #e9e9e9;
  }

  .ti-2 {
    text-indent: 2em !important;
  }

  .questionContent {
    text-indent: 0em !important;
    margin-left: 20px;

    /deep/ .el-textarea__inner:focus {
      border-color: #15c0f2;
    }
  }

  .input {
    /deep/ .el-input__inner {
      height: 26px;
    }
  }

  p {
    margin-top: 0em;
    text-indent: 0em !important;
    line-height: 1.5em;
    font-size: 16px;
  }

  .colorBox {
    margin: 0 10px 0 23px;
    width: 4px;
    height: 19px;
    background-color: #ff6c00;
  }

  .textOverFlow {
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
  }

  .question {
    overflow: auto;
    height: 775px;
    padding-bottom: 20px;
  }

  .question::-webkit-scrollbar {
    width: 3px;
  }

  /*滚动条滑块*/
  .question::-webkit-scrollbar-thumb {
    border-radius: 20px;
    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
    background-color: #333;
  }

  /*滚动条轨道*/
  .question::-webkit-scrollbar-track {
    -webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0);
    border-radius: 20px;
    background: #d9d9d9;
  }

  .paperMargin {
    margin-top: 30px;

    ul li {
      padding: 20px 41px 0px 46px;
    }

    li:last-child {
      padding-bottom: 20px;
    }
  }

  .paperQuestion {
    padding-left: 12px;
    display: flex;
    align-items: center;
    font-size: 16px;

    .questionText {
      font-size: 16px;
      color: #000;
    }

    span {
      color: #c2c2c2;
    }
  }

  /** 题干 */
  .questionTitle {
    display: flex;
    justify-content: center;

    .titleContent {
      width: 95%;
      display: flex;
      align-items: flex-start;

      .questionNum {
        text-indent: 0 !important;
        margin-right: 5px;
        height: 32px;
        line-height: 32px;
        text-align: center;
        font-size: 16px;
        color: #333;
        font-weight: bold;
      }
      .text-fl {
        display: flex;
        align-items: center;
        flex-wrap: wrap;
      }
      .titleText {
        display: flex;
        flex-wrap: wrap;
        align-items: center;
        text-align: left;
        min-width: 90%;
        font-size: 16px;
        line-height: 32px;
        color: #000;
        .input-txt {
          display: flex;
          flex-wrap: wrap;
          align-items: center;
        }
        span {
          display: inline-block;
          font-size: 16px;
          color: #000;
          font-weight: 400;
          margin-top: 6px;
        }
        select {
          outline: none;
          min-width: 100px;
        }
        input {
          width: 140px;
          height: 24px;
          border: 0;
          outline: none;
          border-bottom: 1px solid #000;
        }

        /deep/ .el-textarea.is-disabled .el-textarea__inner {
          background-color: #fff;
        }

        /deep/ .el-input.is-disabled .el-input__inner {
          background-color: #fff;
        }

        /dee/ p {
          display: flex;
          align-items: center;
        }
      }

      ::v-deep {
        .el-input__wrapper {
          border-top: 0 !important;
        }
      }
    }

    .collect {
      cursor: pointer;
      width: 21px;
      height: 21px;
    }
    .mathField {
      min-width: 200px;
      max-width: 518px;
    }
  }

  /** 选项 */
  .option {
    .el-radio,
    .el-checkbox {
      // min-height: 32px;
      height: min-content;
      display: flex;
      align-items: center;
      min-width: 45%;
      margin-right: 50px;
      margin-bottom: 6px;
      white-space: pre-wrap !important;
      color: #000;

      /deep/ .el-checkbox__label {
        line-height: 1.5;
      }
    }

    /deep/ .el-radio__inner {
      border-color: #a5a3a3;
    }

    .optionContent {
      margin: 0;
      display: flex;
      align-items: center;
      line-height: 26px;
      color: #000;
    }
  }

  .analysis {
    margin: 20px 0;
    width: 94%;
    // margin-left: 12px;
  }

  .el-collapse {
    width: 100%;
  }

  /** 解析 */
  .objective {
    /deep/ .el-collapse-item__header {
      min-height: 48px;
      height: min-content;
      padding: 0 20px;
      font-size: 16px;
      background-color: #f4f4f4;

      .headerBox {
        width: 100%;
        height: 100%;
        display: flex;
        justify-content: space-between;
        align-items: center;
        flex-wrap: wrap;

        .headerConent {
          height: 100%;
          display: flex;
          align-items: center;
          flex-wrap: wrap;

          p {
            margin-bottom: 0;
          }

          .el-image {
            width: 9px;
            height: 9px;
          }

          .correct {
            color: #1fbc1f;
            width: 180px;
            text-align: left;
            display: flex;

            span:nth-child(1) {
              display: inline-block;
              width: 82px;
            }
          }

          .correctBox {
            width: 100px;
            height: min-content;
            word-break: break-all;
            text-overflow: ellipsis;
            display: -webkit-box;
            -webkit-box-orient: vertical;
            -webkit-line-clamp: 1;
            /* 这里是超出几行省略 */
            overflow: hidden;
          }

          .error {
            display: flex;
            text-align: left;
            width: 170px;
            color: #ee1818;

            span {
              height: min-content;
            }

            .errorBox {
              width: 100px;
              // height: 48px;
              overflow: hidden;
              text-overflow: ellipsis;
              white-space: nowrap;

              ::v-deep {
                img {
                  max-height: 48px;
                }
              }
            }
          }
        }
      }

      .checkAnalysis {
        cursor: pointer;
        height: 100%;
        display: flex;
        align-items: center;
      }
    }
  }

  /deep/ .el-collapse-item__header:focus:not(:hover) {
    color: #333;
  }

  /deep/ .el-collapse-item__content {
    width: 93%;
    padding: 0 20px;
    background-color: #f4f4f4;
    font-size: 16px;
    color: #333;
  }

  /deep/ .el-collapse-item__arrow {
    display: none;
  }

  .subjectiveItem {
    background-color: #f4f4f4;
    padding: 10px 20px;

    p {
      text-indent: 0em;
    }
  }

  .subjective {
    /deep/ .el-collapse-item__header {
      height: 80px;
      background-color: #f4f4f4;
      width: 100%;
      padding: 0 20px;
      font-size: 16px;
      display: flex;
      flex-direction: column;
      justify-content: flex-start;
    }

    .subjectiveTitle {
      width: 80px;
      height: 20px;
      line-height: 20px;
    }

    .subjectiveRefer {
      display: flex;
      align-items: flex-start;
      text-align: left;
    }

    .subjectiveAnswer {
      width: 540px;
      height: 20px;
      text-align: left;
      word-break: break-all;
      text-overflow: ellipsis;
      display: -webkit-box;
      -webkit-box-orient: vertical;
      -webkit-line-clamp: 1;
      /* 这里是超出几行省略 */
      overflow: hidden;
      line-height: 20px;
    }

    .analysisDetailBox {
      overflow: hidden;
      max-height: 100px;
      transition: 1s;

      &.open {
        max-height: 500px;
      }

      &.close {
        max-height: 20px;
      }

      .referBox {
        display: flex;
        margin-bottom: 10px;

        span {
          width: 80px;
          color: #999;
        }

        p {
          flex: 1;
          overflow: hidden;
        }

        span,
        p {
          text-indent: 0em;
          font-size: 16px;
          line-height: 20px;
        }
      }
    }
  }

  // 选项
  .optionImg {
    height: min-content;
    margin-bottom: 6px;

    /deep/ img {
      margin-left: 10px;
      object-fit: contain;
      vertical-align: middle;
    }
  }

  .optionTxt {
    height: 32px;
  }

  // 题干仅图片
  .stemImg {
    margin: 0 10px 10px 10px;
  }

  // 文字加图片
  .stemTxtAndImage {
    display: flex;
    align-items: flex-start;
  }

  .titleTextArea {
    ::v-deep {
      img,
      .el-image__inner {
        max-width: 150px !important;
        max-height: 100px !important;
        object-fit: contain;
      }
    }
  }

  .questionAnalysis {
    width: 100%;
    height: 48px;
    display: flex;
    justify-content: space-between;

    .analysisAnswer {
      width: 74%;
      display: flex;
    }

    .referAnswer {
      display: inline-block;
      width: 60px;
    }

    .answerContent {
      height: 48px;
      width: 80%;
      text-align: left;
      word-break: break-all;
      text-overflow: ellipsis;
      display: -webkit-box;
      -webkit-box-orient: vertical;
      -webkit-line-clamp: 1;
      /* 这里是超出几行省略 */
      overflow: hidden;
    }

    .el-image {
      width: 9px;
      height: 9px;
    }
  }

  .analysisColor {
    cursor: pointer;
    color: #949494;
    margin-right: 4px;
  }

  .difficulty {
    display: flex;
    align-items: center;
  }

  .cartoon {
    animation: spread 1s linear forwards;
  }

  .downCartoon {
    animation: downSpred 1s linear forwards;
  }

  .showText {
    animation: showText 1s linear forwards;
  }

  .hideText {
    animation: hideText 2s linear forwards;
  }

  @keyframes spread {
    from {
      max-height: 20px;
    }

    to {
      max-height: 500px;

      p {
        flex: 1;
        overflow: hidden;
      }
    }
  }

  @keyframes downSpred {
    from {
      max-height: 500px;
    }

    to {
      max-height: 20px;
    }
  }

  @keyframes showText {
    100% {
      height: auto;
    }
  }

  @keyframes hideText {
    0% {
      height: auto;
    }

    100% {
      height: 20px;
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
    }
  }

  .yincang {
    animation: yincang 1s linear forwards;
  }

  @keyframes yincang {
    from {
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
    }

    to {
      overflow: auto;
      text-overflow: initial;
      white-space: pre-wrap;
    }
  }

  .bottom-btn {
    margin-top: 25px;
    display: flex;
    justify-content: center;
    flex-wrap: wrap;

    .el-button {
      margin-top: 10px;
    }
  }

  .radio-img {
    width: 200px;
    object-fit: contain;
  }

  .collect-png {
    cursor: pointer;
    width: 18px;
    object-fit: contain;
  }

  /deep/ .examination-math {
    display: flex;
    align-items: center;
    flex-wrap: wrap;
  }
}

 src/child.ts

@@ -77,6 +77,30 @@
    container: '#container',
    activeRule: '/home' //匹配所有以/subPath开头的为子应用
  },
  aviationBasicSkills:{
    name: 'app-content',
    entry: '//jsek.bnuic.com/books/book/aviationBasicSkills',
    container: '#container',
    activeRule: '/home' //匹配所有以/subPath开头的为子应用
  },
  aviationSafety:{
    name: 'app-content',
    entry: '//jsek.bnuic.com/books/book/aviationSafety',
    container: '#container',
    activeRule: '/home' //匹配所有以/subPath开头的为子应用
  },
  aviationEtiquette:{
    name: 'app-content',
    entry: '//jsek.bnuic.com/books/book/aviationEtiquette',
    container: '#container',
    activeRule: '/home' //匹配所有以/subPath开头的为子应用
  },
  toddlerGameImplementation:{
    name: 'app-content',
    entry: '//jsek.bnuic.com/books/book/toddlerGameImplementation',
    container: '#container',
    activeRule: '/home' //匹配所有以/subPath开头的为子应用
  },
  botany:{
    name: 'app-content',
    entry: '//182.92.203.7:3007/books/book/botany',

 src/qiankunState/state.ts

@@ -9,7 +9,7 @@
  renderSign: null,
  delSign:null,
  scale:100,
  fontSize:16,
  fontSize:null,
  bgColor:'#FBF9F4',
  disableSign:false,
  searchBookByKeyword: null,