合并冲突

licp

2024-08-02 332125c247b8cec21af77479f07ef35558eb6bba

 static/js/worker0.js

@@ -13,7 +13,6 @@
}

function handleData(){
  // console.log(33333,dataAcquisitionInfo)
  list.forEach((item,index)=>{
    let num = 0;
    let str = ''
@@ -40,15 +39,17 @@
          list[index].forEach((n,i)=>{
            if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('检验值')){
              let arr = n.v.ps.value.split('值')
              if(arr[1] ==dataAcquisitionInfo.frequency){
              if(Array.isArray(dataAcquisitionInfo[str].value)){
                for (let i = 0; i < dataAcquisitionInfo[str].value.length; i++) {
                  if(i+1==arr[1]){
                setTimeout(()=>{
                  let num = 0
                      let num0 = 0
                  if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
                    let str = n.v.ct.fa.split('.')[1]
                    num = str.length
                    n.v.v = dataAcquisitionInfo[str]?dataAcquisitionInfo[str].toFixed(num):dataAcquisitionInfo[str]
                        num0 = str.length
                        n.v.v = dataAcquisitionInfo[str].value[i]?dataAcquisitionInfo[str].value[i].toFixed(num0):dataAcquisitionInfo[str].value[i]
                  }else{
                    n.v.v = dataAcquisitionInfo[str]
                        n.v.v = dataAcquisitionInfo[str].value[i]
                  }
                  result = {
                    method:'changeInput',
@@ -59,16 +60,38 @@
                  }
                  self.postMessage(JSON.stringify(result))
                },2000)
              }else if(Number(dataAcquisitionInfo.frequency)>num){
                  }
                }
              }else{
                if(arr[1] ==dataAcquisitionInfo[str].frequency){
                  setTimeout(()=>{
                    let num0 = 0
                    if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
                      let str = n.v.ct.fa.split('.')[1]
                      num0 = str.length
                      n.v.v = dataAcquisitionInfo[str].value?dataAcquisitionInfo[str].value.toFixed(num0):dataAcquisitionInfo[str].value
                    }else{
                      n.v.v = dataAcquisitionInfo[str].value
                    }
                    result = {
                      method:'changeInput',
                      value:{
                        list:list,
                        n:n
                      }
                    }
                    self.postMessage(JSON.stringify(result))
                  },2000)
                }else if(Number(dataAcquisitionInfo[str].frequency)>num){
                if(n.v.ps.value.includes(num)){
                  setTimeout(()=>{
                    let num = 0
                      let num0 = 0
                    if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
                      let str = n.v.ct.fa.split('.')[1]
                      num = str.length
                      n.v.v = dataAcquisitionInfo[str]?Number(dataAcquisitionInfo[str]).toFixed(num):dataAcquisitionInfo[str]
                        num0 = str.length
                        n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
                    }else{
                      n.v.v = dataAcquisitionInfo[str]
                        n.v.v = dataAcquisitionInfo[str].value
                    }
                    result = {
                      method:'changeInput',
@@ -82,6 +105,7 @@
                }
              }
            }
            }
          })
        }
      }