git pull

merge.js

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