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

YM

2024-05-15 1cb114b2c8d88c5e5a54eeb41746f5a16da58bc2

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

 src/assets/methods/examination.js

@@ -1,8 +1,7 @@
import { activeBook } from "@/assets/js/config";
import MG from "@/assets/js/middleGround/WebMiddleGroundApi";
import getPublicImage from '@/assets/js/middleGround/tool'
import getPublicImage from "@/assets/js/middleGround/tool";
const getQuestionList = (questionList) => {
  let questionArr = [];
  let cardList = [
    {
      catalogName: "单选题",
@@ -56,26 +55,33 @@
        const questionObj = {
          number: index + 1, // 题号
          id: item.id,
          stem: item.Embedded_QuestionBank_QuestionType == "completion" ?
            JSON.parse(item.Embedded_QuestionBank_Stem)
            .stemTxt.replaceAll("<vacancy>", ",input,")
            .split(",") : JSON.parse(item.Embedded_QuestionBank_Stem), // 题干
          stem:
            item.Embedded_QuestionBank_QuestionType == "completion"
              ? JSON.parse(item.Embedded_QuestionBank_Stem)
                  .stemTxt.replaceAll("<vacancy>", ",input,")
                  .split(",")
              : JSON.parse(item.Embedded_QuestionBank_Stem), // 题干
          answer: item.Embedded_QuestionBank_Answer, // 答案
          option: item.Embedded_QuestionBank_Option ?
            JSON.parse(item.Embedded_QuestionBank_Option) : "", // 选择题选项
          option: item.Embedded_QuestionBank_Option
            ? JSON.parse(item.Embedded_QuestionBank_Option)
            : "", // 选择题选项
          analysisCon: item.Embedded_QuestionBank_AnalysisCon, // 解析
          questionType: item.Embedded_QuestionBank_QuestionType, // 题型
          optionStyle: item.Embedded_QuestionBank_OptionStyle, // 选项显示类型
          stemStyle: item.Embedded_QuestionBank_StemStyle, // 题干显示类型
          difficulty: item.Embedded_QuestionBank_Difficulty ?
            4 - item.Embedded_QuestionBank_Difficulty : 0, // 难度等级
          userAnswer: item.Embedded_QuestionBank_QuestionType == "completion" ||
            item.Embedded_QuestionBank_QuestionType == "multipleChoice" ? [] : "",
          difficulty: item.Embedded_QuestionBank_Difficulty
            ? 4 - item.Embedded_QuestionBank_Difficulty
            : 0, // 难度等级
          userAnswer:
            item.Embedded_QuestionBank_QuestionType == "completion" ||
            item.Embedded_QuestionBank_QuestionType == "multipleChoice"
              ? []
              : "",
          isSubmit: false, // 查看解析
          isRight: null, // 是否正确
          isComplete: false,
          isCollect: true,
          isUnfold:''
          isUnfold: "",
        };
        // 多选和填空答案肯为数组，要转换JSON格式
        if (
@@ -130,7 +136,8 @@
              /\<img/gi,
              '<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
            )
            .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
            .replace(/\<p/gi, '<p class="stem-rich-p"')
            .replace("../file", app.config.requestCtx + "/file");
        }
        // 选项富文本处理
        if (
@@ -142,8 +149,9 @@
          questionObj.option.forEach((item) => {
            if (item.txt)
              item.txt = item.txt
              .replace(/\<img/gi, '<img class="option-rich-img"')
              .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
                .replace(/\<img/gi, '<img class="option-rich-img"')
                .replace(/\<p/gi, '<p class="stem-rich-p"')
                .replace("../file", app.config.requestCtx + "/file");
          });
        }
        // 解析富文本处理
@@ -167,9 +175,7 @@
        if (item.Embedded_QuestionBank_QuestionType == "judge") {
          questionObj.type = "判断题";
          judgeArr.push(questionObj);
        } else if (
          item.Embedded_QuestionBank_QuestionType == "singleChoice"
        ) {
        } else if (item.Embedded_QuestionBank_QuestionType == "singleChoice") {
          questionObj.type = "单选题";
          singleChoiceArr.push(questionObj);
        } else if (
@@ -197,18 +203,17 @@
    for (let cindex = 0; cindex < item.infoList.length; cindex++) {
      const citem = item.infoList[cindex];
      citem.number = cindex + 1;
      questionArr.push(citem);
    }
  }
  return cardList
  return cardList;
};

const getQuestionData = (chapterData) => {
  const data = {...chapterData}
  for(let key in chapterData) {
    data[key] =  getQuestionList(chapterData[key])
  const data = { ...chapterData };
  for (let key in chapterData) {
    data[key] = getQuestionList(chapterData[key]);
  }
  return data
}
  return data;
};

export default getQuestionData;

 src/books/childHealth/assets/main.less

@@ -592,9 +592,6 @@
    font-size: 16px;
    font-family: "STKaiti";
  }
  textarea:focus {
    border-color: red;
  }
}

body {

 src/books/childHealth/view/components/examinations/index.vue

File was deleted

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

@@ -3428,8 +3428,8 @@
    };
  },
  mounted() {
    console.log('数据',testData[1]);
    this.$data.questionData = getQuestionData(testData[1])
    console.log('题目',this.$data.questionData );
    this.$data.pathOne = getResourcePath('f6f6588a75086576b87bed2fb9ca1ec1')
    this.$data.pathTwo = getResourcePath('e5993b62684fe55d13190cfe52bf00ed')
    this.$data.pathThree = getResourcePath('6b6d42213aa85aa5ff7724aaf96ffee6')
@@ -3449,7 +3449,6 @@
        this.$data.videoOne = !this.$data.videoOne;
      } else if (type == "testOne") {
        this.$data.testOne = !this.$data.testOne;
        this.getQuestionList();
      } else if(type == 'learnTableTwo') {
        this.$data.learnTableTwo = !this.$data.learnTableTwo
      }else if(type == 'learnTableThree') {
@@ -3468,13 +3467,13 @@
        this.$data.learnTableNine = !this.$data.learnTableNine
      }
    },
    getQuestionList() {
      const testData = this.$store.state.testList.find(
        (item) => item.name == "专题一总论 人体概述测验题"
      );
      this.$data.productLinkPath = testData.productLinkPath;
      if (this.$refs.examinationOne) this.$refs.examinationOne.getIdPathList();
    },
    // getQuestionList() {
    //   const testData = this.$store.state.testList.find(
    //     (item) => item.name == "专题一总论 人体概述测验题"
    //   );
    //   this.$data.productLinkPath = testData.productLinkPath;
    //   if (this.$refs.examinationOne) this.$refs.examinationOne.getIdPathList();
    // },
  },
};
</script>

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

@@ -1,5 +1,5 @@
<template>
  <div class="chapter" :num="12">
  <div class="chapter" num="12">
    <div class="page-box" page="276">
      <div class="padding-96">
        <p class="center" id="a018">
@@ -78,14 +78,22 @@
</template>

<script>
import oddHeader from '../../components/pageHeader/oddHeader.vue';
import oddHeader from "../../components/pageHeader/oddHeader.vue";
export default {
  name: "chapterTwelve",
  components: {oddHeader},
  components: { oddHeader },
  data() {
    return {};
  },
};
</script>

<style lang="less" scoped></style>
<style lang="less" scoped>
p {
  line-height: 2em !important;
  text-align: justify !important;
}
a {
  text-decoration: none;
}
</style>

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

@@ -1,5 +1,5 @@
<template>
  <div class="chapter" :num="13">
  <div class="chapter" num="13">
    <div class="page-box" page="278">
      <div class="padding-96">
        <p class="center" id="a019">

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

@@ -1,5 +1,5 @@
<template>
  <div class="page-header">
  <div class="chapter" num="0">
    <!-- 封面 -->
    <div class="page-box cover">
      <img src="../../../assets/images/Cover.jpg" alt="" />
@@ -8,7 +8,7 @@
      <img alt="" class="imz" src="../assets/images/SMY.jpg" />
    </p> -->
    <!-- 版权页 -->
    <div class="page-box text-center" style="padding: 136px 0" page="-5">
    <div class="page-box text-center" style="padding: 136px 0" page="-5" >
      <div class="box">
        <hr class="line" />
        <p class="tl fz-14"><b>图书在版编目（CIP）数据</b></p>

 src/books/childHealth/view/index.vue

@@ -5,15 +5,11 @@
</template>

<script>
import examinations from "./components/examinations/index.vue";
import pageContent from "./content/index.vue";
// import testData from '../assets/examinationList'
// import getQuestionData from '@/assets/methods/examination'
export default {
  name: "child-health",
  components: {
    pageContent,
    examinations
  },
  data() {
    return {
@@ -67,15 +63,6 @@
        console.log("图书信息",res.datas); 
        this.$data.bookData =  res.datas
        this.$store.commit('setRootCmsItemId',res.datas.rootCmsItemId)
        // const questiondata = testData
        // for(let key in testData) {
        //   for(let tkey in testData[key]) {
        //     console.log(testData[key][tkey]);
        //     questiondata[key][tkey]  = getQuestionData(res.datas.rootCmsItemId,testData[key][tkey])
        //   }
        // }
        // this.$store.commit('setQuestionData',questiondata)
        // console.log(questiondata);
      });
    },
    getParentWithClass(element, className) {

 src/components/examinations/index.vue

@@ -778,6 +778,9 @@
  // display: flex;
  // justify-content: center;
  margin-left: 20px;
  /deep/ .el-textarea__inner:focus {
    border-color: #15c0f2;
  }
}
.input {
  /deep/ .el-input__inner {