Skip to content

A
ai
Commit 3c45e998 authored by Ahmad Nemati's avatar Ahmad Nemati
Browse files
Options

git pull

parent 9166f316
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
merge.js
View file @ 3c45e998
...@@ -47,12 +47,12 @@ manage() ...@@ -47,12 +47,12 @@ manage()
data= _.uniqBy(data, 'time'); data= _.uniqBy(data, 'time');
data= _.orderBy(data, 'time'); data= _.orderBy(data, 'time');
let s=data.data.arr // let s=data.data.arr
for (let j=0;j<s.length;j++) // 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] // 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 // data.text=t
} // }
console.log(data.data) console.log(data.data)
all[i].data=data all[i].data=data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment