Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-11 5f3cf604c6598d34a389dcbdded8ab9c973f4085

 static/js/worker.js

@@ -101,7 +101,8 @@
                    if(res.includes('/')){
                      return handleMoreParam(res,m.split('=')[1],'=')
                    }else{
                      return  res.trim() == str.trim()
                      // console.log(res.trim().replace(/[.,。、；：'";?？“，]/g, ''),' == ',str.trim().replace(/[.,。、；：'";?？“，]/g, ''))
                      return  res.trim().replace(/[.,。、；：'";?？“，]/g, '') == str.trim().replace(/[.,。、；：'";?？“，]/g, '')
                    }
                  }else{
                    return  eval(res) == eval(str)
@@ -186,7 +187,6 @@
                }
              })
            } else {
              console.log(333333)
              item.v.v = 0
              list.forEach(a => {
                if (a[0].r == item.r) {
@@ -199,6 +199,7 @@
                }
              })
            }
            console.log(tableList)
          }
          result = {
            method:'saveInsContext',
@@ -220,11 +221,7 @@
            // let ask = currentSample.insProduct.find(m => m.id == item.i).ask?currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
            // let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null;
            comResult = compute(item.v.f.replace(/=/g, ' '),comValue)
            let list3 = []
            list2.forEach(val => {
              val = val.toString()
              list3.push(val)
            })
            let list3 = list2.map(item=>item+'')
            isToExponential = list3.some(val => val.includes('e+'))
            // 装备项目检验值转化
            if (PROJECT === '装备电缆' && isToExponential) {