git pull

merge.js

@@ -46,9 +46,10 @@ manage()
         let data=all[i].data
         data= _.uniqBy(data, 'time');
        data= _.orderBy(data, 'time');
-       for (let j=0;j<data.length;j++)
+       let s=data.arr
+       for (let j=0;j<s.length;j++)
        {
-           let t=(j+1)+','+data[1]+','+data[2]+','+data[3]+','+data[4]+','+data[5]+','+data[6]+','+data[7]+','+data[8]+','+data[9]
+           let t=(j+1)+','+s[1]+','+s[2]+','+s[3]+','+s[4]+','+s[5]+','+s[6]+','+s[7]+','+s[8]+','+s[9]
            data.text=t
        }
        console.log(data)