装备-原材料下单前端页面

gaoluyang

2024-07-22 d4bfd8248ae2c45b7ce441c55c97e204a287f835

 static/js/worker.js

@@ -93,7 +93,7 @@
            // console.log(ask,res,item.v.f)
            if(ask){
              comp = ask.map((m, i) => {
                console.log('m----', m)
                // console.log('m----', m)
                if (m.includes('RTS')) {
                  m = m.replace('RTS*', '')
                }
@@ -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)
@@ -221,7 +272,7 @@
        try {
          if(getInspectionValueType(item.i)==1){
            let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null;
            isPoint = tell[0].includes('/') // 判断要求值是否为分数
            isPoint = PROJECT=='装备电缆'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 判断要求值是否为分数
            comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
            let list3 = list2.map(item=>item+'')
            isToExponential = list3.some(val => val.includes('e+'))
@@ -259,10 +310,13 @@
            if (a[0].r == item.r && comResult !== '') {
              for (var b in a) {
                if (a[b].c == item.c) {
                  console.log('comResult---', comResult)
                  try{
                    let val = parseFloat(comResult.toFixed(3))
                    a[b].v.v = isNaN(val) ? '' : val
                    if(comResult==0){
                      a[b].v.v = 0
                    }else{
                      let val = parseFloat(comResult.toFixed(3))
                      a[b].v.v = isNaN(val) ? '' : val
                    }
                  }catch(error){
                    a[b].v.v = comResult
                    console.log('error---', error)
@@ -557,8 +611,6 @@
  }
}



/**
 * 根据坐标获取列名
 * @param {Object} cellId
@@ -767,9 +819,9 @@
    if(str.includes(',,')){
      str = str.replace(new RegExp(',,', 'g'),'')
    }
    // console.log('str', str)
    if(str.includes('&"/"&')){
      return str.replace(new RegExp('&"/"&', 'g'),'/').replace(new RegExp('//', 'g'),'')
      return str.replaceAll('&"/"&', '/').replaceAll('//','')
    } else if (isPoint) {
      return str.replace('ABS', '').replace(/\(|\)/g, '')
    }else {