分数逻辑修改

gaoluyang

2024-07-12 f672612c6c2ebfd21d3b0b219a3d465b962ad3eb

分数逻辑修改

 static/js/worker.js

@@ -101,7 +101,11 @@
                  let str = handleFraction(m.split('=')[1])
                  if(typeof res == 'string'&&typeof str == 'string'){
                    if(res.includes('/')){
                      return handleMoreParam(res,m.split('=')[1],'=')
                      if (m.includes('/')) {
                        return  eval(res) == eval(str)
                      } else {
                        return handleMoreParam(res,m.split('=')[1],'=')
                      }
                    }else{
                      // console.log(res.trim().replace(/[.,。、；：'";?？“，]/g, ''),' == ',str.trim().replace(/[.,。、；：'";?？“，]/g, ''))
                      return  res.trim().replace(/[.,。、；：'";?？“，]/g, '') == str.trim().replace(/[.,。、；：'";?？“，]/g, '')
@@ -111,42 +115,74 @@
                  }
                } else if (m.includes('≥')) {
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m.split('≥')[1],'≥')
                    if (m.includes('/')) {
                      console.log('eval(res)----', eval(res))
                      let str = handleFraction(m.split('≥')[1])
                      console.log('eval(str)----', eval(str))
                      return eval(res) >= eval(str)
                    } else {
                      return handleMoreParam(res,m.split('≥')[1],'≥')
                    }
                  }else{
                    let str = handleFraction(m.split('≥')[1])
                    return eval(res) >= eval(str)
                  }
                }else if (m.includes('≤')) {
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m.split('≤')[1],'≤')
                    if (m.includes('/')) {
                      let str = handleFraction(m.split('≤')[1])
                      return eval(res) <= eval(str)
                    } else {
                      return handleMoreParam(res,m.split('≤')[1],'≤')
                    }
                  }else{
                    let str = handleFraction(m.split('≤')[1])
                    return eval(res) <= eval(str)
                  }
                }else if (m.includes('<')) {
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m.split('<')[1],'<')
                    if (m.includes('/')) {
                      let str = handleFraction(m.split('<')[1])
                      return  eval(res) < eval(str)
                    } else {
                      return handleMoreParam(res,m.split('<')[1],'<')
                    }
                  }else{
                    let str = handleFraction(m.split('<')[1])
                    return  eval(res) < eval(str)
                  }
                }else if (m.includes('>')) {
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m.split('>')[1],'>')
                    if (m.includes('/')) {
                      let str = handleFraction(m.split('>')[1])
                      return  eval(res) > eval(str)
                    } else {
                      return handleMoreParam(res,m.split('>')[1],'>')
                    }
                  }else{
                    let str = handleFraction(m.split('>')[1])
                    return  eval(res) > eval(str)
                  }
                }else if (m.includes('~')) {
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m,'~')
                    if (m.includes('/')) {
                      let k = m.split('~')
                      return  eval(res) >= eval(handleFraction((k[0]))) && eval(res) <= eval(handleFraction(k[1]))
                    } else {
                      return handleMoreParam(res,m,'~')
                    }
                  }else{
                    let k = m.split('~')
                    return  eval(res) >= eval(handleFraction((k[0]))) && eval(res) <= eval(handleFraction(k[1]))
                  }
                }else if(m.includes('-')){
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m,'-')
                    if (m.includes('/')) {
                      let k = m.split('-')
                      return  eval(res) >= eval(handleFraction(k[0])) && eval(res) <= eval(handleFraction(k[1]))
                    } else {
                      return handleMoreParam(res,m,'-')
                    }
                  }else{
                    let k = m.split('-')
                    // console.log(k,eval(res),eval(res) >= eval(handleFraction(k[0])) && eval(res) <= eval(handleFraction(k[1])))
@@ -154,21 +190,36 @@
                  }
                }else if(m.includes('±')){
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m,'±')
                    if (m.includes('/')) {
                      let k = m.split('±')
                      return  eval(res) >= eval((handleFraction(k[0]) - handleFraction(k[1]))) && eval(res) <= eval((handleFraction(k[0]) + handleFraction(k[1])))
                    } else {
                      return handleMoreParam(res,m,'±')
                    }
                  }else{
                    let k = m.split('±')
                    return  eval(res) >= eval((handleFraction(k[0]) - handleFraction(k[1]))) && eval(res) <= eval((handleFraction(k[0]) + handleFraction(k[1])))
                  }
                }else if(m.includes('＞')){
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m.split('＞')[1],'>')
                    if (m.includes('/')) {
                      let str = handleFraction(m.split('＞')[1])
                      return  eval(res) > eval(str)
                    } else {
                      return handleMoreParam(res,m.split('＞')[1],'>')
                    }
                  }else{
                    let str = handleFraction(m.split('＞')[1])
                    return  eval(res) > eval(str)
                  }
                }else if(m.includes('＜')){
                  if(typeof res =='string'&&res.includes('/')){
                    return handleMoreParam(res,m.split('＜')[1],'<')
                    if (m.includes('/')) {
                      let str = handleFraction(m.split('＜')[1])
                      return  eval(res) < eval(str)
                    } else {
                      return handleMoreParam(res,m.split('＜')[1],'<')
                    }
                  }else{
                    let str = handleFraction(m.split('＜')[1])
                    return  eval(res) < eval(str)