git pu

final.js

@@ -75,6 +75,8 @@ async function generateByDrawDown(timestamp, arr) {
 
 async function run(root, name, directory, timestamp) {
     //  let directory = await fs.readdirSync('result')
+    let con2 = await fs.readFileSync('./con2.json', 'utf8')
+    con2 = JSON.parse(con2)
     let arr2 = []
     let arrFinal = []
     let last = []
@@ -119,16 +121,21 @@ async function run(root, name, directory, timestamp) {
     let las = []
     for (let i = 0; i < last.length; i++) {
         if (i < last.length)
-            if (last[i].total > 0  && last[i].pftrade>= 0.9 ) {
+            if (last[i].total > 0 && last[i].pftrade >= 0.9) {
                 delete last[i].durDetailText
                 delete last[i].metaDetailText
+                let needContinue = false
+                for (let z = 0; z < con2.length; z++) {
+                    if (con2[z] === last[i].type.split('targetPercentage:false')[1])
+                        needContinue = true
+                }
+                if (needContinue)
+                    continue
                 las.push(last[i])
             }
     }
 
 
-
-
     createfileADV(root, timestamp, name, JSON.stringify(las, null, 2))
 
     last = []