合并单元格

src/components/AnalyseModule/components/table.vue

@@ -11,7 +11,7 @@
       <tr>
         <th v-for="(e, i) in labers" :key="i" style="padding: 15px 10px">
           {{ e.label
-          }}<span
+          }}<span v-if="!merge_fields"
             ><i
               class="el-icon-caret-bottom"
               :style="
@@ -165,9 +165,10 @@ export default {
 
   computed: {},
   created() {
-    this.data_f();
+    
   },
   mounted() {
+    this.data_f();
     // console.log(this.table_data);
     // console.log(this.labers);
   },
@@ -187,21 +188,13 @@ export default {
             a[i] = s ? true : false;
             this.show_row_key[this.merge_fields[d]] = a;
           }
-          i += s;
         }
       }
       this.row_data_name = {};
-      console.log(this.show_row_key);
       this.is_show_table = true;
-      // setTimeout((), 300)/;
     },
     merge_fields_fun(index, key, a = false) {
       let num = 0;
-      if (!a) {
-        console.log(index);
-        console.log(key);
-        console.log(this.table_data[index][key]);
-      }
       if (
         !this.row_data_name[key] ||
         (this.row_data_name[key] &&
@@ -209,21 +202,15 @@ export default {
       ) {
         this.row_data_name[key] = this.table_data[index][key];
         for (let mf_i in this.table_data) {
-          if (mf_i >= index) {
+          if (parseInt(mf_i) >= parseInt(index)) {
             if (this.table_data[index][key] == this.table_data[mf_i][key]) {
               num += 1;
             } else {
-              if (!a) {
-                // console.log(num);
-              }
               return num;
             }
           }
         }
       }
-      if (!a) {
-        // console.log(num);
-      }
       return num;
     },
     sort(col, type = 'desc') {
@@ -262,6 +249,7 @@ export default {
           }
         }); //降序
       }
+      this.data_f();
     },
   },
 };

src/views/student/examination_questions/comment/index.vue

@@ -506,9 +506,9 @@ export default {
         if (res.top_data)
           this.exactness_question_data = this.changeRight(res.top_data.dataasc); //对题分析
         this.wrong_position_data = this.changeWrongPosition(res.WrongPosition); //错误部位
-        // this.error_level_data = this.changeErrorLevel(res.WrongLevel); //错误等级
-        // this.wrong_color_data = this.changeWrongColor(res.WrongColor); //错误颜色
-        // this.wrongG_group_data = this.changeWrongGroup(res.WrongGroup); //错误组别
+        this.error_level_data = this.changeErrorLevel(res.WrongLevel); //错误等级
+        this.wrong_color_data = this.changeWrongColor(res.WrongColor); //错误颜色
+        this.wrongG_group_data = this.changeWrongGroup(res.WrongGroup); //错误组别
         this.holdTobacco_data = this.changeHoldTobacco(res.holdTobacco); //把烟
         this.flakeTobacco_data = this.changeFlakeTobacco(res.flakeTobacco); //片烟
         this.swingHandle_data = this.changeSwingHandle(res.swingHandle); //甩把
@@ -1017,7 +1017,7 @@ export default {
         print_id: 'wrong_position',
         color: '#E6A23C',
         title: '错误部位',
-        merge_fields: ['answer_position'], //, 'wrong_position'
+        merge_fields: ['answer_position','wrong_position'], //, 'wrong_position'
         labers,
         list,
         is_show: {