Browse Source

fix 问题

dusenyao 3 years ago
parent
commit
3df79c50b6

+ 5 - 2
src/components/Adult/inputModules/VoiceMatrix.vue

@@ -208,7 +208,9 @@
                     maxlength="200"
                     show-word-limit
                   />
-                  <span>&nbsp;]</span>
+                  <span :style="{'margin-right': '12px'}">&nbsp;]</span>
+                  <el-radio v-model="column.text_brackets.brackets_inner_type" label="english">英文</el-radio>
+                  <el-radio v-model="column.text_brackets.brackets_inner_type" label="pinyin">拼音</el-radio>
                 </template>
               </div>
             </div>
@@ -333,7 +335,8 @@ export default {
             },
             text_brackets: {
               brackets_inner: "",
-              brackets_outer: ""
+              brackets_outer: "",
+              brackets_inner_type: 'english'
             }
           };
         }

+ 15 - 7
src/components/Adult/preview/VoiceMatrix.vue

@@ -290,13 +290,13 @@
                 @click="matrixCellClick(i, j)"
               >
                 <span>
-                  <span class="brackets-text">{{
-                    column.text_brackets.brackets_outer
-                  }}</span>
+                  <span class="chs">
+                    {{ column.text_brackets.brackets_outer }}
+                  </span>
                   <span class="brackets">&nbsp;[&nbsp;</span>
-                  <span class="brackets-text">{{
-                    column.text_brackets.brackets_inner
-                  }}</span>
+                  <span :class="[column.text_brackets.brackets_inner_type === 'pinyin' ? 'pinyin' : 'english']">
+                    {{ column.text_brackets.brackets_inner }}
+                  </span>
                   <span class="brackets">&nbsp;]</span>
                 </span>
               </div>
@@ -1274,10 +1274,18 @@ $select-color-brown-active: #a37557;
         .textBrackets-red {
           @extend %column;
 
-          .brackets-text {
+          .chs {
+            font-family: "FZJCGFKTK";
+          }
+
+          .pinyin {
             font-family: "GB-PINYINOK-B";
           }
 
+          .english {
+            font-family: 'robot';
+          }
+
           .brackets {
             font-size: 16px;
             font-family: "FZJCGFKTK";