zhouna 5 лет назад
Родитель
Сommit
e23b6cbeec
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      src/js/qcScore.js

+ 4 - 3
src/js/qcScore.js

@@ -366,11 +366,12 @@ function formatFlawKeys(data){
     let hml='<div class="inner-table"><table>';
     const colNum = Math.ceil(questionMapping.length/2);
     let tdVal='';
-    for(let i=0;i<questionMapping.length;){console.log(name,i,questionMapping.length)
+    const regexp = /(【(.+?)】)/g;
+    for(let i=0;i<questionMapping.length;){console.log(questionMapping[i].val.match(regexp))
       if(questionMapping[i+1]){
-        tdVal="<td>"+questionMapping[i].name+"${"+questionMapping[i].val.replace(/[【|】]/g,'')+"}</td><td>"+questionMapping[i+1].name+"${"+questionMapping[i+1].val.replace(/[【|】]/g,'')+"}</td>";
+        tdVal="<td>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td>"+questionMapping[i+1].name+extractVars(questionMapping[i+1].val)+"</td>";
       }else{
-        tdVal="<td>"+questionMapping[i].name+"${"+questionMapping[i].val.replace(/[【|】]/g,'')+"}</td><td></td>";
+        tdVal="<td>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td></td>";
       }
       if(i==0){
         hml=hml+`<tr><td rowspan="${colNum}">${name}</td>${tdVal}`;