Merge branch 'master' of http://gcls-git.helxsoft.cn/GCLS/eep_page

src/views/book/courseware/create/components/question/new_word/NewWordSetting.vue

@@ -10,11 +10,11 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="自动换行">
+      <!-- <el-form-item label="自动换行">
         <el-radio-group v-model="property.auto_wrap">
           <el-radio v-for="{ value, label } in switchOption" :key="value" :label="value">{{ label }}</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="读音">
         <el-select v-model="property.audio_generation_method" placeholder="请选择">
           <el-option v-for="{ value, label } in audioGenerationMethodList" :key="value" :label="label" :value="value" />

src/views/book/courseware/data/newWord.js

@@ -67,7 +67,7 @@ export function getNewWordProperty() {
     sn_display_mode: displayList[0].value,
     audio_generation_method: audioGenerationMethodList[0].value,
     pinyin_position: pinyinPositionList[0].value,
-    auto_wrap: switchOption[1].value, // 自动换行
+    auto_wrap: switchOption[0].value, // 自动换行
     is_has_infor: inforList[0].value,
   };
 }

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

@@ -149,7 +149,13 @@
                   </div>
                 </li>
               </ul>
-              <el-table v-else :data="data.new_word_list" style="width: 100%" class="newWord-table NPC-word-table">
+              <!-- <el-table
+                v-else
+                :data="data.new_word_list"
+                v-fit-columns
+                style="width: 100%"
+                class="newWord-table NPC-word-table"
+              >
                 <el-table-column fixed prop="" width="16px">
                   <template slot-scope="scope">
                     <template v-if="scope.row.bg || scope.row.ed">
@@ -264,7 +270,7 @@
                     </span>
                   </template>
                 </el-table-column>
-              </el-table>
+              </el-table> -->
             </div>
           </template>
           <template v-else>