gcj преди 2 години
родител
ревизия
8959a08ce8
променени са 2 файла, в които са добавени 22 реда и са изтрити 45 реда
  1. 3 15
      src/components/corpus/StrockplayredlineCorpus.vue
  2. 19 30
      src/components/corpus/StrockplayredlineTable.vue

+ 3 - 15
src/components/corpus/StrockplayredlineCorpus.vue

@@ -94,7 +94,7 @@ export default {
         {
           padding: 5,
           showOutline: true,
-          strokeColor: "#000000",
+          strokeColor: _this.strokeColor,
           charDataLoader: function (char, onComplete) {
             let charData = _this.handleData();
             onComplete(charData);
@@ -130,20 +130,8 @@ export default {
       if (this.curItem) {
         let charData = JSON.parse(JSON.stringify(this.curItem.hz_json));
         if (stroke_num) {
-          let stroke_arr = [];
-          for (let i = 0; i < stroke_num; i++) {
-            stroke_arr.push(i + 1);
-          }
-          stroke_arr = stroke_arr.map((item) => (item = Number(item) - 1));
-          let strokes = [],
-            medians = [];
-          for (let i = 0; i < stroke_arr.length; i++) {
-            let stroke_num = stroke_arr[i];
-            strokes.push(charData.strokes[stroke_num]);
-            medians.push(charData.medians[stroke_num]);
-          }
-          charData.strokes = strokes;
-          charData.medians = medians;
+          charData.strokes = charData.strokes.slice(0, stroke_num);
+          charData.medians = charData.medians.slice(0, stroke_num);
         } else if (charData) {
           charData.radStrokes = [];
         }

+ 19 - 30
src/components/corpus/StrockplayredlineTable.vue

@@ -1,8 +1,6 @@
 <!--  -->
 <template>
-  <div
-    :class="['strockplayRedInner']"
-  >
+  <div :class="['strockplayRedInner']">
     <!-- <div
       @click="playHanzi"
       :class="[
@@ -18,23 +16,26 @@
       v-if="playStorkes"
     ></div> -->
     <template v-if="Book_text != '〇'">
-      <div :id="targetDivGray" class="character-target-div character-target-div-gray"></div>
+      <div
+        :id="targetDivGray"
+        class="character-target-div character-target-div-gray"
+      ></div>
       <div :id="targetDiv" class="character-target-div"></div>
     </template>
     <template v-else>
       <span class="book-text">{{ Book_text }}</span>
     </template>
     <svg-icon
-        icon-class="tian"
-        className="tian-bg"
-        v-if="BoxbgType==0"
-        :style="{color:'#DEDEDE'}"
+      icon-class="tian"
+      className="tian-bg"
+      v-if="BoxbgType == 0"
+      :style="{ color: '#DEDEDE' }"
     />
     <svg-icon
-        icon-class="mi"
-        className="tian-bg"
-        v-if="BoxbgType==1"
-        :style="{color:'#DEDEDE'}"
+      icon-class="mi"
+      className="tian-bg"
+      v-if="BoxbgType == 1"
+      :style="{ color: '#DEDEDE' }"
     />
     <!-- <svg-icon
       icon-class="tian"
@@ -58,7 +59,7 @@ export default {
     "curItem",
     "strokeNumber",
     "targetDivGray",
-    "BoxbgType"
+    "BoxbgType",
   ],
   data() {
     return {
@@ -117,20 +118,8 @@ export default {
       if (this.curItem) {
         let charData = JSON.parse(JSON.stringify(this.curItem));
         if (stroke_num) {
-            let stroke_arr = [];
-            for(let i = 0; i<stroke_num;i++){
-                stroke_arr.push(i+1)
-            }
-            stroke_arr = stroke_arr.map((item) => (item = Number(item) - 1));
-            let strokes = [],
-                medians = [];
-            for (let i = 0; i < stroke_arr.length; i++) {
-                let stroke_num = stroke_arr[i];
-                strokes.push(charData.strokes[stroke_num]);
-                medians.push(charData.medians[stroke_num]);
-            }
-            charData.strokes = strokes;
-            charData.medians = medians;
+          charData.strokes = charData.strokes.slice(0, stroke_num);
+          charData.medians = charData.medians.slice(0, stroke_num);
         } else if (charData) {
           charData.radStrokes = [];
         }
@@ -176,9 +165,9 @@ export default {
   z-index: 99999;
   position: absolute;
 }
-.character-target-div-gray{
-    top: 0;
-    left: 0;
+.character-target-div-gray {
+  top: 0;
+  left: 0;
 }
 .tian-bg {
   width: 100%;