Merge branch 'master' of http://60.205.254.193:3000/GCLS/GCLS_Page_Book_Component_NPC

src/components/Adult/common/DuoSentenceSegwordChs/components/DuoSegbywordChs.vue

@@ -107,7 +107,7 @@
           <div class="NPC-words-box">
             <span class="adult-book-lable">校对拼音：</span>
             <div class="NPC-words-list">
-              <SegwordConfig :data="curQue.wordsList[sentenceIndex]" />
+              <SegwordConfig :data="curQue.wordsList[sentenceIndex]" :curQue="curQue" />
             </div>
             <div class="yunmu">
               <span>点击可复制</span>
@@ -270,28 +270,28 @@ export default {
     },
     //生成拼音
     _createPinyin() {
-      let _this = this;
-      let sent_arr = this.sent_str.split(/\s+/);
-      let res_str = "";
-      sent_arr.forEach((item) => {
-        if (item) {
-          let bool = this.checkEn(item);
-          if (bool) {
-            res_str += item.trim() + " ";
-          } else if (item == "(") {
-            res_str += " " + item.trim() + " ";
-          } else if (item == ")") {
-            res_str += " " + item.trim() + " ";
-          } else {
-            res_str += item.trim();
-          }
-        }
-      });
-      res_str = res_str.replace(/\s+/g, "");
-      if (res_str.trim() != this.sent_org.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   let _this = this;
+    //   let sent_arr = this.sent_str.split(/\s+/);
+    //   let res_str = "";
+    //   sent_arr.forEach((item) => {
+    //     if (item) {
+    //       let bool = this.checkEn(item);
+    //       if (bool) {
+    //         res_str += item.trim() + " ";
+    //       } else if (item == "(") {
+    //         res_str += " " + item.trim() + " ";
+    //       } else if (item == ")") {
+    //         res_str += " " + item.trim() + " ";
+    //       } else {
+    //         res_str += item.trim();
+    //       }
+    //     }
+    //   });
+    //   res_str = res_str.replace(/\s+/g, "");
+    //   if (res_str.trim() != this.sent_org.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.sent_str.split(/\s+/);
       let seg_word = this.sent_str.replace(/\s+/g, " ");

src/components/Adult/common/LigatureModule.vue

@@ -66,7 +66,7 @@
               src="../../../assets/adult/del-close.png"
               alt=""
             /> -->
-            <SentenceSegwordChs :curQue="curQueItem.detail" />
+            <SentenceSegwordChs :curQue="curQueItem.detail" :type="modelType" />
           </div>
           <div class="adult-book-input-item">
             <Upload
@@ -142,7 +142,7 @@
               src="../../../assets/adult/del-close.png"
               alt=""
             /> -->
-            <SentenceSegwordChs :curQue="curQueItem.detail" />
+            <SentenceSegwordChs :curQue="curQueItem.detail" :type="modelType"/>
           </div>
           <div class="adult-book-input-item">
             <Upload
@@ -169,7 +169,7 @@ export default {
     Upload,
     SentenceSegwordChs,
   },
-  props: ["curQueItem", "index", "deleteOptionOne", "type"],
+  props: ["curQueItem", "index", "deleteOptionOne", "type", "modelType"],
   data() {
     return {
       imgNumber: 1,

src/components/Adult/common/SegwordConfig.vue

@@ -1,6 +1,28 @@
 <!--  -->
 <template>
   <div class="seg-word-config">
+    <div class="adult-book-input-item" v-if="curQue&&type!='sentence_segtemp_chs'&&type!='sort_chs'&&type!='CourseStart_chs'&&type!='ligature_chs'" style="margin-top:10px">
+        <span class="adult-book-lable">字的大小:</span>
+        <el-radio-group v-model="curQue.resetFontsize" @input="changeResetFontsize">
+            <el-radio label="12px">12px</el-radio>
+            <el-radio label="16px">16px</el-radio>
+            <el-radio label="20px">20px</el-radio>
+            <el-radio label="24px">24px</el-radio>
+            <el-radio label="28px">28px</el-radio>
+        </el-radio-group>
+    </div>
+    <div class="adult-book-input-item" v-if="curQue&&type!='sentence_segtemp_chs'&&type!='sort_chs'&&type!='CourseStart_chs'&&type!='ligature_chs'">
+            <span class="adult-book-lable">字体:</span>
+            <el-radio-group v-model="curQue.resetFontfamily" @input="changeResetFontfamily">
+              <el-radio
+                v-for="(item, index) in fontFamilyList"
+                :key="'fontFamilyList' + index"
+                :label="item.value"
+              >
+                <span>{{ item.name }}</span>
+              </el-radio>
+            </el-radio-group>
+          </div>
     <el-table :data="data" border style="width: 75%">
       <el-table-column prop="chs" label="词" width="120"> </el-table-column>
       <el-table-column label="拼音" width="220">
@@ -19,7 +41,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="配置">
+      <el-table-column label="配置" v-if="type!='sort_chs'&&type!='CourseStart_chs'&&type!='ligature_chs'">
         <template slot-scope="scope">
           <div class="adult-book-input-item">
             <span class="adult-book-lable">字的大小:</span>
@@ -31,7 +53,7 @@
               <el-radio label="28px">28px</el-radio>
             </el-radio-group>
           </div>
-          <div class="adult-book-input-item">
+          <!-- <div class="adult-book-input-item">
             <span class="adult-book-lable">字的颜色:</span>
             <el-radio-group v-model="scope.row.fontColor">
               <el-radio
@@ -48,7 +70,7 @@
                 >
               </el-radio>
             </el-radio-group>
-          </div>
+          </div> -->
           <div class="adult-book-input-item">
             <span class="adult-book-lable">字体:</span>
             <el-radio-group v-model="scope.row.fontFamily">
@@ -65,7 +87,7 @@
             <span class="adult-book-lable">设置下划线:</span>
             <el-checkbox v-model="scope.row.underLine">显示下划线</el-checkbox>
           </div>
-          <div class="adult-book-input-item">
+          <div class="adult-book-input-item" v-if="type!='dialogue_answer_chs'&&type!='sentence_input_chs'&&type!='sentence_judge_chs'&&type!='sentence_record_chs'&&type!='sentence_input_record_chs'&&type!='sentence_listen_read_chs'">
             <span class="adult-book-lable">设置间距:</span>
             <el-checkbox-group v-model="scope.row.wordPadding">
               <el-checkbox
@@ -88,7 +110,7 @@ import "@/utils/pinyin_dict_withtone";
 import "@/utils/pinyinUtil";
 export default {
   components: {},
-  props: ["data"],
+  props: ["data", "type", "curQue"],
   data() {
     return {
       colorList: [
@@ -138,11 +160,30 @@ export default {
       let result = pinyinUtil.getPinyin(item.chs);
       item.pinyin = result;
     },
+    changeResetFontsize(value){
+        this.data.forEach(item => {
+            item.fontSize = value
+        });
+    },
+    changeResetFontfamily(value){
+        this.data.forEach(item => {
+            item.fontFamily = value
+        });
+    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {},
+  mounted() {
+    if(this.curQue){
+        if (!this.curQue.hasOwnProperty("resetFontsize")) {
+            this.$set(this.curQue, "resetFontsize", '');
+        }
+        if (!this.curQue.hasOwnProperty("resetFontfamily")) {
+            this.$set(this.curQue, "resetFontfamily", 'FZJCGFKTK');
+        }
+    }
+  },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前

src/components/Adult/common/SentenceModule.vue

@@ -24,7 +24,7 @@
     </div>
 
     <div class="NPC-sentence-Segword" v-if="type != 'recordHZ_inputPY_chs'">
-      <SentenceSegwordChs :curQue="curQueItem.detail" />
+      <SentenceSegwordChs :curQue="curQueItem.detail" :type="type"/>
       <div class="adult-book-input-item">
         <span class="adult-book-lable"></span>
         <span v-if="curQue.wordTime&&curQue.wordTime.length > 0" class="lrc">
@@ -131,13 +131,13 @@
                 maxlength="200"
                 show-word-limit
               ></el-input>
-              <div class="adult-book-del-icon" @click="delAnswer(ansIndex)">
+              <!-- <div class="adult-book-del-icon" @click="delAnswer(ansIndex)">
                 <i class="el-icon-circle-close"></i>
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
-        <div class="adult-book-input-item" style="padding-left: 80px">
+        <!-- <div class="adult-book-input-item" style="padding-left: 80px">
           <el-button
             size="mini"
             type="primary"
@@ -145,7 +145,7 @@
             @click="addAnswer"
             >添加答案</el-button
           >
-        </div>
+        </div> -->
       </template>
     </div>
     <div v-for="(item, i) in fn_list" :key="i + 'judge'">
@@ -307,6 +307,14 @@ export default {
     if (this.curQueItem) {
       this.fileCon.img_list = this.curQueItem.img_list;
       this.fileCon.mp3_list = this.curQueItem.mp3_list;
+      if (!this.curQueItem.hasOwnProperty("con")) {
+        this.$set(this.curQueItem, "con", '');
+      }
+      if(this.type=='recordHZ_inputPY_chs'){
+        if(Object.prototype.toString.call(this.curQueItem.answer)=='[object Array]'){
+            this.$set(this.curQueItem, "answer", '');
+        }
+      }
     }
   },
   beforeCreate() {}, //生命周期 - 创建之前

src/components/Adult/common/SentenceSegTemp.vue

@@ -74,7 +74,7 @@
         >
       </div>
       <template>
-        <SentenceSegwordChs :curQue="dItem" :segModel="segModel" name="元素" />
+        <SentenceSegwordChs :curQue="dItem" :segModel="segModel" name="元素" :type="type" />
       </template>
       <template>
         <div class="adult-book-input-item adult-book-input-item-center">
@@ -105,7 +105,7 @@
             <el-radio label="28px">28px</el-radio>
           </el-radio-group>
         </div>
-        <div class="adult-book-input-item adult-book-input-item-center">
+        <!-- <div class="adult-book-input-item adult-book-input-item-center">
           <span class="adult-book-lable">字的颜色:</span>
           <el-radio-group v-model="dItem.config.fontColor">
             <el-radio
@@ -122,7 +122,7 @@
               >
             </el-radio>
           </el-radio-group>
-        </div>
+        </div> -->
 
         <div class="adult-book-input-item adult-book-input-item-center">
           <span class="adult-book-lable">设置间距:</span>
@@ -174,7 +174,7 @@ export default {
     SentenceSegwordChs,
     FnConfig,
   },
-  props: ["detail", "segModel"],
+  props: ["detail", "segModel", "type"],
   data() {
     return {
       inputLegOptions: [

src/components/Adult/common/SentenceSegwordChs/components/SegbywordChs.vue

@@ -66,7 +66,7 @@
           <div class="NPC-words-box">
             <span class="adult-book-lable">校对拼音：</span>
             <div class="NPC-words-list">
-              <SegwordConfig :data="curQue.wordsList" />
+              <SegwordConfig :data="curQue.wordsList" :type="type" :curQue="curQue" />
             </div>
 
             <div class="yunmu">
@@ -107,7 +107,7 @@ import SegwordConfig from "../../SegwordConfig.vue";
 export default {
   name: "SentenceSegbywordChs",
   components: { SegwordConfig },
-  props: ["curQue", "segList", "segModel"],
+  props: ["curQue", "segList", "segModel","type"],
   data() {
     return {
       proofVisible: false,
@@ -205,10 +205,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.curQue.sentence;
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.curQue.seg_words.split(/\s+/);
       this.$set(this.curQue, "segList", arr);

src/components/Adult/common/SentenceSegwordChs/index.vue

@@ -21,6 +21,7 @@
         :segList="segList"
         :segModel="segModel"
         @changeIsByWord="changeIsByWord"
+        :type="type"
       />
     </div>
   </div>
@@ -45,6 +46,7 @@ export default {
     "segModel",
     "isShowlabel",
     "name",
+    "type"
   ],
   data() {
     return {

src/components/Adult/common/SentenceSegwordChs2/components/SegbywordChs.vue

@@ -185,10 +185,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.curQue.sentence;
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.curQue.seg_words.split(/\s+/);
       this.$set(this.curQue, "segList", arr);

src/components/Adult/inputModules/ArticleTemChs/components/SegbywordChs.vue

@@ -271,10 +271,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.paraCon.sentences[sentIndex];
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
       this.$set(this.paraCon.segList, sentIndex, arr);
       let wordsList = [];
@@ -309,10 +309,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.paraCon.sentences[sentIndex];
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
       this.$set(this.paraCon.segList, sentIndex, arr);

src/components/Adult/inputModules/CourseStart.vue

@@ -26,7 +26,7 @@
         ></el-input>
       </div>
       <div>
-        <SentenceSegwordChs :curQue="curQue.detail" />
+        <SentenceSegwordChs :curQue="curQue.detail" :type="type" />
       </div>
       <div class="adult-book-input-item">
         <span class="adult-book-lable">英文：</span>

src/components/Adult/inputModules/DialogueAnswerChs/index.vue

@@ -68,7 +68,7 @@
     </div>
 
     <el-dialog
-      title="添加对话22"
+      title="添加对话"
       :close-on-click-modal="false"
       :modal-append-to-body="false"
       append-to-body
@@ -76,7 +76,7 @@
       width="80%"
       top="10px"
     >
-      <DialogueTem :curQue="curQue.list[listIndex]" :listIndex="listIndex" />
+      <DialogueTem :curQue="curQue.list[listIndex]" :listIndex="listIndex" :type="curQue.type" />
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancleDialogue">取 消</el-button>
         <el-button type="primary" @click="cancleDialogue">确 定</el-button>

src/components/Adult/inputModules/DialogueArticleChs/components/RoleChs.vue

@@ -128,10 +128,10 @@ export default {
     _createPinyin() {
       let res_str = this.curRole.detail.seg_words.replace(/\s+/g, "");
       let org_sent = this.curRole.detail.fullName;
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let segArr = JSON.parse(JSON.stringify(this.curRole.detail.segList));
       segArr.forEach((item) => {

src/components/Adult/inputModules/DialogueArticleChs/components/SegbywordChs.vue

@@ -271,10 +271,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.paraCon.sentences[sentIndex];
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
       this.$set(this.paraCon.segList, sentIndex, arr);
       let wordsList = [];
@@ -308,10 +308,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.paraCon.sentences[sentIndex];
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
       this.$set(this.paraCon.segList, sentIndex, arr);

src/components/Adult/inputModules/DialogueTem/components/RoleChs.vue

@@ -122,10 +122,10 @@ export default {
     _createPinyin() {
       let res_str = this.curRole.detail.seg_words.replace(/\s+/g, "");
       let org_sent = this.curRole.detail.fullName;
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let segArr = JSON.parse(JSON.stringify(this.curRole.detail.segList));
       segArr.forEach((item) => {

src/components/Adult/inputModules/DialogueTem/components/SegbywordChs.vue

@@ -98,7 +98,7 @@
           <div class="NPC-words-box">
             <span class="Big-Book-left-text">校对拼音：</span>
             <div class="NPC-words-list">
-              <SegwordConfig :data="paraCon.wordsList[sentIndex]" />
+              <SegwordConfig :data="paraCon.wordsList[sentIndex]" :type="type" :curQue="paraCon" />
             </div>
             <div class="yunmu">
               <span>点击可复制</span>
@@ -136,7 +136,7 @@ import SegwordConfig from "../../../common/SegwordConfig.vue";
 export default {
   name: "SegbywordChs",
   components: { SegwordConfig },
-  props: ["curQue", "paraIndex", "createPinyin", "segList"],
+  props: ["curQue", "paraIndex", "createPinyin", "segList", "type"],
   data() {
     return {
       proofParaIndex: 0, //校对句子所属的段落
@@ -240,28 +240,28 @@ export default {
     //确定分词结果
     _sureSegWord() {
       let sentIndex = this.sentIndex;
-      let sent_arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
-      let res_str = "";
-      sent_arr.forEach((item) => {
-        if (item) {
-          let bool = this.checkEn(item);
-          if (bool) {
-            res_str += item.trim() + " ";
-          } else if (item == "(") {
-            res_str += " " + item.trim() + " ";
-          } else if (item == ")") {
-            res_str += " " + item.trim() + " ";
-          } else {
-            res_str += item.trim();
-          }
-        }
-      });
-      res_str = res_str.replace(/\s+/g, " ");
-      let org_sent = this.paraCon.sentences[sentIndex];
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   let sent_arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
+    //   let res_str = "";
+    //   sent_arr.forEach((item) => {
+    //     if (item) {
+    //       let bool = this.checkEn(item);
+    //       if (bool) {
+    //         res_str += item.trim() + " ";
+    //       } else if (item == "(") {
+    //         res_str += " " + item.trim() + " ";
+    //       } else if (item == ")") {
+    //         res_str += " " + item.trim() + " ";
+    //       } else {
+    //         res_str += item.trim();
+    //       }
+    //     }
+    //   });
+    //   res_str = res_str.replace(/\s+/g, " ");
+    //   let org_sent = this.paraCon.sentences[sentIndex];
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
       this.$set(this.paraCon.segList, sentIndex, arr);
       let wordsList = [];
@@ -282,28 +282,28 @@ export default {
     //生成拼音
     _createPinyin() {
       let sentIndex = this.sentIndex;
-      let sent_arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
-      let res_str = "";
-      sent_arr.forEach((item) => {
-        if (item) {
-          let bool = this.checkEn(item);
-          if (bool) {
-            res_str += item.trim() + " ";
-          } else if (item == "(") {
-            res_str += " " + item.trim() + " ";
-          } else if (item == ")") {
-            res_str += " " + item.trim() + " ";
-          } else {
-            res_str += item.trim();
-          }
-        }
-      });
-      res_str = res_str.replace(/\s+/g, " ");
-      let org_sent = this.paraCon.sentences[sentIndex];
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   let sent_arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
+    //   let res_str = "";
+    //   sent_arr.forEach((item) => {
+    //     if (item) {
+    //       let bool = this.checkEn(item);
+    //       if (bool) {
+    //         res_str += item.trim() + " ";
+    //       } else if (item == "(") {
+    //         res_str += " " + item.trim() + " ";
+    //       } else if (item == ")") {
+    //         res_str += " " + item.trim() + " ";
+    //       } else {
+    //         res_str += item.trim();
+    //       }
+    //     }
+    //   });
+    //   res_str = res_str.replace(/\s+/g, " ");
+    //   let org_sent = this.paraCon.sentences[sentIndex];
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.paraCon.seg_words[sentIndex].sent_str.split(/\s+/);
       this.$set(this.paraCon.segList, sentIndex, arr);
@@ -383,7 +383,7 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     console.log("segList");
-    console.log(this.segList);
+    console.log(this.paraCon);
     this.getParaSegWordsResult();
   },
   beforeCreate() {}, //生命周期 - 创建之前

src/components/Adult/inputModules/DialogueTem/index.vue

@@ -146,6 +146,7 @@
           :curQue="curQue"
           :paraIndex="paraIndex"
           :segList="segList"
+          :type="type"
           v-if="isByWord"
         />
       </div>

src/components/Adult/inputModules/Ligature.vue

@@ -38,6 +38,7 @@
               :index="index"
               :deleteOptionOne="deleteOptionOne"
               :type="'con'"
+              :modelType="type"
             />
           </div>
           <div class="addoption" @click="addOption('con')">添加问题</div>
@@ -62,6 +63,7 @@
               :index="index"
               :deleteOptionOne="deleteOptionOne"
               :type="'option'"
+              :modelType="type"
             />
           </div>
           <div class="addoption" @click="addOption('option')">添加选项</div>
@@ -99,7 +101,7 @@ import LigatureModule from "../common/LigatureModule.vue";
 
 export default {
   name: "Single",
-  props: ["curQue", "fn_data", "changeCurQue"],
+  props: ["curQue", "fn_data", "changeCurQue", "type"],
   components: {
     LigatureModule,
   },

src/components/Adult/inputModules/Sentence.vue

@@ -195,8 +195,9 @@ export default {
               seg_words: "",
               wordsList: [],
             },
+            con: "", // 内容
             en: "", //英文
-            answer: [],
+            answer: [''],
             judge: true,
           },
         ],

src/components/Adult/inputModules/SentenceModule.vue

@@ -525,7 +525,7 @@
       :visible.sync="addStemVisible"
       width="50%"
     >
-      <SentenceSegTemp :detail="optionItemDetail" :segModel="curQue.segModel" />
+      <SentenceSegTemp :detail="optionItemDetail" :segModel="curQue.segModel" :type="type" />
       <span slot="footer" class="dialog-footer">
         <el-button @click="addStemVisible = false">取 消</el-button>
         <el-button type="primary" @click="saveOptionDetail">确 定</el-button>
@@ -572,7 +572,7 @@ export default {
     SentenceSegTemp,
     Wordcard,
   },
-  props: ["curQue", "changeCurQue", "tmIndex"],
+  props: ["curQue", "changeCurQue", "tmIndex", "type"],
   filters: {
     getFnName(type, fn_list) {
       let name = "";

src/components/Adult/inputModules/SentenceSegwordChs/components/SegbywordChs.vue

@@ -184,10 +184,10 @@ export default {
       });
       res_str = res_str.replace(/\s+/g, " ");
       let org_sent = this.curQue.sentence;
-      if (res_str.trim() != org_sent.trim()) {
-        this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
-        return;
-      }
+    //   if (res_str.trim() != org_sent.trim()) {
+    //     this.$message.warning("跟原句不一致，请检查是否误删除或新增其他内容");
+    //     return;
+    //   }
       let textListList = [];
       let arr = this.curQue.seg_words.split(/\s+/);
       this.$set(this.curQue, "segList", arr);

src/components/Adult/inputModules/Sort.vue

@@ -25,7 +25,7 @@
         style="border-bottom: 1px #ccc solid; margin-bottom: 20px"
       >
         <div class="NPC-sentence-Segword" style="position: relative">
-          <SentenceSegwordChs :curQue="item.detail" />
+          <SentenceSegwordChs :curQue="item.detail" :type="type" />
           <img
             style="position: absolute; right: 202px;top: 0;"
             @click="deleteOption(index)"

src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -99,7 +99,7 @@
                                   ? 'NNPE-chs-underline'
                                   : '',
                               ]"
-                              :style="{ fontSize: pItem.config.fontSize }"
+                              :style="hengStyle(pItem.config)"
                               >{{ pItem.chs }}</span
                             >
                           </template>
@@ -115,7 +115,7 @@
                                 class="answer-input userRight"
                                 v-model="curQue.answerArr[pItem.hengIndex - 1]"
                                 :canEdit="false"
-                                :style="hengStyle(pItem.config.fontSize)"
+                                :style="hengStyle(pItem.config)"
                               />
                             </template>
                             <template v-else>
@@ -151,7 +151,7 @@
                                 "
                                 :hengIndex="pItem.hengIndex - 1"
                                 @saveBlankTF="saveBlankTF"
-                                :style="hengStyle(pItem.config.fontSize)"
+                                :style="hengStyle(pItem.config)"
                               />
                             </template>
                           </template>
@@ -198,7 +198,7 @@
                                 ? 'wordActive'
                                 : '',
                             ]"
-                            :style="{ fontSize: pItem.config.fontSize }"
+                            :style="hengStyle(item.wordsList[pIndex + 1].config)"
                             >{{ item.wordsList[pIndex + 1].chs }}</span
                           >
 
@@ -264,7 +264,7 @@
                                 ? 'wordActive'
                                 : '',
                             ]"
-                            :style="{ fontSize: pItem.config.fontSize }"
+                            :style="hengStyle(item.wordsList[pIndex + 2].config)"
                             >{{ item.wordsList[pIndex + 2].chs }}</span
                           >
                           <span
@@ -319,7 +319,7 @@
                                 ? 'NNPE-chs-underline'
                                 : '',
                             ]"
-                            :style="{ fontSize: pItem.config.fontSize }"
+                            :style="hengStyle(pItem.config)"
                             >{{ pItem.chs }}</span
                           >
                         </template>
@@ -335,7 +335,7 @@
                               class="answer-input userRight"
                               v-model="curQue.answerArr[pItem.hengIndex - 1]"
                               :canEdit="false"
-                              :style="hengStyle(pItem.config.fontSize)"
+                              :style="hengStyle(pItem.config)"
                             />
                           </template>
                           <template v-else>
@@ -371,7 +371,7 @@
                               "
                               :hengIndex="pItem.hengIndex - 1"
                               @saveBlankTF="saveBlankTF"
-                              :style="hengStyle(pItem.config.fontSize)"
+                              :style="hengStyle(pItem.config)"
                             />
                           </template>
                         </template>
@@ -510,7 +510,7 @@
                         class="answer-input userRight"
                         v-model="curQue.answerArr[pItem.hengIndex - 1]"
                         :canEdit="false"
-                        :style="hengStyle(pItem.config.fontSize)"
+                        :style="hengStyle(pItem.config)"
                       />
                     </template>
                     <template v-else>
@@ -541,7 +541,7 @@
                         "
                         :hengIndex="pItem.hengIndex - 1"
                         @saveBlankTF="saveBlankTF"
-                        :style="hengStyle(pItem.config.fontSize)"
+                        :style="hengStyle(pItem.config)"
                       />
                     </template>
                   </template>
@@ -725,12 +725,13 @@ export default {
       };
     },
     hengStyle() {
-      return function (fontSize) {
-        let sizeVal = fontSize.replace("px", "");
+      return function (config) {
+        let sizeVal = config.fontSize.replace("px", "");
         return {
           minHeight: Number(sizeVal) + 9 + "px",
           lineHeight: Number(sizeVal) + 8 + "px",
-          fontSize: fontSize,
+          fontSize: config.fontSize,
+          fontFamily: config.fontFamily
         };
       };
     },

src/components/Adult/preview/InputHasRecord.vue

@@ -50,7 +50,7 @@
                         ]"
                         >{{ itemCon.pinyin }}</span
                       >
-                      <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                      <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                       <span
                         v-if="items.detail.pyPosition == 'bottom'"
                         class="pinyin"
@@ -73,7 +73,7 @@
                         ]"
                         >{{ items.detail.wordsList[indexCon + 1].pinyin }}</span
                       >
-                      <span class="hanzi content-con">{{
+                      <span class="hanzi content-con" :style="wordStyle(items.detail.wordsList[indexCon + 1].config)">{{
                         items.detail.wordsList[indexCon + 1].chs
                       }}</span>
                       <span
@@ -100,7 +100,7 @@
                     ]"
                     >{{ itemCon.pinyin }}</span
                   >
-                  <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                  <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                   <span
                     v-if="items.detail.pyPosition == 'bottom'"
                     class="pinyin"
@@ -213,7 +213,7 @@
                               ]"
                               >{{ itemCon.pinyin }}</span
                             >
-                            <span class="hanzi content-con">{{
+                            <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{
                               itemCon.chs
                             }}</span>
                             <span
@@ -242,7 +242,7 @@
                                 items.detail.wordsList[indexCon + 1].pinyin
                               }}</span
                             >
-                            <span class="hanzi content-con">{{
+                            <span class="hanzi content-con" :style="wordStyle(items.detail.wordsList[indexCon + 1].config)">{{
                               items.detail.wordsList[indexCon + 1].chs
                             }}</span>
                             <span
@@ -271,7 +271,7 @@
                           ]"
                           >{{ itemCon.pinyin }}</span
                         >
-                        <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                        <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                         <span
                           v-if="items.detail.pyPosition == 'bottom'"
                           class="pinyin"
@@ -370,7 +370,7 @@
                           ]"
                           >{{ itemCon.pinyin }}</span
                         >
-                        <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                        <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                         <span
                           v-if="items.detail.pyPosition == 'bottom'"
                           class="pinyin"
@@ -395,7 +395,7 @@
                             items.detail.wordsList[indexCon + 1].pinyin
                           }}</span
                         >
-                        <span class="hanzi content-con">{{
+                        <span class="hanzi content-con" :style="wordStyle(items.detail.wordsList[indexCon + 1].config)">{{
                           items.detail.wordsList[indexCon + 1].chs
                         }}</span>
                         <span
@@ -424,7 +424,7 @@
                       ]"
                       >{{ itemCon.pinyin }}</span
                     >
-                    <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                    <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                     <span
                       v-if="items.detail.pyPosition == 'bottom'"
                       class="pinyin"
@@ -503,7 +503,22 @@ export default {
       userErrList: [],
     };
   },
-  computed: {},
+  computed: {
+    wordStyle() {
+      return function (config) {
+        if(config){
+            let sizeVal = config.fontSize.replace("px", "");
+            return {
+                minHeight: Number(sizeVal) + 9 + "px",
+                lineHeight: Number(sizeVal) + 8 + "px",
+                fontSize: config.fontSize,
+                fontFamily: config.fontFamily
+            };
+        }
+        
+      };
+    },
+  },
   watch: {},
   //方法集合
   methods: {
@@ -553,6 +568,13 @@ export default {
             pinyin: sItem.pinyin,
             chs: sItem.chs,
             isShow: sItem.isShow,
+            config: {
+                fontColor: sItem.fontColor,
+                fontFamily: sItem.fontFamily,
+                fontSize: sItem.fontSize,
+                underLine: sItem.underLine,
+                wordPadding: sItem.wordPadding,
+            },
           };
           paraArr.push(obj);
         });

src/components/Adult/preview/SentenceInput.vue

@@ -71,7 +71,7 @@
                           ]"
                           >{{ itemCon.pinyin }}</span
                         >
-                        <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                        <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                       </div>
                       <div style="text-align: left">
                         <span
@@ -87,7 +87,7 @@
                             items.detail.wordsList[indexCon + 1].pinyin
                           }}</span
                         >
-                        <span class="hanzi content-con">{{
+                        <span class="hanzi content-con" :style="wordStyle(items.detail.wordsList[indexCon + 1].config)">{{
                           items.detail.wordsList[indexCon + 1].chs
                         }}</span>
                       </div>
@@ -101,7 +101,7 @@
                       ]"
                       >{{ itemCon.pinyin }}</span
                     >
-                    <span class="hanzi content-con">{{ itemCon.chs }}</span>
+                    <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{ itemCon.chs }}</span>
                   </template>
                 </div>
               </div>
@@ -151,6 +151,7 @@
                       ].chs
                     "
                     :canEdit="TaskModel == 'ANSWER' ? false : true"
+                    :style="wordStyle(conent)"
                   ></EditDiv>
                   <!-- <el-input
                     class="input chs"
@@ -163,7 +164,7 @@
                 </el-input> -->
                 </template>
                 <template v-else>
-                  <p class="chs">
+                  <p class="chs" :style="wordStyle(conent)">
                     {{ conent.chs }}
                   </p>
                 </template>
@@ -305,7 +306,22 @@ export default {
       userErrList: [],
     };
   },
-  computed: {},
+  computed: {
+    wordStyle() {
+      return function (config) {
+        if(config){
+            let sizeVal = config.fontSize.replace("px", "");
+            return {
+                minHeight: Number(sizeVal) + 9 + "px",
+                lineHeight: Number(sizeVal) + 8 + "px",
+                fontSize: config.fontSize,
+                fontFamily: config.fontFamily
+            };
+        }
+        
+      };
+    },
+  },
   watch: {},
   //方法集合
   methods: {
@@ -414,6 +430,13 @@ export default {
             chs: sItem.chs,
             isShow: sItem.isShow,
             inputNumber: sItem.chs.indexOf("__") > -1 ? inputNumber : "",
+            config: {
+                fontColor: sItem.fontColor,
+                fontFamily: sItem.fontFamily,
+                fontSize: sItem.fontSize,
+                underLine: sItem.underLine,
+                wordPadding: sItem.wordPadding,
+            },
           };
           paraArr.push(obj);
           if (sItem.chs.indexOf("__") > -1) {
@@ -422,7 +445,6 @@ export default {
         });
         this.$set(_this.curQue.option[dIndex].detail, "resArr", paraArr);
       });
-      console.log(_this.curQue.option);
 
       // 把错误的答案挑出来
       if (this.judgeAnswer == "standardAnswer") {

src/components/Adult/preview/SentenceModule.vue

@@ -1326,8 +1326,6 @@ export default {
               }
             });
             sdItem.maxFontsize = maxFontsize;
-            console.log("sdItem");
-            console.log(sdItem);
             items.pyNumber.push(isHasPY);
           });
           if (!this.curQue.Bookanswer && !items.Isexample) {

src/components/Adult/preview/SentenceSortQP.vue

@@ -199,7 +199,6 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
-    console.log(this.curQue);
     let data = JSON.parse(JSON.stringify(this.curQue.option));
     data.forEach((item) => {
       item.userAnswerJudge = "[JUDGE##F##JUDGE]";

src/components/Adult/preview/TextInputRecord.vue

@@ -200,7 +200,6 @@ export default {
     handleWav(list, tmIndex) {
       tmIndex = tmIndex ? tmIndex : 0;
       this.$set(this.curQue.Bookanswer[tmIndex], "recordList", list);
-      console.log(this.curQue.Bookanswer);
     },
     changeuserAnswerJudge(index) {
       if (this.curQue.option[index].answer) {

src/components/Adult/preview/TextProblem.vue

@@ -13,12 +13,12 @@
                                   <div class="synthesis-box">
                                       <div>
                                             <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='top'">{{itemCon.pinyin}}</span>
-                                            <span class="hanzi content-con">{{itemCon.chs}}</span>
+                                            <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{itemCon.chs}}</span>
                                             <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='bottom'">{{itemCon.pinyin}}</span>
                                         </div>
                                         <div style="text-align: left">
                                             <span class="pinyin" :class="[noFont.indexOf(item.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='top'">{{item.detail.wordsList[indexCon + 1].pinyin}}</span>
-                                            <span class="hanzi content-con">{{item.detail.wordsList[indexCon + 1].chs}}</span>
+                                            <span class="hanzi content-con" :style="wordStyle(item.detail.wordsList[indexCon + 1].config)">{{item.detail.wordsList[indexCon + 1].chs}}</span>
                                             <span class="pinyin" :class="[noFont.indexOf(item.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='bottom'">{{item.detail.wordsList[indexCon + 1].pinyin}}</span>
                                         </div>
                                   </div>
@@ -26,7 +26,7 @@
                               </template>
                               <template v-else>
                                     <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='top'">{{itemCon.pinyin}}</span>
-                                    <span class="hanzi content-con">{{itemCon.chs}}</span>
+                                    <span class="hanzi content-con" :style="wordStyle(itemCon.config)">{{itemCon.chs}}</span>
                                     <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='bottom'">{{itemCon.pinyin}}</span>
                               </template>
                           </div>
@@ -54,7 +54,22 @@ export default {
         noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
     };
   },
-  computed: {},
+  computed: {
+    wordStyle() {
+      return function (config) {
+        if(config){
+            let sizeVal = config.fontSize.replace("px", "");
+            return {
+                minHeight: Number(sizeVal) + 9 + "px",
+                lineHeight: Number(sizeVal) + 8 + "px",
+                fontSize: config.fontSize,
+                fontFamily: config.fontFamily
+            };
+        }
+        
+      };
+    },
+  },
   watch: {},
   //方法集合
   methods: {
@@ -71,6 +86,13 @@ export default {
                         pinyin: sItem.pinyin,
                         chs: sItem.chs,
                         isShow: sItem.isShow,
+                        config: {
+                            fontColor: sItem.fontColor,
+                            fontFamily: sItem.fontFamily,
+                            fontSize: sItem.fontSize,
+                            underLine: sItem.underLine,
+                            wordPadding: sItem.wordPadding,
+                        },
                     };
                     paraArr.push(obj);
                 })
@@ -87,6 +109,8 @@ export default {
             } else {
                 wItem.isShow = true;
             }
+        }else{
+            wItem.isShow = true;
         }
     },
   },

src/components/Adult/preview/components/OneSentenceTemp.vue

@@ -849,6 +849,7 @@ export default {
   font-size: 20px;
   line-height: 150%;
   color: #000000;
+  word-break: break-word;
   &.sentenceColor {
     //@include font_color("sub_color");
   }

src/views/adultInput.vue

@@ -440,6 +440,7 @@
                           :cur-que="topicIitem.data"
                           :fn_data="fn_data"
                           :change-cur-que="changeCurQue"
+                          :type="topicIitem.type"
                           v-if="refresh"
                         />
                       </template>