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

src/views/book/courseware/create/components/question/notes/Notes.vue

@@ -248,7 +248,9 @@ export default {
     },
     handleChangeCourseware(val) {
       this.matchObj.source_courseware_id = val[val.length - 1];
-      this.matchObj.source_courseware_name = this.$refs[this.refId].getCheckedNodes()[0].pathLabels.join('/');
+      this.matchObj.source_courseware_name = this.$refs[this.refId].getCheckedNodes()[0]
+        ? this.$refs[this.refId].getCheckedNodes()[0].pathLabels.join('/')
+        : '';
     },
     // 删除行
     handleDelete(index) {

src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -419,7 +419,7 @@
                                       : '',
                                   marginTop: tabNumTop,
                                 }"
-                                >{{ index + 1 }}</b
+                                >{{ sItem.number ? sItem.number : index + 1 }}</b
                               >
                             </template>
                             <div v-else style="width: 16px; height: 16px; margin-left: 8px"></div>
@@ -797,7 +797,7 @@
 
                               marginTop: tabNumTop,
                             }"
-                            >{{ index + 1 }}</b
+                            >{{ sItem.number ? sItem.number : index + 1 }}</b
                           >
                         </template>
                         <div v-else style="width: 16px; height: 16px; margin-left: 8px"></div>